From 2aac42852503b2afabb87b87870e970c9cdd0d6a Mon Sep 17 00:00:00 2001
From: fdbozzo <fdbozzo@.(none)>
Date: Sat, 18 Feb 2017 16:11:01 +0100
Subject: [PATCH] Replace Scripting.FileSystemObject MoveFile with Win32API
 equivalent

---
 FileName_Caps/Filename_caps.pj2 |   4 +--
 FileName_Caps/Filename_caps.pjt | Bin 8399 -> 9001 bytes
 FileName_Caps/Filename_caps.pjx | Bin 1583 -> 1583 bytes
 FileName_Caps/filename_caps.prg |  56 ++++++++++++++++++++++++--------
 Normalize_FileNames.vbs         |   8 +++--
 filename_caps.exe               | Bin 30137 -> 30585 bytes
 6 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/FileName_Caps/Filename_caps.pj2 b/FileName_Caps/Filename_caps.pj2
index 24e849d..083628f 100644
--- a/FileName_Caps/Filename_caps.pj2
+++ b/FileName_Caps/Filename_caps.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 = "FILENAME_CAPS"
 _MajorVer = "2"
-_MinorVer = "3"
+_MinorVer = "4"
 _Revision = "0"
 _LanguageID = ""
 _AutoIncrement = "0"
@@ -33,7 +33,7 @@ _AutoIncrement = "0"
 
 
 *<BuildProj>
-*<.HomeDir = 'c:\desa\filename_caps' />
+*<.HomeDir = 'c:\desa\foxbin2prg\filename_caps' />
 
 FOR EACH loProject IN _VFP.Projects FOXOBJECT
 	loProject.Close()
diff --git a/FileName_Caps/Filename_caps.pjt b/FileName_Caps/Filename_caps.pjt
index 70611661327bbbc91aca8b7c5e36461fc7710ebd..59df1e2e38c0bad22fb15f2c8ba3a2fa6699c0cd 100644
GIT binary patch
delta 1749
zcmah~Yitx%6h3!$c4lWEbi0r4i!NK1QXviW#iJXEOlN1?t=rvpIz=>1nx$QE4W-a7
zh!2A09~yt)4MzE8{e_sAH2cFuLo_1smm#G|BMA{3O^Ak|5YuI|-Kl402`^2&lRI-B
z-#z!7bI-YRP5dmu0z|hIZwYIJnwahMiV!Gfm|Gm_qT7Ym{-*KR=tOQNJ9=>H<bnK=
zj-%6uMi1r>=Z<72b7SM#qcebm;QU`8ofDdhH-%<%_gO3A*<?DY9yEbvAhS<SBvUfd
z_Fh>{iNmU_C>aHLM<SyPi0XhmJS_GifbOV!$pf8IY&0$pi=&Cm{+?vIV^Ha(v%+)k
z|CYCS+%fI`T7)s2bOS890Mh5`z0nId8T7mveYxQTXs8Ex4OJJA--)#Kl+qt6{#4gT
zPG5j1yuDDdz`)drTmpk{sMz5}SxL*O&W>&IRBDM|(l+T3JM`uXsq9Qao}QkXeio*6
z>KF$krlu#eg@N46O!m;fY%TD$XUVS<S|fZsu`1oLfqXJwkftVbiL~^9z;gGB8LFBI
zMmRvf9;VRp$SV_|Tj<Rb`NVyn%%%;*czjUF49bf7vfn{}t_ukk_^NE4v}z}4qQ2nM
z9H5qb;9SN1s+tWM4w>Jm-4&&`U9C)rP_H}E+(rywg8?K}jfJolLa+w~l2r0SsR2gm
z9@nmhuNln+&8sB_Dg+XB)w20E(G+?w=%aHkiTRSDeeTyuk$&rbmAz}y_81z;6KDP~
z(X*cK$s087Z70X+JKjy~F|(G?^~G<z2MCGLjlTAEI|cN_-&ZyZT-m&rW_=+n;#0n@
zWQ<<K_q%k_x7AnV40m1VU8xS^vOouddHPYHm9$XNKh6#DW%HtiUh)UYdvwhoqQCgV
z<SJ6#WX<5!K$z^JGl3|BFn!(U#j639Sb3|~TuT|f77XlO@uT^AJzyVT3Y{454}!Mt
zVN#`)fT6y)`b1$F*`t33d)T~Hd&P)970R4GXUD{;%iX0Qdi^&Cr4TOlqU9Q0X8T#)
zdf29gQ7Gxs^{^N1PGZ68-RePY(1vIDMX3?^QW$WxiXZ)i(6va}1Z1eHwV<$37nZHy
zL^;$vpYS78hoER>gR!+*+XJDf!Zmwp=dPc<LywpR+_BS!#c&xj94edNw__<cuT})u
z-PV?EYwOw>(@jKxAaK#9y=4S@Cv-{;!5CLzpf$qP_TZ!kjHAXh0axKsb2xt_7vYRJ
zHzN8mAPQVn^XNG!nPCj8tX;3NvvzuU{Rm@m&<%}259`pJ2Eq<=R@C0LYg=&h20GsO
zJlRA)X}ohft;p)*u6nwSuoL$uRVfpfu@iYPuBvo~hliJx1ycIzl$=ItuxBKZkd<dT
zkB7LdipkWl0N8($93N3+4pPaqoX*(wFa0qrbg`gcka;`={o=BMls%d+WDn=x%=I%h
znGdC({%)u>gJS6Ya5P!L%M9QzGEerg40De80Cqq-BQjm41=0!g<P03(ufsfuWC890
zVdlszEP#j_e3SdoM4HSZ%)&fXH=KVVZW?0TWEosUgzrqVFo(J;h*8KgDZ&sr#tflG
zgzGrb4w>ggD42W5F;<tJq0We}?-C5!+I6R%8a#4N{1g0Y1876qj?;p#@MeG*(jVfi
g3IJP?--h&fj2@3{6dwJC==sQIkA9i!196YWKQD0&;{X5v

delta 1135
zcmaJ>?N3`(7=O-b@9jG+w3PO?^c5Dy0LyTjBbs@+v>VBw+IDk^RnnC*uR>R$iSvah
zCdTPv40|+YA6c>wd{_+h^FFxklZgTTfca%hjAEjDk<ygj`Lrf#V&X}jljoe@?|D1t
zIcF`gDH{Pon*hKn+on209e*b1&W~ni3X8eytU6aH=H?62`CMs{IKTi5x|Q}HD~EJX
z1vY|*Oall0mkoW&Xm&iFmhp<c57$gy9OhExwy9Sz{u|L}L;wugUvag|+M}l-PJy7W
z9pDECz^g0mol&pGD0(k#2kijkBxQmw(|U&V-5Z7YNaeWW6yr-)JmK)+haG~xWY)gI
z%N^y^%XJCTN^0Vz%*52mp#)Wxes{54m`|R6vyd-q7RXdZaO^*5X#J#ik*YK;@(XII
ztQIf)$KsbMbULGL9wNJ%WMz*#Uc)u#G52GxbwKZal|!9D!rrI}x0sf~n7<2cE`|Tb
z@rZMfw{e_thMZBZ*~o>PT<kH{(DV?%l<OU~gWtQ}&>zriFSHCNJI8rMkJx#at>ZcO
zFuRGLyL;GL<y-d$j4j}RXSl6sB3GVMH9;0@!X<pm<70F9si&WPgBvv8#(SQA_m0?#
z*Fo{Bc4%luINT(6dk6Wn0k<Rtzw`#fpBZX`#iaScN`*ny2764uYk*lQ=!}aBx`UhE
z<E%lm4|}8lKW4-&uY|8l0d^6Wq$szTFyI|v_bZ!{o{46&)&tk@p3iG|(gnL7XyA~4
zjIw*%ua53mC?h&9J&@xs%ya^`C@Wu0_{pMm6Hqt7bFo-17JK&S=o1mDUSLEVv}o_Q
zPUea~jDK`zGZIXTbq)g|u}SiQNEc%JYvBj6ZXje%Efzwe(!{%o{SP4kVncILETt;I
zG!;4AytVrlyb(BKo42-_quCJ;8n_>jT&h)bw8&OiH4`yy)ecfFZhSHLJPYDd@YjRM
zL^^4N$>iC1V&Zh%0ORqDJaIa0fOsmEOid*XFd0v$<&$yT3Wfb<P;w=;oSReME2z}=
z&Ca)h8Ls~f412@T6C>2$0Kc<!c2>{%3cm_RV4ZyoifIE@xy-g<nM7ufAk4yo49oBk
z7++<}K)bMkE8(y0V>+3Cr(1?q!tcN~CL>+aI^mCju@x>ugvl@lS78LMgTss;MchZ-
zW`J{HfEWe;grs4jr$*}`(&>N5tJ&N_S)I-0%Zu6Bi<i!;#lxkA3wSpY!H1C^SM%XE
J2U+|*{sbLFR4M=f

diff --git a/FileName_Caps/Filename_caps.pjx b/FileName_Caps/Filename_caps.pjx
index 96f0b1a5dd249868c627d1c1918645defe1bc5ba..b47c25d93de88b68664de0034a736e235063494a 100644
GIT binary patch
delta 173
zcmZ3_vz~{=K#)mjBg;}2vo-t-3?2$_U}$7wW@%(#X<;G7#K2I=$-tnX5EA0%W~iWG
zWM<$B6a#^P$@f{LxC((<L0}K(WOg?7$y%&}oJNL57N+JFMh25zSTpUlfyx8mMjL?5
rHng-fF@xx1U~mgjP;dh&Ff}m&i9O(BV0aERRl&^E#L{^38&+okPKh2i

delta 173
zcmZ3_vz~{=fRCGXBg;}2vtN7+3?2$_U}$J&Vq{@yYHT3I#K52p#0m-_A#QGl3JOMM
z2A)7Z2!u?&&mzTD#0lYD<DAUSraoDVRglxr*vP`v+|a~yvI}db{T`r#0JzZxFtd%!
kAo>^>+(Hx-+&~IUO-w*yTKo(QZ9uF5G{w?n@*7rX0BHgpw*UYD

diff --git a/FileName_Caps/filename_caps.prg b/FileName_Caps/filename_caps.prg
index 7c07146..c592838 100644
--- a/FileName_Caps/filename_caps.prg
+++ b/FileName_Caps/filename_caps.prg
@@ -45,19 +45,34 @@ RETURN lcFileName
 
 DEFINE CLASS cl_FileName_Caps AS Custom
 
+	PROCEDURE INIT
+		DECLARE INTEGER MoveFile IN KERNEL32.DLL STRING lpExistingFileName, STRING lpNewFileName
+		DECLARE INTEGER GetLastError IN KERNEL32.DLL
+		
+		* DOCUMENTACIÓN: https://msdn.microsoft.com/en-us/library/windows/desktop/ms679351(v=vs.85).aspx
+		DECLARE INTEGER FormatMessage IN KERNEL32.DLL INTEGER dwFlags, INTEGER lpSource, INTEGER dwMessageId ;
+			, INTEGER dwLanguageId, STRING @lpBuffer, INTEGER nSize, INTEGER Arguments
+		_SCREEN.AddProperty("ExitCodeFNC",0)
+	ENDPROC
+
 	PROCEDURE Capitalize
 		LPARAMETERS tcFileName, tcFileMask, tcFileMaskType, tcLog, tlRelanzarError, tcDontShowErrors
 
 		TRY
 			LOCAL loEx AS EXCEPTION, laMasks(1,4), lcDefinition, lcFileDef, lcMaskDef, laLines(1), lcMenErr ;
-				, I, X, lcName, lcExt, lcPath, lcFileName, laFile(1,5), lcLogFile, lcSys16, lnPosProg ;
-				, loFSO AS Scripting.FileSystemObject
+				, I, X, lcName, lcExt, lcPath, lcFileName, laFile(1,5), lcLogFile, lcSys16, lnPosProg, lnRet
 
+			lnRet				= 0
 			loEx				= NULL
-			loFSO				= CREATEOBJECT('Scripting.FileSystemObject')
 			tcFileMaskType		= EVL(tcFileMaskType,'M')
 			lcFileName			= tcFileName
-			lcLogFile			= FORCEEXT(SYS(16),'LOG')
+			lcSys16				= SYS(16)
+			IF LEFT(lcSys16,10) == 'PROCEDURE '
+				lnPosProg	= AT(" ", lcSys16, 2) + 1
+			ELSE
+				lnPosProg	= 1
+			ENDIF
+			lcLogFile			= FORCEEXT( SUBSTR( lcSys16, lnPosProg ), 'LOG' )
 			tcLog				= ''
 			tcDontShowErrors	= EVL( tcDontShowErrors, '0' )
 
@@ -66,13 +81,6 @@ DEFINE CLASS cl_FileName_Caps AS Custom
 					tcLog	= tcLog + CR_LF + '- No hay máscara definida ni archivo de configuración'
 					EXIT	&& No se indicó nada que hacer
 				ELSE
-					lcSys16 = SYS(16)
-					IF LEFT(lcSys16,10) == 'PROCEDURE '
-						lnPosProg	= AT(" ", lcSys16, 2) + 1
-					ELSE
-						lnPosProg	= 1
-					ENDIF
-
 					tcFileMask	= FORCEEXT( SUBSTR( lcSys16, lnPosProg ), 'CFG' )
 					tcLog	= tcLog + CR_LF + '- Se usará el archivo de configuración [' + tcFileMask + ']'
 					IF NOT FILE(tcFileMask)
@@ -163,9 +171,19 @@ DEFINE CLASS cl_FileName_Caps AS Custom
 					EXIT
 				ENDIF
 			ENDFOR
+			
+			*MESSAGEBOX( 'lcLogFile = ' + TRANSFORM(lcLogFile),0+4096, 'Error' )
 
 			IF ADIR( laFile, lcFileName, '', 1 ) > 0 AND laFile(1,1) <> JUSTFNAME(lcFileName)
-				loFSO.MoveFile( FORCEPATH( laFile(1,1), JUSTPATH(lcFileName) ), lcFileName )
+				lnRet	= MoveFile( FORCEPATH( laFile(1,1), JUSTPATH(lcFileName) ), lcFileName )
+				*MESSAGEBOX('(MoveFile) lnRet = ' + TRANSFORM(lnRet),0+4096, 'Error')
+				
+				IF lnRet = 0 && Failed
+					lnRet = GetLastError()
+					*MESSAGEBOX('(GetLastError) lnRet = ' + TRANSFORM(lnRet),0+4096, 'Error')
+					ERROR 'MoveFile'
+				ENDIF
+				
 				tcLog	= tcLog + CR_LF + '  => Se renombrará a [' + lcFileName + ']'
 			ELSE
 				tcLog	= tcLog + CR_LF + '  => No se renombrará a [' + lcFileName + '] porque ya estaba correcto.'
@@ -173,6 +191,19 @@ DEFINE CLASS cl_FileName_Caps AS Custom
 
 
 		CATCH TO loEx
+			_SCREEN.ExitCodeFNC = loEx.ErrorNo
+
+			IF loEx.ErrorNo = 1098 && User defined error
+				IF LOWER(loEx.Message) == 'movefile'
+					* SE OBTIENE EL MENSAJE DE ERROR DEL SISTEMA CORRESPONDIENTE A GetLastError()
+					* FORMAT_MESSAGE_FROM_SYSTEM	0x00001000
+					LOCAL lnRetLen, lpBuffer
+					lpBuffer = REPLICATE(CHR(0),256)
+					lnRetLen = FormatMessage(0x00001000,0,lnRet,0,@lpBuffer,256,0)
+					loEx.Message = LEFT(lpBuffer, lnRetLen)
+				ENDIF
+			ENDIF
+
 			IF tlRelanzarError THEN
 				THROW
 			ELSE
@@ -190,7 +221,6 @@ DEFINE CLASS cl_FileName_Caps AS Custom
 			ENDIF
 
 		FINALLY
-			loFSO		= NULL
 			tcFileName	= lcFileName
 
 			*-- Si existe FileName_Caps.LOG, lo actualiza
diff --git a/Normalize_FileNames.vbs b/Normalize_FileNames.vbs
index 7162027..2aab863 100644
--- a/Normalize_FileNames.vbs
+++ b/Normalize_FileNames.vbs
@@ -48,7 +48,11 @@ Else
 	Next
 
 	If GetBit(nDebug, 4) Then
-		MsgBox "End of Process!", 64, WScript.ScriptName
+		If nExitCode = 0 Then
+			MsgBox "End of Process!", 64, WScript.ScriptName
+		Else
+			MsgBox "End of Process!", 48, WScript.ScriptName
+		End If
 	End If
 End If
 
@@ -93,7 +97,7 @@ Private Sub evaluateFile( tcFile )
 		MsgBox cCMD, 0, "PARAMETERS"
 	Else
 		nRet = oVFP9.DoCmd( cCMD )
-		'nExitCode = oVFP9.Eval("_SCREEN.ExitCode")
+		nExitCode = oVFP9.Eval("_SCREEN.ExitCodeFNC")
 	End If
 End Sub
 
diff --git a/filename_caps.exe b/filename_caps.exe
index 4ecf2fa9fa8facdeacbe549aa0ba47d3152e8808..93cf86cb8f9a2c8b71e61c80f7e1bd0f39965842 100644
GIT binary patch
delta 1733
zcmZWqZEO>D7=Ql%Uhn$qUf8;_ve7XnNDy0Afh}NmT(2<f+V$Gu%NA#4Wh<`h))f>~
zmf;72#wh-kL_Ud$i4mhNi!sLd0hRELu#rspxM*Sov!F36P1n=se_cTEu6Osm{GQi)
zp6fTaNO6gLY3a8LK!G0utLgVx?wpw?KKDDfSfKxT5@7H5KSlzxm-~YjYsVUZTeSd@
zvn{SJdtA{}HL@of3OQ|>8jtpAipn_(1lrKsjcNc_4Zsn!IFI}eq;0Qh2U?I``3l%)
zDbMWdLz~Fdd1!@K=Smjn$sS9E(xWL?$pKHQT0{-EZ{HRShZm#;eItiBU|%X9PEO|4
zTrQh?5T>_tj1xlHTqc?CNli{BhyUkmPO6*>ZcgY;@WIfEa>EYl%jvw59ZH2F${hlW
z9m{4Y>n7+E0rQF;R72fi)p9p06JT1HjhYC{@r0^rQ4QlpwH`UqqsHU%KGhC#Fxaa_
zdsQv*jN6ITdWDQlKgO=5@(sEZ5`_k+Ucpdh-Hwci%&+X+;a2w2@K)*}?Bii?n~xYk
zmjNVYU4UlYgWx(8C`zFo3N9F6R}SxVeM|LPXj>^zC=m!%m5b)zh_11jtc&@EgY;|4
zejZ*&B3vMpHp8RLGtxz7*}%w%uw>Hr7{Hq&D!pl9{`8OJI9pEp$x*iX$VNJ0W?y98
zv$-RO2<c=CFZ!!?STQa4{-W6`7R_A}lSk{tzB-H<VE)l9WRMNu{S9_{bW6jmXjD*(
z2^XrcR10i3Ou}PZ=_ZMt7*kkBX1y4bistJU_FSfszA3S#Oe1?Q(@ZZ{$g4>H!^vI3
zPK&;d-OkjpC&nBU4Y-?&7Ibrx>^ExgWXEihO>e8Tm%W``+qvw<xHY^v4S?;g#yqcB
z^@mnpfU>;SP=B)WpZTkFdN=oIF1f(#WeeFhA#Ky2t%%lg(be%LCXa8MI_tpJCl)&j
zjacO0A{0F6upZ-8=%R2y;4z!+dNT?YE?oy*7%hX-ei)~ncdpTnQ}B7A38X?ZpmhQt
z{2gP$-l7RetgLTBVG|b?ZBUJJsMIs$Mkt4%XnDO6I#G#%P*kDKo=QD@dYrru0${{;
zJC4(L_(D8I^IHzwgSM5D6?XZ2NuMvUqm#Sv0zu$)yZ*|3Wgm}wU{EYk*y<H4kwoPV
zbyk=b5K9tjM$=;{uV_@e0nzsWtss{5I^Kzb83u7${d`)_u=5iKsm0046ODC(Q?E7v
z4!B@L<&r~x1T%0mCD%zdvXi+#rXre}xVM-0FCy;p)7=Rr8dPzYB`}sV5|v<eF)a}0
z)?qb*RPWxtP)L1ncO?j_3AsBQw*qdkq6YgkRfKSNM2$op{K+m(S_1-fN4gVfd=vNs
z8z{-~bUrznK9M?rpHnVtK<P)n8>DVflwF%_ohspn5#TnNAqNFY&(e3{aqv@_2269L
z9cIWWctM(n8IZ{w{0W3!Ak#1hGHUQn{(=_LVwPbV`9*<{89_#!3>(P2sfAu56L?-)
zJvr(ph|w5L3N<L>IzJo9Kecaq)hcL;(KTcdYKaWro2KCcdj0_;Xk?MhLX1q%7;0pg
z#|yI{Gm;E>^IkGx*q>rc`G&-&&};YelI}Ys<f?4|zt{nMNIUSd;H~*#fKH^(;Z?Q*
vY(ah-(tH)hl9|-tq2&1F0P8r~)96C+-9tu-|M|4zb2t0&XuWV8|Bn6zo(dHB

delta 1256
zcmZ`(Z%kWN6hHU&z1Q~9+Kv{AbU=|UYy|l;m_u}vx6&eJP-x3E5;t(`+G44dmKpqD
z><m#8w}hQ(<RgpO{N{knY{o^GX=1XN1<kS#`{D-^BhLTJx|hO>=XOS%#@pW4-|yYu
z@ARH~&U^aL?Bb8?oMqH%0uExBaMP&QvO~Yd;QWDZ>>M3q9r(^@E9+SPVzk#{o!JEN
zD9xU^`U=h381aV#fx+FOV9>6H1Ch{3*dGv#0fVg+F6#hzkLH(7fH#R>Abf3ZHs~U}
zb{_Ef5%2QrhZ`ARu@Ux3AFIYGTs)Es4;QO}g7*(a`v?14g2_}YGLy~4CPU9p#17?*
zGKdxwaISr~ZZr|}5cCVjp{ZmhmrTe1<5(TU$KwqTRFT*%#QwY7`5b;7-&HA_jB?nz
zR^U)%5Ol2T@)c%0gLR2Y$$ytwu_F=W%!CKx4|6xi<8dF~&hf)|CBByMuxEwNDRe&N
z-nF<5_TW;YhppouiG<WE8T~?|ZfG!@?BhKWev<s0-NgJvJG+6)6I=K<GS(!j{vllc
zWg^Dd2RM>ycf4;k>`?WjF2A7Y@@X@Ema0%j+_c$u@m#8jUB;Vqy@kqTlc&N=(rBTa
z(kwV&-LSxplI3c;nZIR5J?+N}lXc3nS(kTOaX9@~pr0_6_M$6Y%Ns2?nXbkGg5v^q
zv3Wd`Zs4RAG3-`~@hXe{JFT~0%xrr~HMYP!9WSNJ=zGTne%i_E_0<)i-`gIzQ$<?}
z3a@M9NPJ4s4ZHXFBKT>h5>I5xq>ohNun;-!6L|pHR1IFwv~)jVqb#Xx63`*sPz?z#
zQKnv9e#~an&_dA)U2SdSZEc;8bl+B>@E|Y}=F5!P{|P%2sfL3}kwddj5e6?%MY;VR
z*$hh2Oe?8mI!2Wi>oug_5Y&RQZn)`x{RJ5gQYW>GPTGZEP3`ZxY%BGvXj1A|Q5z7o
zDW`*QlpJnoBk?7h;Ve-bEU3iK;!t*k)nRQcf_ip-dngzQSzsWvKM?HS7cfI_AgcB6
zi<lu04u`^nAu|jFA`z`GfO@WevkLz4Ofol~O1=_HGN9)Xzz!;${s9;cPB#p_L60K9
zuWXS$Epa}_Pr^=EWXHg7U4jL!u@%VE)Y$J(&+@VcdH4+&UtoElyRgI-WX2XHjj#p}
zv6B*Bov!BfGJZcj)~b<SeD<0&J}%`!Q#80z@{yYjTQtbYd)Z4R_c2(+6GuIrPPJWZ
w=)Pel)~o`2TMr;sXKA{K-y+^h81<tA)fNJO4~>v`KZ%!53y!^9AzdW)Cn3Us>i_@%