Merge pull request #117 from mlipok/patch-2

Update NetWebView2Lib.au3 - one common endpoint for entire functions

Author: ioa747

NetWebView2Lib.au3

@@ -69,6 +69,7 @@ Func Main()
 	__Example_Log(@ScriptLineNumber, "After: https://w2ww.microsoft.com" & @CRLF)
 	MsgBox($MB_TOPMOST, "TEST #" & @ScriptLineNumber, 'Watch Point - AFTER:' & @CRLF & 'navigate to fake/broken url' & @CRLF & 'HostNameNotResolved')
 
+	__Example_Log(@ScriptLineNumber, "END - close window to exit" & @CRLF)
 	; Main Loop
 	While 1
 		Switch GUIGetMsg()

examples/001-BasicDemo.au3

@@ -32,6 +32,7 @@ Func _Main()
 	ConsoleWrite("! BrowserWindowHandle = " & $oWeb_2.BrowserWindowHandle & @CRLF)
 	_NetWebView2_NavigateToString($oWeb_2, _GetDemoHTML("Browser 2 Content"))
 
+	__Example_Log(@ScriptLineNumber, "END - close window to exit" & @CRLF)
 	; --- Main Loop ---
 	While 1
 		Switch GUIGetMsg()
@@ -99,7 +100,7 @@ Func __UserEventHandler_Web1__Bridge__OnMessageReceived($oWebView, $hWindow, $sM
 		$iMsgCnt += 1
 		_UpdateWebUI($oWebView, "mainTitle", "Counter: " & $iMsgCnt)
 		_UpdateWebUI($oWebView, "statusMsg", "Last Message: " & $sMsg)
-		If $sMsg = "PING" Then
+		If $sMsg = "PING" Then ; intentional flickering to show that Web1 work differently than Web2
 			GUISetState(@SW_HIDE, $hWindow)
 			Sleep(200)
 			GUISetState(@SW_SHOW, $hWindow)
@@ -140,3 +141,9 @@ Func __UserEventHandler_Web2__Bridge__OnMessageReceived($oWebView, $hWindow, $sM
 	EndIf
 EndFunc   ;==>__UserEventHandler_Web2__Bridge__OnMessageReceived
 #EndRegion ; USER DEFINED EVENTS HANDLER FUNCTION
+
+Func __Example_Log($s_ScriptLineNumber, $sString, $iError = @error, $iExtended = @extended)
+	ConsoleWrite(@ScriptName & ' SLN=' & $s_ScriptLineNumber & ' [' & $iError & '/' & $iExtended & '] ::: ' & $sString & @CRLF)
+	Return SetError($iError, $iExtended, '')
+EndFunc   ;==>__Example_Log
+

examples/003-Multi-Basic.au3

@@ -53,8 +53,11 @@ Func _Example()
 	$oWebV2M.SetDownloadPath(@ScriptDir & "\Downloads_Test")
 
 	; navigate to the page
-	_NetWebView2_Navigate($oWebV2M, "https://www.libreoffice.org/donate/dl/win-x86_64/25.8.4/en-US/LibreOffice_25.8.4_Win_x86-64.msi", $NETWEBVIEW2_MESSAGE__NAV_STARTING)
+;~ 	_NetWebView2_Navigate($oWebV2M, "https://www.libreoffice.org/donate/dl/win-x86_64/25.8.4/en-US/LibreOffice_25.8.4_Win_x86-64.msi", $NETWEBVIEW2_MESSAGE__NAV_STARTING)
+	_NetWebView2_Navigate($oWebV2M, "https://www.libreoffice.org/donate/dl/win-x86_64/26.2.1/pl/LibreOffice_26.2.1_Win_x86-64.msi", $NETWEBVIEW2_MESSAGE__NAV_STARTING)
+	#TODO AutoDetermine MSI file location
 
+	__Example_Log(@ScriptLineNumber, "END - close window to exit" & @CRLF)
 	#Region ; GUI Loop
 	; Main Loop
 	While 1
@@ -148,3 +151,8 @@ Volatile Func __UserEventHandler__OnAcceleratorKeyPressed($oWebV2M, $hGUI, $oArg
 
 	$oArgs = 0 ; Explicitly release the COM reference inside the volatile scope
 EndFunc   ;==>__UserEventHandler__OnAcceleratorKeyPressed
+
+Func __Example_Log($s_ScriptLineNumber, $sString, $iError = @error, $iExtended = @extended)
+	ConsoleWrite(@ScriptName & ' SLN=' & $s_ScriptLineNumber & ' [' & $iError & '/' & $iExtended & '] ::: ' & $sString & @CRLF)
+	Return SetError($iError, $iExtended, '')
+EndFunc   ;==>__Example_Log

examples/006-DownloadDemo.au3

@@ -34,11 +34,11 @@ Func _Example_HTTP_Tracking()
 	; Very important to prevent the GUI from getting stuck by hundreds of requests (images, scripts, etc.)
 	$oWebV2M.HttpStatusCodeDocumentOnly = True
 
+	GUISetState(@SW_SHOW)
 	; Testing with a non-existent page to see the 404
 	_NetWebView2_Navigate($oWebV2M, "https://google.com/this-page-does-not-exist")
 
-	GUISetState(@SW_SHOW)
-
+	__Example_Log(@ScriptLineNumber, "END - close window to exit" & @CRLF)
 	While 1
 		Switch GUIGetMsg()
 			Case $GUI_EVENT_CLOSE

examples/007-HTTP_StatusCodeTracking.au3

@@ -39,6 +39,8 @@ Func _Example_Console_Redirect()
 	_NetWebView2_ExecuteScript($oWebV2M, "console.log('Hello from JavaScript to AutoIt Console!');")
 	_NetWebView2_ExecuteScript($oWebV2M, "console.error('This is a test error message');")
 
+	__Example_Log(@ScriptLineNumber, "END - close window to exit" & @CRLF)
+
 	; --- Main Loop ---
 	While 1
 		Switch GUIGetMsg()
@@ -61,3 +63,7 @@ Func __UserEventHandler_Bridge__OnMessageReceived($oWebV2M, $hGUI, $sMsg)
 	EndIf
 EndFunc   ;==>__UserEventHandler_Bridge__OnMessageReceived
 
+Func __Example_Log($s_ScriptLineNumber, $sString, $iError = @error, $iExtended = @extended)
+	ConsoleWrite(@ScriptName & ' SLN=' & $s_ScriptLineNumber & ' [' & $iError & '/' & $iExtended & '] ::: ' & $sString & @CRLF)
+	Return SetError($iError, $iExtended, '')
+EndFunc   ;==>__Example_Log