From 15b78befc5b0dd35142643dfecdbc7fd24ecf637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lipok?= <11089482+mlipok@users.noreply.github.com> Date: Fri, 1 Mar 2024 08:52:58 +0100 Subject: [PATCH 1/6] Update __WD_ErrHnd --- wd_helper.au3 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/wd_helper.au3 b/wd_helper.au3 index b01dd572..fcf7e346 100644 --- a/wd_helper.au3 +++ b/wd_helper.au3 @@ -3478,19 +3478,22 @@ EndFunc ;==>__WD_Base64Decode ; #INTERNAL_USE_ONLY# =========================================================================================================== ; Name ..........: __WD_ErrHnd -; Description ...: Dummy error handler -; Syntax ........: __WD_ErrHnd() -; Parameters ....: None +; Description ...: COM Error handler +; Syntax ........: __WD_ErrHnd($oError) +; Parameters ....: $oError - Error object. ; Return values .: None ; Author ........: mLipok ; Modified ......: ; Remarks .......: -; Related .......: +; Related .......: __WD_UpdateExtractor, _WD_DownloadAsBinary ; Link ..........: ; Example .......: No ; =============================================================================================================================== -Func __WD_ErrHnd() - +Func __WD_ErrHnd($oError) + Local Const $sFuncName = "__WD_ErrHnd" + If $_WD_DEBUG = $_WD_DEBUG_None Then Return + __WD_Error($sFuncName, $oError.number, "err.windescription: " & $oError.windescription, $oError.scriptline) + __WD_Error($sFuncName, $oError.number, "err.description is: " & $oError.description, $oError.scriptline) EndFunc ;==>__WD_ErrHnd ; #INTERNAL_USE_ONLY# =========================================================================================================== From d8eb01b4027870096132351b7b3cd7ebe173bdc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lipok?= <11089482+mlipok@users.noreply.github.com> Date: Sat, 2 Mar 2024 23:54:18 +0100 Subject: [PATCH 2/6] simplify __WD_Error usage --- wd_helper.au3 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wd_helper.au3 b/wd_helper.au3 index fcf7e346..6fee603d 100644 --- a/wd_helper.au3 +++ b/wd_helper.au3 @@ -3492,8 +3492,7 @@ EndFunc ;==>__WD_Base64Decode Func __WD_ErrHnd($oError) Local Const $sFuncName = "__WD_ErrHnd" If $_WD_DEBUG = $_WD_DEBUG_None Then Return - __WD_Error($sFuncName, $oError.number, "err.windescription: " & $oError.windescription, $oError.scriptline) - __WD_Error($sFuncName, $oError.number, "err.description is: " & $oError.description, $oError.scriptline) + __WD_Error($sFuncName, $oError.number, "err.windescription: " & $oError.windescription & " err.description: " & $oError.description, $oError.scriptline) EndFunc ;==>__WD_ErrHnd ; #INTERNAL_USE_ONLY# =========================================================================================================== From 5f1ae13760f7615ed8e96698cffa9c4575931518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lipok?= <11089482+mlipok@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:40:57 +0200 Subject: [PATCH 3/6] related removal --- wd_helper.au3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wd_helper.au3 b/wd_helper.au3 index 6fee603d..02246c6e 100644 --- a/wd_helper.au3 +++ b/wd_helper.au3 @@ -3485,7 +3485,7 @@ EndFunc ;==>__WD_Base64Decode ; Author ........: mLipok ; Modified ......: ; Remarks .......: -; Related .......: __WD_UpdateExtractor, _WD_DownloadAsBinary +; Related .......: ; Link ..........: ; Example .......: No ; =============================================================================================================================== From a1f5aee491e44c7c034f4414d626dd2e0cfcfdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lipok?= <11089482+mlipok@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:44:41 +0200 Subject: [PATCH 4/6] REFACTORING --- wd_helper.au3 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wd_helper.au3 b/wd_helper.au3 index 02246c6e..89eba580 100644 --- a/wd_helper.au3 +++ b/wd_helper.au3 @@ -3490,9 +3490,8 @@ EndFunc ;==>__WD_Base64Decode ; Example .......: No ; =============================================================================================================================== Func __WD_ErrHnd($oError) - Local Const $sFuncName = "__WD_ErrHnd" If $_WD_DEBUG = $_WD_DEBUG_None Then Return - __WD_Error($sFuncName, $oError.number, "err.windescription: " & $oError.windescription & " err.description: " & $oError.description, $oError.scriptline) + __WD_Error($oError.source, $oError.number, " err.number: " & $oError.number & " err.windescription: " & $oError.windescription & " err.description is: " & $oError.description, $oError.scriptline) EndFunc ;==>__WD_ErrHnd ; #INTERNAL_USE_ONLY# =========================================================================================================== From 39b5d6e94ac126f810e815217da7057c1f0ab612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lipok?= <11089482+mlipok@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:47:55 +0200 Subject: [PATCH 5/6] __WD_ErrHnd() >> $_WD_ERROR_GeneralError --- wd_helper.au3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wd_helper.au3 b/wd_helper.au3 index 89eba580..6be2afc2 100644 --- a/wd_helper.au3 +++ b/wd_helper.au3 @@ -3491,7 +3491,7 @@ EndFunc ;==>__WD_Base64Decode ; =============================================================================================================================== Func __WD_ErrHnd($oError) If $_WD_DEBUG = $_WD_DEBUG_None Then Return - __WD_Error($oError.source, $oError.number, " err.number: " & $oError.number & " err.windescription: " & $oError.windescription & " err.description is: " & $oError.description, $oError.scriptline) + __WD_Error($oError.source, $_WD_ERROR_GeneralError, " err.number: " & $oError.number & " err.windescription: " & $oError.windescription & " err.description is: " & $oError.description, $oError.scriptline) EndFunc ;==>__WD_ErrHnd ; #INTERNAL_USE_ONLY# =========================================================================================================== From 2b3437981269bdfa056af2e2c7124016bad8349d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lipok?= <11089482+mlipok@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:35:11 +0200 Subject: [PATCH 6/6] cleanup --- wd_helper.au3 | 1 - 1 file changed, 1 deletion(-) diff --git a/wd_helper.au3 b/wd_helper.au3 index 6be2afc2..4b958886 100644 --- a/wd_helper.au3 +++ b/wd_helper.au3 @@ -3490,7 +3490,6 @@ EndFunc ;==>__WD_Base64Decode ; Example .......: No ; =============================================================================================================================== Func __WD_ErrHnd($oError) - If $_WD_DEBUG = $_WD_DEBUG_None Then Return __WD_Error($oError.source, $_WD_ERROR_GeneralError, " err.number: " & $oError.number & " err.windescription: " & $oError.windescription & " err.description is: " & $oError.description, $oError.scriptline) EndFunc ;==>__WD_ErrHnd