romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changeset: 513 fdbozzo - 22/11/2014 19:42:46:

Browse Source 
- Arreglo de línea vacía faltante en la cabecera OLE del inicio
This commit is contained in:
fdbozzo
2014-11-22 19:43:17 +01:00
parent f212263e80 9251b41c05
commit d4b7c1e697
1 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
foxbin2prg.prg
View File

@@ -1169,17 +1169,17 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
tcOutputFile_Ext1 = FORCEEXT(tcOutputFile, lcExt_1) tcOutputFile_Ext1 = FORCEEXT(tcOutputFile, lcExt_1)
IF FILE( tcOutputFile_Ext1 ) IF FILE( tcOutputFile_Ext1 )
*-- LOG *-- LOG
DO CASE DO CASE
CASE EMPTY(lcExt_2) CASE EMPTY(lcExt_2)
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 ) .writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 )
CASE EMPTY(lcExt_3) CASE EMPTY(lcExt_3)
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 ) .writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 )
OTHERWISE OTHERWISE
.writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 + '/' + lcExt_3 ) .writeLog( C_BACKUP_OF_LOC + tcOutputFile_Ext1 + '/' + lcExt_2 + '/' + lcExt_3 )
ENDCASE ENDCASE
*-- COPIA BACKUP *-- COPIA BACKUP
COPY FILE ( tcOutputFile_Ext1 ) TO ( tcBakFile_1 ) COPY FILE ( tcOutputFile_Ext1 ) TO ( tcBakFile_1 )
IF NOT EMPTY(lcExt_2) IF NOT EMPTY(lcExt_2)
@@ -1187,7 +1187,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
IF FILE( tcOutputFile_Ext2 ) IF FILE( tcOutputFile_Ext2 )
COPY FILE ( tcOutputFile_Ext2 ) TO ( tcBakFile_2 ) COPY FILE ( tcOutputFile_Ext2 ) TO ( tcBakFile_2 )
ENDIF ENDIF
ENDIF ENDIF
IF NOT EMPTY(lcExt_3) IF NOT EMPTY(lcExt_3)
@@ -1195,11 +1195,11 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
IF FILE( tcOutputFile_Ext3 ) IF FILE( tcOutputFile_Ext3 )
COPY FILE ( tcOutputFile_Ext3 ) TO ( tcBakFile_3 ) COPY FILE ( tcOutputFile_Ext3 ) TO ( tcBakFile_3 )
ENDIF
ENDIF
ENDIF ENDIF
ENDIF ENDIF
ENDIF ENDIF
ENDIF
ENDIF
ENDWITH && THIS ENDWITH && THIS
CATCH TO toEx CATCH TO toEx
@@ -2476,7 +2476,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
lcEXE_CAPS = FORCEPATH( 'filename_caps.exe', lcPath ) lcEXE_CAPS = FORCEPATH( 'filename_caps.exe', lcPath )
loFSO = .o_FSO loFSO = .o_FSO
llRelanzarError = NOT tl_NormalizeInputFile llRelanzarError = NOT tl_NormalizeInputFile
IF tl_NormalizeInputFile IF tl_NormalizeInputFile
tcFileName = EVL( tcFileName, .c_InputFile ) tcFileName = EVL( tcFileName, .c_InputFile )
lcType = UPPER( JUSTEXT( tcFileName ) ) lcType = UPPER( JUSTEXT( tcFileName ) )
@@ -2513,41 +2513,41 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM
ENDCASE ENDCASE
*-- Normalizar archivo(s) de entrada. El primero siempre se normaliza (??2, ??X, DBF, DBC) *-- Normalizar archivo(s) de entrada. El primero siempre se normaliza (??2, ??X, DBF, DBC)
.RenameFile( tcFileName, lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( tcFileName, lcEXE_CAPS, loFSO, llRelanzarError )
DO CASE DO CASE
CASE lcType = 'PJX' CASE lcType = 'PJX'
.RenameFile( FORCEEXT(tcFileName,'PJT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'PJT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'VCX' CASE lcType = 'VCX'
.RenameFile( FORCEEXT(tcFileName,'VCT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'VCT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'SCX' CASE lcType = 'SCX'
.RenameFile( FORCEEXT(tcFileName,'SCT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'SCT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'FRX' CASE lcType = 'FRX'
.RenameFile( FORCEEXT(tcFileName,'FRT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'FRT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'LBX' CASE lcType = 'LBX'
.RenameFile( FORCEEXT(tcFileName,'LBT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'LBT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'DBF' CASE lcType = 'DBF'
IF FILE( FORCEEXT(tcFileName,'FPT') ) IF FILE( FORCEEXT(tcFileName,'FPT') )
.RenameFile( FORCEEXT(tcFileName,'FPT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'FPT'), lcEXE_CAPS, loFSO, llRelanzarError )
ENDIF ENDIF
IF FILE( FORCEEXT(tcFileName,'CDX') ) IF FILE( FORCEEXT(tcFileName,'CDX') )
.RenameFile( FORCEEXT(tcFileName,'CDX'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'CDX'), lcEXE_CAPS, loFSO, llRelanzarError )
ENDIF ENDIF
CASE lcType = 'DBC' CASE lcType = 'DBC'
.RenameFile( FORCEEXT(tcFileName,'DCX'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'DCX'), lcEXE_CAPS, loFSO, llRelanzarError )
.RenameFile( FORCEEXT(tcFileName,'DCT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'DCT'), lcEXE_CAPS, loFSO, llRelanzarError )
CASE lcType = 'MNX' CASE lcType = 'MNX'
.RenameFile( FORCEEXT(tcFileName,'MNT'), lcEXE_CAPS, loFSO, llRelanzarError ) .RenameFile( FORCEEXT(tcFileName,'MNT'), lcEXE_CAPS, loFSO, llRelanzarError )
ENDCASE ENDCASE
ENDWITH && THIS ENDWITH && THIS
@@ -6177,7 +6177,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
*-- Defino el objeto de m<>dulo y sus propiedades *-- Defino el objeto de m<>dulo y sus propiedades
*toModulo = NULL *toModulo = NULL
*toModulo = CREATEOBJECT('CL_MODULO') *toModulo = CREATEOBJECT('CL_MODULO')
*IF NOT (toFoxBin2Prg.l_UseClassPerFile AND toFoxBin2Prg.l_RedirectClassPerFileToMain) *IF NOT (toFoxBin2Prg.l_UseClassPerFile AND toFoxBin2Prg.l_RedirectClassPerFileToMain)
* llEXTERNAL_CLASS_Completed = .T. * llEXTERNAL_CLASS_Completed = .T.
*ENDIF *ENDIF
@@ -6191,35 +6191,35 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
CASE .lineaExcluida( I, tnBloquesExclusion, @taLineasExclusion ) ; CASE .lineaExcluida( I, tnBloquesExclusion, @taLineasExclusion ) ;
OR .lineIsOnlyCommentAndNoMetadata( @lcLine, @lc_Comentario ) && Excluida, vac<61>a o solo Comentarios OR .lineIsOnlyCommentAndNoMetadata( @lcLine, @lc_Comentario ) && Excluida, vac<61>a o solo Comentarios
*CASE NOT llFoxBin2Prg_Completed AND .analizarBloque_FoxBin2Prg( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines ) *CASE NOT llFoxBin2Prg_Completed AND .analizarBloque_FoxBin2Prg( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
* llFoxBin2Prg_Completed = .T. * llFoxBin2Prg_Completed = .T.
*CASE NOT llEXTERNAL_CLASS_Completed AND .analizarBloque_EXTERNAL_CLASS( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines ) *CASE NOT llEXTERNAL_CLASS_Completed AND .analizarBloque_EXTERNAL_CLASS( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
*-- Puede haber varias clases externas *-- Puede haber varias clases externas
*CASE NOT llLIBCOMMENT_Completed AND .analizarBloque_LIBCOMMENT( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines ) *CASE NOT llLIBCOMMENT_Completed AND .analizarBloque_LIBCOMMENT( @toModulo, @lcLine, @taCodeLines, @I, tnCodeLines )
* llLIBCOMMENT_Completed = .T. * llLIBCOMMENT_Completed = .T.
* llEXTERNAL_CLASS_Completed = .T. * llEXTERNAL_CLASS_Completed = .T.
*CASE NOT llOLE_DEF_Completed AND .analizarBloque_OLE_DEF( @toModulo, @lcLine, @taCodeLines ; *CASE NOT llOLE_DEF_Completed AND .analizarBloque_OLE_DEF( @toModulo, @lcLine, @taCodeLines ;
, @I, tnCodeLines, @lcProcedureAbierto ) , @I, tnCodeLines, @lcProcedureAbierto )
*-- Puede haber varios objetos OLE *-- Puede haber varios objetos OLE
*CASE NOT llINCLUDE_SCX_Completed AND .c_Type = 'SCX' AND .analizarBloque_INCLUDE( @toModulo, @loClase, @lcLine ; *CASE NOT llINCLUDE_SCX_Completed AND .c_Type = 'SCX' AND .analizarBloque_INCLUDE( @toModulo, @loClase, @lcLine ;
, @taCodeLines, @I, tnCodeLines, @lcProcedureAbierto ) , @taCodeLines, @I, tnCodeLines, @lcProcedureAbierto )
* Espec<65>fico para SCX que lo tiene al inicio * Espec<65>fico para SCX que lo tiene al inicio
* llINCLUDE_SCX_Completed = .T. * llINCLUDE_SCX_Completed = .T.
* llEXTERNAL_CLASS_Completed = .T. * llEXTERNAL_CLASS_Completed = .T.
CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ; CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ;
, @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario ) , @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario )
*-- Puede haber varias clases definidas *-- Puede haber varias clases definidas
* llEXTERNAL_CLASS_Completed = .T. * llEXTERNAL_CLASS_Completed = .T.
ENDCASE ENDCASE
ENDFOR ENDFOR
.verificar_CLASES_EXTERNAS( @toModulo, @toFoxBin2Prg ) .verificar_CLASES_EXTERNAS( @toModulo, @toFoxBin2Prg )
ENDIF ENDIF
ENDWITH && THIS ENDWITH && THIS
@@ -6281,7 +6281,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
*-- Defino el objeto de m<>dulo y sus propiedades *-- Defino el objeto de m<>dulo y sus propiedades
*toModulo = NULL *toModulo = NULL
*toModulo = CREATEOBJECT('CL_MODULO') *toModulo = CREATEOBJECT('CL_MODULO')
IF NOT (toFoxBin2Prg.l_UseClassPerFile AND toFoxBin2Prg.l_RedirectClassPerFileToMain) IF NOT (toFoxBin2Prg.l_UseClassPerFile AND toFoxBin2Prg.l_RedirectClassPerFileToMain)
llEXTERNAL_CLASS_Completed = .T. llEXTERNAL_CLASS_Completed = .T.
ENDIF ENDIF
@@ -6314,15 +6314,15 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
llINCLUDE_SCX_Completed = .T. llINCLUDE_SCX_Completed = .T.
llEXTERNAL_CLASS_Completed = .T. llEXTERNAL_CLASS_Completed = .T.
*CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ; *CASE .analizarBloque_DEFINE_CLASS( @toModulo, @loClase, @lcLine, @taCodeLines, @I, tnCodeLines ;
, @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario ) , @lcProcedureAbierto, @taLineasExclusion, @tnBloquesExclusion, @lc_Comentario )
*-- Puede haber varias clases definidas *-- Puede haber varias clases definidas
* llEXTERNAL_CLASS_Completed = .T. * llEXTERNAL_CLASS_Completed = .T.
ENDCASE ENDCASE
ENDFOR ENDFOR
ENDIF ENDIF
ENDWITH && THIS ENDWITH && THIS
@@ -6374,7 +6374,7 @@ DEFINE CLASS c_conversor_prg_a_bin AS c_conversor_base
*ERROR 'El conteo de clases externas (' + TRANSFORM(toModulo._ExternalClasses_Count) + ') no coincide con la cantidad encontrada (' + TRANSFORM(toModulo._Clases_Count) + ') en el archivo [' + toFoxBin2Prg.c_InputFile + ']' *ERROR 'El conteo de clases externas (' + TRANSFORM(toModulo._ExternalClasses_Count) + ') no coincide con la cantidad encontrada (' + TRANSFORM(toModulo._Clases_Count) + ') en el archivo [' + toFoxBin2Prg.c_InputFile + ']'
ERROR (TEXTMERGE(C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES)) ERROR (TEXTMERGE(C_EXTERNAL_CLASS_COUNT_DOES_NOT_MATCH_FOUND_CLASSES))
*CASE toModulo._ExternalClasses_Count <> toModulo._Clases_Count THEN *CASE toModulo._ExternalClasses_Count <> toModulo._Clases_Count THEN
ENDCASE ENDCASE
FOR I = 1 TO toModulo._ExternalClasses_Count FOR I = 1 TO toModulo._ExternalClasses_Count
@@ -6448,7 +6448,7 @@ DEFINE CLASS c_conversor_prg_a_vcx AS c_conversor_prg_a_bin
lcInputFile = FORCEPATH( JUSTSTEM( .c_InputFile ), JUSTPATH( .c_InputFile ) ) + '.*.' + JUSTEXT( .c_InputFile ) lcInputFile = FORCEPATH( JUSTSTEM( .c_InputFile ), JUSTPATH( .c_InputFile ) ) + '.*.' + JUSTEXT( .c_InputFile )
lnFileCount = ADIR( laFiles, lcInputFile, "", 1 ) lnFileCount = ADIR( laFiles, lcInputFile, "", 1 )
ASORT( laFiles, 1, 0, 0, 1) ASORT( laFiles, 1, 0, 0, 1)
FOR I = 1 TO lnFileCount FOR I = 1 TO lnFileCount
lcInputFile_Class = FORCEPATH( JUSTSTEM( laFiles(I,1) ), JUSTPATH( .c_InputFile ) ) + '.' + JUSTEXT( .c_InputFile ) lcInputFile_Class = FORCEPATH( JUSTSTEM( laFiles(I,1) ), JUSTPATH( .c_InputFile ) ) + '.' + JUSTEXT( .c_InputFile )
@@ -8481,7 +8481,7 @@ DEFINE CLASS c_conversor_prg_a_dbf AS c_conversor_prg_a_bin
IF toFoxBin2Prg.l_ClearDBFLastUpdate THEN IF toFoxBin2Prg.l_ClearDBFLastUpdate THEN
ldLastUpdate = EVALUATE( '{^2013/11/04}' ) ldLastUpdate = EVALUATE( '{^2013/11/04}' )
ELSE ELSE
ldLastUpdate = EVALUATE( '{^' + toTable._LastUpdate + '}' ) ldLastUpdate = EVALUATE( '{^' + toTable._LastUpdate + '}' )
ENDIF ENDIF
loDBFUtils.write_DBC_BackLink( .c_OutputFile, toTable._Database, ldLastUpdate ) loDBFUtils.write_DBC_BackLink( .c_OutputFile, toTable._Database, ldLastUpdate )
@@ -10701,9 +10701,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
*!* ENDSCAN *!* ENDSCAN
TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
* <<>>
ENDTEXT *
ENDTEXT
*!* CATCH TO loEx *!* CATCH TO loEx
*!* IF THIS.l_Debug AND _VFP.STARTMODE = 0 *!* IF THIS.l_Debug AND _VFP.STARTMODE = 0
@@ -10729,9 +10730,9 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
#IF .F. #IF .F.
LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG' LOCAL toFoxBin2Prg AS c_foxbin2prg OF 'FOXBIN2PRG.PRG'
#ENDIF #ENDIF
LOCAL llFileExists LOCAL llFileExists
llFileExists = FILE(tcOutputFile) llFileExists = FILE(tcOutputFile)
IF llFileExists AND FILETOSTR( tcOutputFile ) == tcCodigo THEN IF llFileExists AND FILETOSTR( tcOutputFile ) == tcCodigo THEN
@@ -10743,7 +10744,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base
toFoxBin2Prg.doBackup( .F., .T., '', '', '', tcOutputFile ) toFoxBin2Prg.doBackup( .F., .T., '', '', '', tcOutputFile )
toFoxBin2Prg.ChangeFileAttribute( tcOutputFile, '-R' ) toFoxBin2Prg.ChangeFileAttribute( tcOutputFile, '-R' )
ENDIF ENDIF
IF STRTOFILE( tcCodigo, tcOutputFile ) = 0 IF STRTOFILE( tcCodigo, tcOutputFile ) = 0
*ERROR 'No se puede generar el archivo [' + .c_OutputFile + '] porque es ReadOnly' *ERROR 'No se puede generar el archivo [' + .c_OutputFile + '] porque es ReadOnly'
ERROR (TEXTMERGE(C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC)) ERROR (TEXTMERGE(C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC))
@@ -11044,7 +11045,7 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg
ENDFOR ENDFOR
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg ) .write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
ENDIF ENDIF
ENDIF ENDIF
ENDWITH && THIS ENDWITH && THIS
@@ -11310,7 +11311,7 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg
ENDFOR ENDFOR
.write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg ) .write_OutputFile( @lcCodigo, lcOutputFile, @toFoxBin2Prg )
ENDIF ENDIF
ENDIF ENDIF
ENDWITH && THIS ENDWITH && THIS
@@ -12293,15 +12294,15 @@ DEFINE CLASS c_conversor_dbf_a_prg AS c_conversor_bin_a_prg
ENDIF ENDIF
ELSE ELSE
C_FB2PRG_CODE = C_FB2PRG_CODE + loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc, @toFoxBin2Prg ) C_FB2PRG_CODE = C_FB2PRG_CODE + loTable.toText( ln_HexFileType, ll_FileHasCDX, ll_FileHasMemo, ll_FileIsDBC, lc_DBC_Name, .c_InputFile, lc_FileTypeDesc, @toFoxBin2Prg )
*-- Genero el DB2 *-- Genero el DB2
IF .l_Test IF .l_Test
toModulo = C_FB2PRG_CODE toModulo = C_FB2PRG_CODE
ELSE ELSE
.write_OutputFile( (C_FB2PRG_CODE), .c_OutputFile, @toFoxBin2Prg ) .write_OutputFile( (C_FB2PRG_CODE), .c_OutputFile, @toFoxBin2Prg )
ENDIF ENDIF
ENDIF ENDIF
@@ -17744,7 +17745,7 @@ DEFINE CLASS CL_DBF_RECORDS AS CL_COL_BASE
FFLUSH( toFoxBin2Prg.n_FileHandle, .T. ) FFLUSH( toFoxBin2Prg.n_FileHandle, .T. )
ENDIF ENDIF
ENDSCAN ENDSCAN
lcText = '' lcText = ''
TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2 TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2