diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt
index 8c920f7..b50a315 100644
--- a/FoxBin2PRGVersionFile.txt
+++ b/FoxBin2PRGVersionFile.txt
@@ -3,7 +3,7 @@ Lparameters toUpdateInfo
Local lcNote
With toUpdateInfo
.VersionNumber = 'v1.19.46'
- .VersionDate = Date(2015,09,01)
+ .VersionDate = Date(2015,09,04)
.SourceFileUrl = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip'
.Link = 'http://vfpx.codeplex.com/wikipage?title=FoxBin2PRG'
@@ -17,13 +17,14 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
Change History -------------------------------------------------------------
-2015/09/01 v1.19.46
+2015/09/04 v1.19.46
- Bug Fix: set_UserValue() method causes error when trying to get information about another error and the VFP binary table can not be opened (ie, because corrupted memo)
- Feature: Added internal support for querying directory cfg information, with a new optional parameter, for API methods that require it (ie: get_Ext2FromExt, hasSupport*)
- Feature: Convert FUNCTION to PROCEDURE for maintaining compatibility with the way that VFP save methods on binaries
- New fb2p_diff.exe: Allow a quick Diff of VFP9 binaries, for those that don't need converting to text manually
- Bug Fix: When processing a directory or a project with all the files, sometimes an "Alias already in use" error may occur (Dave Crozier)
- Bug Fix mnx: When menu options contains '&&' in their texts, menu binary is corrupted when regenerated (Walter Nichols)
+- Bug Fix fb2p_diff: When calling fb2p_diff.exe from a directory out of FoxBin2Prg dir, an error is thrown because FoxBin2Prg is not found (Mike Potjer)
2015/06/21 v1.19.45
diff --git a/fb2p_diff.exe b/fb2p_diff.exe
index 13bd56a..7b0afff 100644
Binary files a/fb2p_diff.exe and b/fb2p_diff.exe differ
diff --git a/fb2p_diff.pj2 b/fb2p_diff.pj2
index 50290c8..3ca89fc 100644
--- a/fb2p_diff.pj2
+++ b/fb2p_diff.pj2
@@ -25,7 +25,7 @@ _LegalCopyright = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa):
_LegalTrademark = "Creative Commons 4: Reconocimiento - CompartirIgual (by-sa): http://creativecommons.org/licenses/by/4.0/"
_ProductName = "FB2P_DIFF"
_MajorVer = "1"
-_MinorVer = "0"
+_MinorVer = "1"
_Revision = "0"
_LanguageID = "1034"
_AutoIncrement = "0"
diff --git a/fb2p_diff.pjt b/fb2p_diff.pjt
index b802fdb..6d13fe6 100644
Binary files a/fb2p_diff.pjt and b/fb2p_diff.pjt differ
diff --git a/fb2p_diff.pjx b/fb2p_diff.pjx
index 7aa4079..563464e 100644
Binary files a/fb2p_diff.pjx and b/fb2p_diff.pjx differ
diff --git a/fb2p_diff.sc2 b/fb2p_diff.sc2
index 9d93980..eb35c7b 100644
--- a/fb2p_diff.sc2
+++ b/fb2p_diff.sc2
@@ -66,8 +66,10 @@ DEFINE CLASS frmdiff AS form
*m: updateglobalenabled
*p: colorgreen
*p: coloryellow
- *p: c_cfg_data
- *p: c_cfg_file
+ *p: c_cfg_data && Contenido del archivo de configuración
+ *p: c_cfg_file && Ruta del archivo de configuración
+ *p: c_curdir && Ruta actual de la llamada
+ *p: c_fb2p_diff_fullpath && Ruta de este form
*p: difftoolconfig && Configuration for the Diff tool
*p: difftoolname && Name of the Diff tool
*p: difftoolpath
@@ -94,8 +96,10 @@ DEFINE CLASS frmdiff AS form
Caption = "Diff VFP 9 binary files (scx,vcx,mnx,pjx,frx,lbx,dbc,dbf)"
colorgreen = (RGB(35,245,24))
coloryellow = (RGB(239,245,165))
- c_cfg_data =
- c_cfg_file = fb2p_diff.cfg
+ c_cfg_data = && Contenido del archivo de configuración
+ c_cfg_file = && Ruta del archivo de configuración
+ c_curdir = && Ruta actual de la llamada
+ c_fb2p_diff_fullpath = && Ruta de este form
difftoolconfig = && Configuration for the Diff tool
difftoolname = && Name of the Diff tool
difftoolpath =
@@ -149,6 +153,8 @@ DEFINE CLASS frmdiff AS form
+
+
&& XML Metadata for customizable properties
ADD OBJECT 'chkAlwaysOnTop' AS checkbox WITH ;
@@ -956,6 +962,8 @@ DEFINE CLASS frmdiff AS form
ENDPROC
PROCEDURE Init
+ LOCAL lcSys16, lnPosProg
+
*-- init
THISFORM.MinHeight = THISFORM.Height
THISFORM.MaxHeight = THISFORM.Height
@@ -963,6 +971,17 @@ DEFINE CLASS frmdiff AS form
THISFORM.a_Tools = ''
+ lcSys16 = SYS(16)
+ IF LEFT(lcSys16,10) == 'PROCEDURE '
+ lnPosProg = AT(" ", lcSys16, 2) + 1
+ ELSE
+ lnPosProg = 1
+ ENDIF
+
+ THIS.c_CurDir = SYS(5) + CURDIR() && Directorio actual, que no necesariamente es donde está FoxBin2Prg
+ THIS.c_fb2p_diff_FullPath = SUBSTR( lcSys16, lnPosProg )
+ THIS.c_CFG_File = FORCEEXT( THIS.c_fb2p_diff_FullPath, 'CFG' )
+
ENDPROC
PROCEDURE initialize
diff --git a/fb2p_diff.sct b/fb2p_diff.sct
index bc91260..c05d4f5 100644
Binary files a/fb2p_diff.sct and b/fb2p_diff.sct differ
diff --git a/fb2p_diff.scx b/fb2p_diff.scx
index e52ce0a..8d49394 100644
Binary files a/fb2p_diff.scx and b/fb2p_diff.scx differ
diff --git a/main_fb2p_diff.prg b/main_fb2p_diff.prg
index 386ca86..a2d0242 100644
--- a/main_fb2p_diff.prg
+++ b/main_fb2p_diff.prg
@@ -18,11 +18,18 @@
* USO/USE:
* DO MAIN_FB2P_DIFF.PRG WITH "\File1.vcx" "\File.vcx"
*---------------------------------------------------------------------------------------------------
+*
+* 04/09/2015 Mike Potjer Reporte de Bug: Cuando se llama al programa fb2p_diff.exe desde un directorio distinto al de FoxBin2Prg, da un error por no encontrar al conversor (Arreglado en v1.1)
+*
+*---------------------------------------------------------------------------------------------------
LPARAMETERS tcFilename1, tcFilename2
-LOCAL lnResp
+LOCAL lnResp, lcSys16, lcOldPath
PRIVATE poFrm as Form
-lnResp = 0
+lnResp = 0
+lcSys16 = SYS(16)
+lcOldPath = SET("Path")
+SET PATH TO (JUSTPATH(lcSys16)) ADDITIVE
DO FORM FB2P_DIFF.SCX NAME poFrm LINKED NOSHOW
poFrm.filename1 = EVL(tcFilename1, '')
@@ -32,6 +39,7 @@ poFrm.show()
READ EVENTS
STORE NULL TO poFrm
+SET PATH TO (lcOldPath)
RELEASE poFrm
IF _VFP.STARTMODE <> 4 OR NOT SYS(16) == SYS(16,0) && 4 = Visual FoxPro was started as a distributable .app or .exe file.