Merge pull request #93 from mlipok/patch-2

refactoring _NetWebView2_LoadWait() by adding __NetWebView2_WaitForReadyState() - supplement

Author: ioa747

examples/003-Multi-Basic.au3

@@ -75,7 +75,7 @@ EndFunc   ;==>_GetDemoHTML
 #Region ; USER DEFINED EVENTS HANDLER FUNCTION
 ; BROWSER 1 - Manager Events
 Func __UserEventHandler_Web1__Manager__OnMessageReceived($oWebView, $hWindow, $sMsg)
-	#forceref $hWindow
+	$hWindow = WinGetHandle($hWindow)
 	ConsoleWrite(">> [Browser 1]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
 	If $sMsg = "INIT_READY" Then
 		_NetWebView2_ExecuteScript($oWebView, 'window.chrome.webview.postMessage(JSON.stringify({ "type": "COM_TEST", "status": "OK" }));', $NETWEBVIEW2_EXECUTEJS_MODE0_FIREANDFORGET)
@@ -84,6 +84,8 @@ EndFunc   ;==>__UserEventHandler_Web1__Manager__OnMessageReceived
 
 ; BROWSER 1 - JavaScript Bridge Events
 Func __UserEventHandler_Web1__Bridge__OnMessageReceived($oWebView, $hWindow, $sMsg)
+	$hWindow = WinGetHandle($hWindow)
+
 	Local Static $iMsgCnt = -1
 	ConsoleWrite(">> [JS 1]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
 
@@ -107,7 +109,7 @@ EndFunc   ;==>__UserEventHandler_Web1__Bridge__OnMessageReceived
 
 ; BROWSER 2 - Manager Events
 Func __UserEventHandler_Web2__Manager__OnMessageReceived($oWebView, $hWindow, $sMsg)
-	#forceref $hWindow
+	$hWindow = WinGetHandle($hWindow)
 	ConsoleWrite(">> [Browser 2]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
 	If $sMsg = "INIT_READY" Then
 		_NetWebView2_ExecuteScript($oWebView, 'window.chrome.webview.postMessage(JSON.stringify({ "type": "COM_TEST", "status": "OK" }));', $NETWEBVIEW2_EXECUTEJS_MODE0_FIREANDFORGET)
@@ -116,6 +118,7 @@ EndFunc   ;==>__UserEventHandler_Web2__Manager__OnMessageReceived
 
 ; BROWSER 2 - JavaScript Bridge Events
 Func __UserEventHandler_Web2__Bridge__OnMessageReceived($oWebView, $hWindow, $sMsg)
+	$hWindow = WinGetHandle($hWindow)
 	Local Static $iMsgCnt = -1
 	ConsoleWrite(">> [JS 2]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
 

examples/004-FileViewerDemo_Loop.au3

@@ -36,7 +36,9 @@
 _Example()
 
 Func _Example()
-	; Create the UI
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
+	; Create the GUI
 	Local $iHeight = 800
 	Local $hMainGUIWindow = GUICreate("WebView2 .NET Manager - Demo: " & @ScriptName, 1100, $iHeight, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
 	Local $idLabelStatus = GUICtrlCreateLabel("Status: Initializing Engine...", 10, $iHeight - 20, 1080, 20)
@@ -76,7 +78,7 @@ Func _Example()
 
 			$s_PDF_FileFullPath = $a_Files[$IDX_File]
 			GUICtrlSetData($idLabelStatus, $sProgress & ' - Navigation started: ' & $s_PDF_FileFullPath)
-			_NetWebView2_NavigateToPDF($oWebV2M, $s_PDF_FileFullPath, '#view=FitH', 1000, True)
+			_NetWebView2_NavigateToPDF($oWebV2M, $s_PDF_FileFullPath, '#view=FitH', $NETWEBVIEW2_MESSAGE__TITLE_CHANGED, "", 5000, 1000, True)
 			GUICtrlSetData($idLabelStatus, $sProgress & ' - Navigation completed: ' & $s_PDF_FileFullPath)
 			ConsoleWrite("! =Example= @SLN=" & @ScriptLineNumber & ' ' & $s_PDF_FileFullPath & @CRLF)
 			If $bSleep_UserReaction Then Sleep(2000) ; simulates user reaction on PDF

examples/005-SaveDemo.au3

@@ -13,6 +13,8 @@
 _Example()
 
 Func _Example()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc)
 	#forceref $oMyError
 

examples/007-HTTP_StatusCodeTracking.au3

@@ -10,6 +10,8 @@ Global $oMyError = ObjEvent("AutoIt.Error", "_ErrFunc") ; COM Error Handler
 _Example_HTTP_Tracking()
 
 Func _Example_HTTP_Tracking()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	Local $hGUI = GUICreate("WebView2 HTTP Status Tracker", 1000, 600)
 	ConsoleWrite("$hGUI=" & $hGUI & @CRLF)
 
@@ -32,7 +34,6 @@ Func _Example_HTTP_Tracking()
 	; Very important to prevent the GUI from getting stuck by hundreds of requests (images, scripts, etc.)
 	$oWebV2M.HttpStatusCodeDocumentOnly = True
 
-
 	; Testing with a non-existent page to see the 404
 	_NetWebView2_Navigate($oWebV2M, "https://google.com/this-page-does-not-exist")
 
@@ -71,7 +72,9 @@ Func WebEvents_OnMessageReceived($oWebV2M, $hGUI, $sMsg)
 	Local $iSplitPos = StringInStr($sMsg, "|")
 	Local $sCommand = $iSplitPos ? StringStripWS(StringLeft($sMsg, $iSplitPos - 1), 3) : $sMsg
 	Local $sData = $iSplitPos ? StringTrimLeft($sMsg, $iSplitPos) : ""
+	#forceref $sData
 	Local $aParts
+	#forceref $aParts
 
 	Switch $sCommand
 		Case "INIT_READY"
@@ -84,7 +87,7 @@ EndFunc   ;==>WebEvents_OnMessageReceived
 
 ; Handles custom messages from JavaScript (window.chrome.webview.postMessage)
 Func JavaScript_OnMessageReceived($oWebV2M, $hGUI, $sMsg)
-	#forceref $oWebV2M
+	#forceref $oWebV2M, $hGUI
 	ConsoleWrite(">>> [JavaScript]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
 	Local $sFirstChar = StringLeft($sMsg, 1)
 
@@ -126,6 +129,8 @@ EndFunc   ;==>JavaScript_OnMessageReceived
 
 ; OnWebResourceResponseReceived
 Func WebEvents_OnWebResourceResponseReceived($oWebV2M, $hGUI, $iStatusCode, $sReasonPhrase, $sRequestUrl)
+	#forceref $hGUI
+
 	Local $sLog = StringFormat("! [HTTP %d] | %s | URL: %s", $iStatusCode, $sReasonPhrase, $sRequestUrl)
 	ConsoleWrite($sLog & @CRLF)
 

examples/008-JavaScript.au3

@@ -12,6 +12,8 @@ Global $oWebV2M, $oBridge
 _Example_Console_Redirect()
 
 Func _Example_Console_Redirect()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	Local $hGUI = GUICreate("Console Redirect Test", 400, 300)
 
 	; 1. Initialize WebView2

examples/009-Auditor.au3

@@ -21,6 +21,8 @@ _Example()
 Exit
 
 Func _Example()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	#Region ; === GUI ===
 	Local $hGUI = GUICreate("AutoIt Auditor", 1100, 850, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
 	GUISetBkColor(0x1E1E1E, $hGUI)
@@ -149,8 +151,8 @@ Func _Example()
 	Local $sProfileDirectory = @ScriptDir & "\NetWebView2Lib-UserDataFolder"
 	_NetWebView2_Initialize($oWebV2M, $hGUI, $sProfileDirectory, 420, 45, 670, 795, True, True, 1.2, "0x1E1E1E")
 
-	_NetWebView2_Navigate($oWebV2M, $sURL, $NETWEBVIEW2_MESSAGE__NAV_STARTING)
-
+	_NetWebView2_Navigate($oWebV2M, $sURL)
+	WinSetState($hGUI, "", @SW_MAXIMIZE)
 	GUISetState(@SW_SHOW)
 
 	#EndRegion ; === GUI ===

examples/010-NavigationBar.au3

@@ -31,6 +31,8 @@ Global $sProfileDirectory = @ScriptDir & "\NetWebView2Lib-UserDataFolder"
 _Example()
 
 Func _Example()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	Local $hDLL = DllOpen("user32.dll")
 	Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc)
 	#forceref $oMyError
@@ -57,7 +59,7 @@ Func _Example()
 	GUISetState(@SW_SHOW)
 
 	; navigate to the page
-	_NetWebView2_Navigate($oWebV2M, "https://en.wikipedia.org/wiki/List_of_countries_and_dependencies_by_population", $NETWEBVIEW2_MESSAGE__TITLE_CHANGED)
+	_NetWebView2_Navigate($oWebV2M, "https://en.wikipedia.org/wiki/List_of_countries_and_dependencies_by_population")
 	ConsoleWrite("navigate to the page" & @CRLF)
 
 	; Main Loop
@@ -100,8 +102,6 @@ Func _Example()
 
 	WEnd
 
-	__NetWebView2_LastMessageReceived($oWebV2M, -1000)
-
 	_NetWebView2_CleanUp($oWebV2M, $oJSBridge)
 	GUIDelete($hGUI)
 	DllClose($hDLL)
@@ -269,7 +269,7 @@ Func _Web_GoTo($oWebV2M, $sURL) ; Navigates to a URL or performs a Google search
 
 	; Execution
 	ConsoleWrite("-> Web_GoTo: " & $sFinalURL & @CRLF)
-	$oWebV2M.Navigate($sFinalURL)
+	_NetWebView2_Navigate($oWebV2M, $sFinalURL)
 	Return True
 EndFunc   ;==>_Web_GoTo
 

examples/011-TwinWebView.au3

@@ -37,6 +37,8 @@ _MainGUI()
 
 ;--------------------------------------------------------------------------------------------------------------------------------
 Func _MainGUI() ; Creates the primary application window and starts the message loop
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	; Use $WS_CLIPCHILDREN to prevent flickering when resizing child windows
 	$hMainGUI = GUICreate("Multi-WebView2 v1.4.0", 1000, 600, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
 
@@ -85,13 +87,13 @@ Func _MainGUI() ; Creates the primary application window and starts the message
 			Case $Bar1.GlobalNavButton
 				MouseClick("right")
 			Case $Bar1.ctx_Google
-				If IsObj($oWeb1) Then $oWeb1.Navigate("https://www.google.com")
+				If IsObj($oWeb1) Then _NetWebView2_Navigate($oWeb1, "https://www.google.com")
 			Case $Bar1.ctx_AutoIt
-				If IsObj($oWeb1) Then $oWeb1.Navigate("https://www.autoitscript.com/forum")
+				If IsObj($oWeb1) Then _NetWebView2_Navigate($oWeb1, "https://www.autoitscript.com/forum")
 			Case $Bar1.ctx_Ghostery
-				If IsObj($oWeb1) Then $oWeb1.Navigate("extension://mlomiejdfkolichcflejclcbmpeaniij/pages/panel/index.html")
+				If IsObj($oWeb1) Then _NetWebView2_Navigate($oWeb1, "extension://mlomiejdfkolichcflejclcbmpeaniij/pages/panel/index.html")
 			Case $Bar1.ctx_DarkReader
-				If IsObj($oWeb1) Then $oWeb1.Navigate("extension://eimadpbcbfnmbkopoojfekhnkhdbieeh/ui/popup/index.html")
+				If IsObj($oWeb1) Then _NetWebView2_Navigate($oWeb1, "extension://eimadpbcbfnmbkopoojfekhnkhdbieeh/ui/popup/index.html")
 			Case $Bar1.ctx_Extensions_Manager
 				_WV2_ShowExtensionPicker(500, 600, $hMainGUI, @ScriptDir & "\Extensions_Lib", $Bar1.Web_ProfilePath)
 			Case $Bar1.ctx_EnableCustomMenu
@@ -188,7 +190,7 @@ Func _InitBrowsers() ; Creates child window containers and initializes WebView2
 		Sleep(10)
 	Until $oWeb1.IsReady And $oWeb2.IsReady
 
-	$oWeb1.Navigate("https://www.google.com/search?q=web1")
+	_NetWebView2_Navigate($oWeb1, "https://www.google.com/search?q=web1")
 	GUISetState(@SW_SHOWNOACTIVATE, $hID1)
 
 	$oWeb2.Navigate("https://www.google.com/search?q=web2")
@@ -272,7 +274,7 @@ Func Bridge2_OnMessageReceived($sMsg) ; [Bridge2 JS]
 				Local $sURL = "https://www.google.com/search?q=" & $sSearchText & "+site:" & $sDomain2
 
 				; Update Browser 1 with the results
-				$oWeb1.Navigate($sURL)
+				_NetWebView2_Navigate($oWeb1, $sURL)
 			EndIf
 	EndSwitch
 EndFunc   ;==>Bridge2_OnMessageReceived

examples/012-GetCookies.au3

@@ -6,6 +6,7 @@
 #include <Array.au3>
 #include <GuiEdit.au3>
 #include <Misc.au3>
+#include "..\NetWebView2Lib.au3"
 
 _VersionChecker("1.2.0.0") ; DLL Version Check
 
@@ -22,9 +23,11 @@ Global $hGUI, $idURL, $idStatusLabel
 Global $g_bURLFullSelected = False
 Global $g_bAutoRestoreSession = False
 
-Main()
+_Example()
+
+Func _Example()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
 
-Func Main()
 	#Region ; === Gui AutoIt ===
 	$hGUI = GUICreate("AutoIt", 1285, 850, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
 	GUISetBkColor(0x1E1E1E, $hGUI)
@@ -120,7 +123,7 @@ Func Main()
 				$oManager.GetCookies(GUICtrlRead($idURL))
 
 			Case $idBtnRestoreSession
-				Local $sURL = GUICtrlRead($idURL)
+				$sURL = GUICtrlRead($idURL)
 				Local $sDomainOnly = StringRegExpReplace($sURL, "https?://([^/]+).*", "$1")
 				_RestoreSession($sDomainOnly)
 
@@ -147,7 +150,7 @@ Func Main()
 				GUICtrlSetData($idStatusLabel, "Reload")
 
 			Case $idURL
-				$oManager.Navigate(GUICtrlRead($idURL))
+				_NetWebView2_Navigate($oManager, GUICtrlRead($idURL))
 				GUICtrlSetData($idStatusLabel, "Navigate: " & GUICtrlRead($idURL))
 
 		EndSwitch
@@ -159,7 +162,7 @@ Func Main()
 
 	WEnd
 
-EndFunc   ;==>Main
+EndFunc   ;==>_Example
 ;---------------------------------------------------------------------------------------
 Func _CleanExit() ; CleanExit
 	; Check if the object exists before calling methods to avoid COM errors during crash
@@ -170,8 +173,8 @@ Func _CleanExit() ; CleanExit
 	; Release the event sinks
 	$oManager = 0
 	$oBridge = 0
-	$oEvtManager = 0
-	$oEvtBridge = 0
+;~ 	$oEvtManager = 0
+;~ 	$oEvtBridge = 0
 	$oMyError = 0
 
 	ConsoleWrite("--> Application exited cleanly." & @CRLF)
@@ -199,7 +202,7 @@ EndFunc   ;==>Bridge_OnMessageReceived
 ;---------------------------------------------------------------------------------------
 Func WebView_OnMessageReceived($sMessage)
 	ConsoleWrite("+> [CORE EVENT]: " & $sMessage & @CRLF)
-	Local Static $bIsInitialized, $sCurentURL = "", $sLastRestoredDomain = ""
+	Local Static $sCurentURL = "", $sLastRestoredDomain = ""
 	Local $sDomain
 
 	; Separating messages that have parameters (e.g. TITLE_CHANGED|...)
@@ -208,8 +211,7 @@ Func WebView_OnMessageReceived($sMessage)
 
 	Switch $sCommand
 		Case "INIT_READY"
-			$bIsInitialized = True ; We note that we are finished.
-			$oManager.Navigate(GUICtrlRead($idURL))
+			_NetWebView2_Navigate($oManager, GUICtrlRead($idURL))
 			GUISetState(@SW_SHOW, $hGUI)
 
 		Case "NAV_STARTING"
@@ -368,8 +370,11 @@ Func ShowWebNotification($sMessage, $sBgColor = "#4CAF50", $iDuration = 3000) ;
 
 	$oManager.ExecuteScript($sJS)
 EndFunc   ;==>ShowWebNotification
+
 ;---------------------------------------------------------------------------------------
 Func WM_SIZE($hWnd, $iMsg, $wParam, $lParam) ; Synchronizes WebView size with the GUI window
+	#forceref $hWnd, $iMsg
+
 	If $wParam = 1 Then Return $GUI_RUNDEFMSG ; 1 = SIZE_MINIMIZED
 
 	Local $iNewWidth = BitAND($lParam, 0xFFFF)

examples/013-jsonTree.au3

@@ -18,6 +18,8 @@ _Example()
 
 #Region ; UDF TESTING EXAMPLE
 Func _Example()
+	ConsoleWrite("! MicrosoftEdgeWebview2 : version check: " & _NetWebView2_IsAlreadyInstalled() & ' ERR=' & @error & ' EXT=' & @extended & @CRLF)
+
 	Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc)
 	#forceref $oMyError
 
@@ -101,7 +103,7 @@ Func _Example()
 	WEnd
 
 	_NetWebView2_CleanUp($oWebV2M, $oJSBridge)
-EndFunc   ;==>Main
+EndFunc   ;==>_Example
 
 #Region ; === UTILS ===
 
@@ -159,7 +161,7 @@ Func _Web_jsonTree(ByRef $oWebV2M, $sJavaScripton)
 			"</script></body></html>"
 
 	; 4. Navigate to the generated HTML
-	$oWebV2M.NavigateToString($sHTML)
+	_NetWebView2_NavigateToString($oWebV2M, $sHTML)
 	__NetWebView2_Log(@ScriptLineNumber, "+ JSON Tree Rendered & Listeners Active")
 EndFunc   ;==>_Web_jsonTree