Skip to content

Commit 959af16

Browse files
authored
Update NetWebView2Lib.au3
1 parent df6f781 commit 959af16

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

NetWebView2Lib.au3

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Func _NetWebView2_CreateManager($sUserAgent = '', $s_fnEventPrefix = "", $s_AddB
151151
If @error Then
152152
$ERR = @error
153153
$EXT = @extended
154-
$MSG = "Manager Creation ERROR : #SLN=" & @ScriptLineNumber
154+
$MSG = "Manager Creation Error : #SLN=" & @ScriptLineNumber
155155
Else
156156
; Enable/Disable diagnostic logging
157157
; When enabled, the console will show entries like: +++[NetWebView2Lib][HANDLE:0x...][HH:mm:ss.fff] Message
@@ -679,27 +679,30 @@ Func _NetWebView2_NavigateToString($oWebV2M, $s_HTML, $iWaitMessage = $NETWEBVIE
679679
Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc) ; Local COM Error Handler
680680
#forceref $oMyError
681681

682-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, "ERROR: Invalid Object")
683-
684-
If $iWaitMessage < $NETWEBVIEW2_MESSAGE__INIT_READY Then
685-
Return SetError(1)
682+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then
683+
$ERR = 1
684+
$MSG = " Invalid Object Error: #SLN=" & @ScriptLineNumber
685+
ElseIf $iWaitMessage < $NETWEBVIEW2_MESSAGE__INIT_READY Then
686+
$ERR = 2
687+
$MSG = " $iWaitMessage Error: #SLN=" & @ScriptLineNumber
686688
ElseIf $iWaitMessage > $NETWEBVIEW2_MESSAGE__TITLE_CHANGED Then ; higher messsages are not for NAVIGATION thus not checking in _NetWebView2_LoadWait()
687-
Return SetError(2)
689+
$ERR = 3
690+
$MSG = " $iWaitMessage Error: #SLN=" & @ScriptLineNumber
688691
Else
689692
$oWebV2M.LockWebView()
690693
$RET = $oWebV2M.NavigateToString($s_HTML)
691694
$ERR = @error
692-
If Not $ERR Then
695+
If $ERR Then
696+
$MSG = " NavigateToString Error: #SLN=" & @ScriptLineNumber
697+
Else
693698
_NetWebView2_LoadWait($oWebV2M, $iWaitMessage, $sExpectedTitle, $iTimeOut_ms)
694699
$ERR = @error
695700
$EXT = @extended
696-
$oWebV2M.UnLockWebView()
697-
If $ERR Then __NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1, $ERR, $EXT)
698-
Return SetError($ERR, $EXT, $RET)
701+
$MSG = " LoadWait internal Error: #SLN=" & @ScriptLineNumber
699702
EndIf
703+
$oWebV2M.UnLockWebView()
700704
EndIf
701705

702-
#TODO ENDPOINT REFACTORING
703706
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix & $MSG, 1, $ERR, $EXT)
704707
Return SetError($ERR, $EXT, $RET)
705708
EndFunc ;==>_NetWebView2_NavigateToString

0 commit comments

Comments
 (0)