* **V7.7.2**

* Fixed forum authentication with non ansi characters like Hindi, Cyrillic or Asian * Fixed incorrect share folder detection when permission denied ocurres * Fixed removal of "Zone.Identifier" for files in lib\adb and lib\curl folders * Fixed forum authentication running before check prerequisites
MyBotRun · Mar 6, 2019 · 55d00c4 · 55d00c4
1 parent 2d71167
commit 55d00c4
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 19 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,10 @@
-* **V7.7.1**
+* **V7.7.2**
+* Fixed forum authentication with non ansi characters like Hindi, Cyrillic or Asian
+* Fixed incorrect share folder detection when permission denied ocurres
+* Fixed removal of "Zone.Identifier" for files in lib\adb and lib\curl folders
+* Fixed forum authentication running before check prerequisites
+
+* **V7.7.1**
 * Added MyBot.run Forum user authentication registration to bot fixing COPYCAT problems
 * Added Android click mode (minitouch or WinAPI) to Bot/Android options, default is now minitouch as it's most stable
 * Added REMAIN cmd in csv attack

diff --git a/COCBot/functions/Android/Android.au3 b/COCBot/functions/Android/Android.au3
@@ -1819,7 +1819,7 @@ Func _AndroidAdbLaunchShellInstance($wasRunState = Default, $rebootAndroidIfNecc
 					If $path = "" Then ContinueLoop
 					If StringRight($path, 1) <> "/" Then $path &= "/"
 					$s = AndroidAdbSendShellCommand("set result=$(ls '" & $path & $dummyFile & "' >&2)", 10000, $wasRunState, False) ; use timeout of 10 Seconds
-					If StringInStr($s, $dummyFile) > 0 And StringInStr($s, "No such file or directory") = 0 And StringInStr($s, "syntax error:") = 0 Then
+					If StringInStr($s, $dummyFile) > 0 And StringInStr($s, $dummyFile & ":") = 0 And StringInStr($s, "No such file or directory") = 0 And StringInStr($s, "syntax error") = 0 And StringInStr($s, "Permission denied") = 0 Then
 						$pathFound = True
 						$g_sAndroidPicturesPath = $path
 						SetDebugLog("Using " & $g_sAndroidPicturesPath & " for Android shared folder")

diff --git a/COCBot/functions/Other/MBRFunc.au3 b/COCBot/functions/Other/MBRFunc.au3
@@ -178,7 +178,7 @@ EndFunc   ;==>CheckForumAuthentication
 
 Func ForumLogin($sUsername, $sPassword)
 	If $g_hLibMyBot = -1 Then Return False ; Bot didn't finish launch yet
-	Local $result = DllCall($g_hLibMyBot, "str", "ForumLogin", "str", $sUsername, "str", $sPassword, "str", $g_sBotTitle)
+	Local $result = DllCall($g_hLibMyBot, "str", "ForumLogin", "str", _Base64Encode(StringToBinary($sUsername, 4), 1024), "str", _Base64Encode(StringToBinary($sPassword, 4), 1024), "str", _Base64Encode(StringToBinary($g_sBotTitle, 4), 1024))
 	If @error Then
 		_logErrorDLLCall($g_sLibMyBotPath & ", ForumLogin:", @error)
 		Return SetError(@error)
@@ -271,7 +271,7 @@ EndFunc   ;==>ReduceBotMemory
 
 Func RemoveZoneIdentifiers()
 	; remove the Zone.Identifier from any exe or dll
-	Local $aPaths = [@ScriptDir, $g_sLibPath]
+	Local $aPaths = [@ScriptDir, $g_sLibPath, $g_sLibPath & "\adb", $g_sLibPath & "\curl"]
 	For $i = 0 To UBound($aPaths) - 1
 		Local $sPath = $aPaths[$i]
 		Local $aFiles = _FileListToArray($sPath, "*", $FLTA_FILES, True)

diff --git a/MyBot.run.MiniGui.exe b/MyBot.run.MiniGui.exe
diff --git a/MyBot.run.MiniGui_stripped.au3 b/MyBot.run.MiniGui_stripped.au3
@@ -5,11 +5,11 @@
 #pragma compile(Icon, "Images\MyBot.ico")
 #pragma compile(FileDescription, Clash of Clans Bot - A Free Clash of Clans bot - https://mybot.run)
 #pragma compile(ProductVersion, 7.7)
-#pragma compile(FileVersion, 7.7.1)
+#pragma compile(FileVersion, 7.7.2)
 #pragma compile(LegalCopyright, © https://mybot.run)
 #Au3Stripper_Off
 #Au3Stripper_On
-Global $g_sBotVersion = "v7.7.1"
+Global $g_sBotVersion = "v7.7.2"
 Opt("MustDeclareVars", 1)
 Global $g_sBotTitle = ""
 Global $g_hFrmBot = 0

diff --git a/MyBot.run.Watchdog.exe b/MyBot.run.Watchdog.exe
diff --git a/MyBot.run.Watchdog_stripped.au3 b/MyBot.run.Watchdog_stripped.au3
@@ -5,11 +5,11 @@
 #pragma compile(Icon, "Images\MyBot.ico")
 #pragma compile(FileDescription, Clash of Clans Bot - A Free Clash of Clans bot - https://mybot.run)
 #pragma compile(ProductVersion, 7.7)
-#pragma compile(FileVersion, 7.7.1)
+#pragma compile(FileVersion, 7.7.2)
 #pragma compile(LegalCopyright, © https://mybot.run)
 #Au3Stripper_Off
 #Au3Stripper_On
-Global $g_sBotVersion = "v7.7.1"
+Global $g_sBotVersion = "v7.7.2"
 Opt("MustDeclareVars", 1)
 Global Const $WAIT_TIMEOUT = 258
 Global Const $STDERR_MERGED = 8

diff --git a/MyBot.run.Wmi.exe b/MyBot.run.Wmi.exe
diff --git a/MyBot.run.Wmi_stripped.au3 b/MyBot.run.Wmi_stripped.au3
@@ -6,7 +6,7 @@
 #pragma compile(Icon, "Images\MyBot.ico")
 #pragma compile(FileDescription, Clash of Clans Bot - A Free Clash of Clans bot - https://mybot.run)
 #pragma compile(ProductVersion, 7.7)
-#pragma compile(FileVersion, 7.7.1)
+#pragma compile(FileVersion, 7.7.2)
 #pragma compile(LegalCopyright, © https://mybot.run)
 #Au3Stripper_Off
 #Au3Stripper_On

diff --git a/MyBot.run.au3 b/MyBot.run.au3
@@ -596,8 +596,6 @@ Func FinalInitialization(Const $sAI)
 	DisableProcessWindowsGhosting()
 
 	UpdateMainGUI()
-
-	ForumAuthentication()
 
 EndFunc   ;==>FinalInitialization
 
@@ -628,6 +626,11 @@ Func MainLoop($bCheckPrerequisitesOK = True)
 		If $g_bBotLaunchOption_MinimizeBot Then BotMinimizeRequest()
 	EndIf
 
+	If $bCheckPrerequisitesOK Then
+		; only when bot can run, register with forum
+		ForumAuthentication()
+	EndIf
+
 	Local $hStarttime = _Timer_Init()
 
 	; Check the Supported Emulator versions

diff --git a/MyBot.run.exe b/MyBot.run.exe
diff --git a/MyBot.run.version.au3 b/MyBot.run.version.au3
@@ -15,8 +15,8 @@
 #pragma compile(Icon, "Images\MyBot.ico")
 #pragma compile(FileDescription, Clash of Clans Bot - A Free Clash of Clans bot - https://mybot.run)
 #pragma compile(ProductVersion, 7.7)
-#pragma compile(FileVersion, 7.7.1)
+#pragma compile(FileVersion, 7.7.2)
 #pragma compile(LegalCopyright, © https://mybot.run)
 #Au3Stripper_On
 
-Global $g_sBotVersion = "v7.7.1" ;~ Don't add more here, but below. Version can't be longer than vX.y.z because it is also use on Checkversion()
+Global $g_sBotVersion = "v7.7.2" ;~ Don't add more here, but below. Version can't be longer than vX.y.z because it is also used in Checkversion()
diff --git a/MyBot.run_stripped.au3 b/MyBot.run_stripped.au3
@@ -5,11 +5,11 @@
 #pragma compile(Icon, "Images\MyBot.ico")
 #pragma compile(FileDescription, Clash of Clans Bot - A Free Clash of Clans bot - https://mybot.run)
 #pragma compile(ProductVersion, 7.7)
-#pragma compile(FileVersion, 7.7.1)
+#pragma compile(FileVersion, 7.7.2)
 #pragma compile(LegalCopyright, © https://mybot.run)
 #Au3Stripper_Off
 #Au3Stripper_On
-Global $g_sBotVersion = "v7.7.1"
+Global $g_sBotVersion = "v7.7.2"
 Opt("MustDeclareVars", 1)
 Global $g_sBotTitle = ""
 Global $g_hFrmBot = 0
@@ -8009,7 +8009,7 @@ Return $bAuthenticated
 EndFunc
 Func ForumLogin($sUsername, $sPassword)
 If $g_hLibMyBot = -1 Then Return False
-Local $result = DllCall($g_hLibMyBot, "str", "ForumLogin", "str", $sUsername, "str", $sPassword, "str", $g_sBotTitle)
+Local $result = DllCall($g_hLibMyBot, "str", "ForumLogin", "str", _Base64Encode(StringToBinary($sUsername, 4), 1024), "str", _Base64Encode(StringToBinary($sPassword, 4), 1024), "str", _Base64Encode(StringToBinary($g_sBotTitle, 4), 1024))
 If @error Then
 _logErrorDLLCall($g_sLibMyBotPath & ", ForumLogin:", @error)
 Return SetError(@error)
@@ -8087,7 +8087,7 @@ If $bDisposeCaptures = True Then _CaptureDispose()
 If $g_iEmptyWorkingSetBot > 0 Then _WinAPI_EmptyWorkingSet(@AutoItPID)
 EndFunc
 Func RemoveZoneIdentifiers()
-Local $aPaths = [@ScriptDir, $g_sLibPath]
+Local $aPaths = [@ScriptDir, $g_sLibPath, $g_sLibPath & "\adb", $g_sLibPath & "\curl"]
 For $i = 0 To UBound($aPaths) - 1
 Local $sPath = $aPaths[$i]
 Local $aFiles = _FileListToArray($sPath, "*", $FLTA_FILES, True)
@@ -9531,7 +9531,7 @@ $path = $aMounts[$i]
 If $path = "" Then ContinueLoop
 If StringRight($path, 1) <> "/" Then $path &= "/"
 $s = AndroidAdbSendShellCommand("set result=$(ls '" & $path & $dummyFile & "' >&2)", 10000, $wasRunState, False)
-If StringInStr($s, $dummyFile) > 0 And StringInStr($s, "No such file or directory") = 0 And StringInStr($s, "syntax error:") = 0 Then
+If StringInStr($s, $dummyFile) > 0 And StringInStr($s, $dummyFile & ":") = 0 And StringInStr($s, "No such file or directory") = 0 And StringInStr($s, "syntax error") = 0 And StringInStr($s, "Permission denied") = 0 Then
 $pathFound = True
 $g_sAndroidPicturesPath = $path
 SetDebugLog("Using " & $g_sAndroidPicturesPath & " for Android shared folder")
@@ -73041,7 +73041,6 @@ SetLog(GetTranslatedFileIni("MBR GUI Design - Loading", "Msg_Android_instance_05
 EndIf
 DisableProcessWindowsGhosting()
 UpdateMainGUI()
-ForumAuthentication()
 EndFunc
 Func MainLoop($bCheckPrerequisitesOK = True)
 Local $iStartDelay = 0
@@ -73053,6 +73052,9 @@ $g_iBotAction = $eBotStart
 If $g_bBotLaunchOption_HideAndroid Then $g_bIsHidden = True
 If $g_bBotLaunchOption_MinimizeBot Then BotMinimizeRequest()
 EndIf
+If $bCheckPrerequisitesOK Then
+ForumAuthentication()
+EndIf
 Local $hStarttime = _Timer_Init()
 CheckEmuNewVersions()
 NotifyGetLastMessageFromTelegram()

diff --git a/lib/MyBot.run.dll b/lib/MyBot.run.dll