Skip to content

Commit 5f34530

Browse files
ioa747ioa747
authored
v2.2.1-alpha
1 parent 0ae1ba4 commit 5f34530

1 file changed

Lines changed: 33 additions & 23 deletions

File tree

‎NetWebView2Lib.au3‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,6 +1018,25 @@ Func _WebView2_FrameGetHtmlSource($oFrame)
10181018
Return $sClean
10191019
EndFunc ;==>_WebView2_FrameGetHtmlSource
10201020

1021+
; #INTERNAL_USE_ONLY# ===========================================================================================================
1022+
; Name ..........: _NetWebView2_GetFrame
1023+
; Description ...: Returns a Frame Object (IWebView2Frame) for the specified index.
1024+
; Syntax ........: _NetWebView2_GetFrame($oWebV2M, $iIndex)
1025+
; Parameters ....: $oWebV2M - an object.
1026+
; $iIndex - an int value.
1027+
; Return values .: Frame Object or Null
1028+
; Author ........: ioa747
1029+
; Modified ......:
1030+
; Remarks .......:
1031+
; Related .......:
1032+
; Link ..........:
1033+
; Example .......: Yes
1034+
; ===============================================================================================================================
1035+
Func _NetWebView2_GetFrame($oWebV2M, $iIndex)
1036+
Local $oFrame = $oWebV2M.GetFrame($iIndex)
1037+
Return SetError(@error, @extended, $oFrame)
1038+
EndFunc ;==>_NetWebView2_GetFrame
1039+
10211040
#EndRegion ; === NetWebView2Lib UDF === New Core Method Wrappers
10221041

10231042
#Region ; === NetWebView2Lib UDF === _NetJson_* functions
@@ -1642,8 +1661,10 @@ Volatile Func __NetWebView2_Events__OnMessageReceived($oWebV2M, $hGUI, $sMsg)
16421661
EndIf
16431662

16441663
; 🚧 *******************************************
1645-
ConsoleWrite("> TEST NAV_ERR: " & $sMsg & @CRLF)
1646-
ConsoleWrite("> TEST NAV_ERR: __NetWebView2_LastMessage_KEEPER($oWebV2M)=" & __NetWebView2_LastMessage_KEEPER($oWebV2M) & " SLN=" & @ScriptLineNumber & @CRLF)
1664+
If $_g_bNetWebView2_DebugInfo Then
1665+
ConsoleWrite("> TEST NAV_ERR: " & $sMsg & @CRLF)
1666+
ConsoleWrite("> TEST NAV_ERR: __NetWebView2_LastMessage_KEEPER($oWebV2M)=" & __NetWebView2_LastMessage_KEEPER($oWebV2M) & " SLN=" & @ScriptLineNumber & @CRLF)
1667+
EndIf
16471668

16481669
Case "NAV_COMPLETED"
16491670
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix & " COMMAND:" & $sCommand, 1)
@@ -1953,7 +1974,7 @@ Volatile Func __NetWebView2_Events__OnTitleChanged($oWebV2M, $hGUI, $sTITLE)
19531974

19541975
Local Const $s_Prefix = "[EVENT: OnTitleChanged]: GUI:" & $hGUI & " TITLE: " & $sTITLE
19551976
__NetWebView2_Log(@ScriptLineNumber, (StringLen($s_Prefix) > 150 ? StringLeft($s_Prefix, 150) & "..." : $s_Prefix), 1)
1956-
;~ __NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__TITLE_CHANGED)
1977+
__NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__TITLE_CHANGED)
19571978
If $_g_bNetWebView2_DebugDev Then ConsoleWrite("> IFNC: TEST LOAD WAIT: __NetWebView2_LastMessage_Navigation($oWebV2M)=" & __NetWebView2_LastMessage_Navigation($oWebV2M) & ' SLN=' & @ScriptLineNumber & @CRLF)
19581979
EndFunc ;==>__NetWebView2_Events__OnTitleChanged
19591980

@@ -1977,6 +1998,7 @@ Volatile Func __NetWebView2_Events__OnNavigationStarting($oWebV2M, $hGUI, $oArgs
19771998
Local Const $s_Prefix = "[EVENT: OnNavigationStarting]: GUI:" & $hGUI & " URL: " & $sURL
19781999
__NetWebView2_Log(@ScriptLineNumber, (StringLen($s_Prefix) > 150 ? StringLeft($s_Prefix, 150) & "..." : $s_Prefix), 1)
19792000
__NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__NAV_STARTING)
2001+
$oArgs = 0
19802002
EndFunc ;==>__NetWebView2_Events__OnNavigationStarting
19812003

19822004
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2201,7 +2223,7 @@ Volatile Func __NetWebView2_Events__OnProcessFailed($oWebV2M, $hGUI, $oArgs)
22012223

22022224
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
22032225
__NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__PROCESS_FAILED)
2204-
$oArgs = 0
2226+
$oArgs = 0 ; Explicitly release the COM reference inside the volatile scopeEndFunc
22052227
EndFunc ;==>__NetWebView2_Events__OnProcessFailed
22062228

22072229
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2234,25 +2256,6 @@ EndFunc ;==>__NetWebView2_Events__OnBasicAuthenticationRequested
22342256
#EndRegion ; === NetWebView2Lib UDF === EVENT HANDLERS === Browser ===
22352257

22362258
#Region ; === NetWebView2Lib UDF === EVENT HANDLERS === Frame Related ===
2237-
; #INTERNAL_USE_ONLY# ===========================================================================================================
2238-
; Name ..........: _NetWebView2_GetFrame
2239-
; Description ...: Returns a Frame Object (IWebView2Frame) for the specified index.
2240-
; Syntax ........: _NetWebView2_GetFrame($oWebV2M, $iIndex)
2241-
; Parameters ....: $oWebV2M - an object.
2242-
; $iIndex - an int value.
2243-
; Return values .: Frame Object or Null
2244-
; Author ........: ioa747
2245-
; Modified ......:
2246-
; Remarks .......:
2247-
; Related .......:
2248-
; Link ..........:
2249-
; Example .......: Yes
2250-
; ===============================================================================================================================
2251-
Func _NetWebView2_GetFrame($oWebV2M, $iIndex)
2252-
Local $oFrame = $oWebV2M.GetFrame($iIndex)
2253-
Return SetError(@error, @extended, $oFrame)
2254-
EndFunc ;==>_NetWebView2_GetFrame
2255-
22562259
; #INTERNAL_USE_ONLY# ===========================================================================================================
22572260
; Name ..........: __NetWebView2_Events__OnFrameCreated
22582261
; Description ...: FrameCreated is raised when a new iframe is created. Handle this event to get access to CoreWebView2Frame objects.
@@ -2271,6 +2274,7 @@ EndFunc ;==>_NetWebView2_GetFrame
22712274
Volatile Func __NetWebView2_Events__OnFrameCreated($oWebV2M, $hGUI, $oFrame)
22722275
Local Const $s_Prefix = "[EVENT: OnFrameCreated]: WebV2M: " & VarGetType($oWebV2M) & " GUI: " & $hGUI & " Frame: " & VarGetType($oFrame)
22732276
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
2277+
$oFrame = 0
22742278
EndFunc ;==>__NetWebView2_Events__OnFrameCreated
22752279

22762280
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2291,6 +2295,7 @@ EndFunc ;==>__NetWebView2_Events__OnFrameCreated
22912295
Volatile Func __NetWebView2_Events__OnFrameDestroyed($oWebV2M, $hGUI, $oFrame)
22922296
Local Const $s_Prefix = "[EVENT: OnFrameDestroyed]: WebV2M: " & VarGetType($oWebV2M) & " GUI: " & $hGUI & " Frame: " & VarGetType($oFrame)
22932297
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
2298+
$oFrame = 0
22942299
EndFunc ;==>__NetWebView2_Events__OnFrameDestroyed
22952300

22962301
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2311,6 +2316,7 @@ EndFunc ;==>__NetWebView2_Events__OnFrameDestroyed
23112316
Volatile Func __NetWebView2_Events__OnFrameNameChanged($oWebV2M, $hGUI, $oFrame)
23122317
Local Const $s_Prefix = "[EVENT: OnFrameNameChanged]: WebV2M: " & VarGetType($oWebV2M) & " GUI: " & $hGUI & " Frame: " & VarGetType($oFrame)
23132318
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
2319+
$oFrame = 0
23142320
EndFunc ;==>__NetWebView2_Events__OnFrameNameChanged
23152321

23162322
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2334,6 +2340,7 @@ Volatile Func __NetWebView2_Events__OnFrameNavigationStarting($oWebV2M, $hGUI, $
23342340
Local Const $s_Prefix = "[EVENT: OnFrameNavigationStarting]: WebV2M: " & VarGetType($oWebV2M) & " GUI:" & $hGUI & " Frame:" & VarGetType($oFrame) & " Uri:" & $sUri
23352341
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
23362342
; __NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__FRAME_NAV_STARTING) ; Optional: Update status if needed
2343+
$oFrame = 0
23372344
EndFunc ;==>__NetWebView2_Events__OnFrameNavigationStarting
23382345

23392346
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2379,6 +2386,7 @@ Volatile Func __NetWebView2_Events__OnFrameContentLoading($oWebV2M, $hGUI, $oFra
23792386
Local Const $s_Prefix = "[EVENT: OnFrameContentLoading]: WebV2M: " & VarGetType($oWebV2M) & " GUI:" & $hGUI & " Frame:" & VarGetType($oFrame) & " NavID:" & $iNavigationId
23802387
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
23812388
; __NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__FRAME_CONTENT_LOADING)
2389+
$oFrame = 0
23822390
EndFunc ;==>__NetWebView2_Events__OnFrameContentLoading
23832391

23842392
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2401,6 +2409,7 @@ Volatile Func __NetWebView2_Events__OnFrameDOMContentLoaded($oWebV2M, $hGUI, $oF
24012409
Local Const $s_Prefix = "[EVENT: OnFrameDOMContentLoaded]: WebV2M: " & VarGetType($oWebV2M) & " GUI:" & $hGUI & " Frame:" & VarGetType($oFrame) & " NavID:" & $iNavigationId
24022410
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
24032411
; __NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__FRAME_DOM_CONTENT_LOADED)
2412+
$oFrame = 0
24042413
EndFunc ;==>__NetWebView2_Events__OnFrameDOMContentLoaded
24052414

24062415
; #INTERNAL_USE_ONLY# ===========================================================================================================
@@ -2423,6 +2432,7 @@ Volatile Func __NetWebView2_Events__OnFrameWebMessageReceived($oWebV2M, $hGUI, $
24232432
Local Const $s_Prefix = "[EVENT: OnFrameWebMessageReceived]: WebV2M: " & VarGetType($oWebV2M) & " GUI:" & $hGUI & " Frame:" & VarGetType($oFrame) & " Message:" & $sMessage
24242433
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
24252434
; __NetWebView2_LastMessage_KEEPER($oWebV2M, $NETWEBVIEW2_MESSAGE__FRAME_WEB_MESSAGE_RECEIVED)
2435+
$oFrame = 0
24262436
EndFunc ;==>__NetWebView2_Events__OnFrameWebMessageReceived
24272437

24282438
Func __NetWebView2_Events__FrameKeeper($oWebV2M, $hGUI, $oFrame)

0 commit comments

Comments
 (0)