Merge pull request #72 from mlipok/patch-1

Update BETA NetWebView2Lib.au3

Author: ioa747

NetWebView2Lib.au3

@@ -9,10 +9,6 @@
 #include <WindowsConstants.au3>
 #include "..\NetWebView2Lib.au3"
 
-; ==============================================================================
-; WebView2 Multi-Channel Presentation Script
-; ==============================================================================
-
 Main()
 
 Func Main()
@@ -35,9 +31,9 @@ Func Main()
 	Local $oJSBridge = _NetWebView2_GetBridge($oWebV2M, "_BridgeMyEventsHandler_")
 	If @error Then Return SetError(@error, @extended, $oWebV2M)
 
-	Local $sProfileDirectory = @TempDir & "\NetWebView2Lib-UserDataFolder"
+	Local $sProfileDirectory = @ScriptDir & "\NetWebView2Lib-UserDataFolder"
 	_NetWebView2_Initialize($oWebV2M, $hGUI, $sProfileDirectory, 0, 0, 0, 0, True, True, True, 1.2, "0x2B2B2B")
-	__NetWebView2_Log(@ScriptLineNumber, "After: _NetWebView2_Initialize()", 1)
+	__Example_Log(@ScriptLineNumber, "After: _NetWebView2_Initialize()")
 
 	; navigate to HTML string - full fill the object with your own offline content - without downloading any content
 	_NetWebView2_NavigateToString($oWebV2M, __GetDemoHTML())
@@ -56,9 +52,9 @@ Func Main()
 	MsgBox($MB_TOPMOST, "TEST #" & @ScriptLineNumber, 'Watch Point - AFTER:' & @CRLF & 'navigate to fake/broken url')
 
 	; navigate to fake not ex url
-	__NetWebView2_Log(@ScriptLineNumber, "Before: https://w2ww.microsoft.com", 1)
+	__Example_Log(@ScriptLineNumber, "Before: https://w2ww.microsoft.com")
 	_NetWebView2_Navigate($oWebV2M, 'https://w2ww.microsoft.com', $NETWEBVIEW2_MESSAGE__TITLE_CHANGED, 5 * 1000)
-	__NetWebView2_Log(@ScriptLineNumber, "After: https://w2ww.microsoft.com", 1)
+	__Example_Log(@ScriptLineNumber, "After: https://w2ww.microsoft.com")
 	MsgBox($MB_TOPMOST, "TEST #" & @ScriptLineNumber, 'Watch Point - AFTER:' & @CRLF & 'navigate to fake/broken url' & @CRLF & 'HostNameNotResolved')
 
 	; Main Loop
@@ -71,7 +67,8 @@ Func Main()
 
 	GUIDelete($hGUI)
 
-	_NetWebView2_CleanUp($oWebV2M)
+
+	_NetWebView2_CleanUp($oWebV2M, $oJSBridge)
 EndFunc   ;==>Main
 
 ; ==============================================================================
@@ -125,3 +122,8 @@ Func __GetDemoHTML()
 			'</body></html>'
 	Return $sH
 EndFunc   ;==>__GetDemoHTML
+
+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/001-BasicDemo.au3

@@ -13,15 +13,17 @@
 ; Global variables for data management
 Global $aMessages[0][3]
 Global $sFilePath = @ScriptDir & "\messages.csv"
-Global $hGUI, $oWebV2M, $oBridge, $idBlue, $idRed
+Global $idBlue, $idRed
 
-Main()
+_Example()
 
-Func Main()
+Func _Example()
 
-	_Show_Form()
+	Local $oWebV2M, $oBridge
+	_Create_Form($oWebV2M, $oBridge)
+	If @error Then Return SetError(@error, @extended, '')
 
-	; Main Application Loop
+	; main Application Loop
 	While 1
 		Switch GUIGetMsg()
 			Case $GUI_EVENT_CLOSE
@@ -39,12 +41,12 @@ Func Main()
 		EndSwitch
 	WEnd
 
-	_NetWebView2_CleanUp($oWebV2M)
-EndFunc   ;==>Main
+	_NetWebView2_CleanUp($oWebV2M, $oBridge)
+EndFunc   ;==>_Example
 
-Func _Show_Form()
+Func _Create_Form(ByRef $oWebV2M, ByRef $oBridge)
 	; Create GUI with resizing support
-	$hGUI = GUICreate("WebView2 Theme Switcher", 450, 460)
+	Local $hGUI = GUICreate("WebView2 Theme Switcher", 450, 460)
 	GUISetBkColor(0x1E1E1E)
 
 	$idBlue = GUICtrlCreateLabel("Blue Theme", 10, 10, 100, 30)
@@ -58,27 +60,29 @@ Func _Show_Form()
 	GUICtrlSetColor(-1, 0xFF0000)
 
 	; Create WebView2 Manager object and register events
-	$oWebV2M = _NetWebView2_CreateManager("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0", "__MyEVENTS_Manager_", "")
+	$oWebV2M = _NetWebView2_CreateManager("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0", "", "")
+	If @error Then Return SetError(@error, @extended, '')
 
 	; initialize browser - put it on the GUI
-	Local $sProfileDirectory = @TempDir & "\NetWebView2Lib-UserDataFolder"
+	Local $sProfileDirectory = @ScriptDir & "\NetWebView2Lib-UserDataFolder"
 	_NetWebView2_Initialize($oWebV2M, $hGUI, $sProfileDirectory, 0, 30, 450, 430, True, False, False, 1.1)
+	If @error Then Return SetError(@error, @extended, '')
 
 	$oWebV2M.IsZoomControlEnabled = False
 
 	; Create bridge object and register events
 	$oBridge = _NetWebView2_GetBridge($oWebV2M, "__MyEVENTS_Bridge_")
+	#forceref $oBridge
 
 	Local $sHTML = "<html><head><meta charset='UTF-8'><style>:" & __FormCSS() & "</style></head><body>" & __FormHTML() & "</body></html>"
 	$oWebV2M.NavigateToString($sHTML)
 	GUISetState(@SW_SHOW, $hGUI)
-
-EndFunc   ;==>_Show_Form
+EndFunc   ;==>_Create_Form
 
 ; Handles data received from the JavaScript 'postMessage'
-Func __MyEVENTS_Bridge_OnMessageReceived($oWebV2M, $hGUI, $sMessage)
-	#forceref $oWebV2M, $hGUI
-	ConsoleWrite("$sMessage=" & $sMessage & @CRLF)
+Func __MyEVENTS_Bridge_OnMessageReceived($oWebV2M, $hGUI, $sMessage) ; fork from __NetWebView2_JSEvents__OnMessageReceived()
+	#forceref $hGUI
+	__Example_Log(@ScriptLineNumber, "$sMessage=" & $sMessage)
 
 	; Check for the specific form submission prefix
 	If StringLeft($sMessage, 12) = "SUBMIT_FORM:" Then
@@ -106,10 +110,10 @@ Func __MyEVENTS_Bridge_OnMessageReceived($oWebV2M, $hGUI, $sMessage)
 					FileClose($hFile)
 				EndIf
 
-				ShowWebNotification("Data Saved Successfully!")
+				ShowWebNotification($oWebV2M, "Data Saved Successfully!")
 			Else
 				; Trigger a visual notification inside the WebView
-				ShowWebNotification("Please enter valid data", '#d70000')
+				ShowWebNotification($oWebV2M, "Please enter valid data", '#d70000')
 			EndIf
 		EndIf
 	EndIf
@@ -197,7 +201,7 @@ Func __FormHTML()
 EndFunc   ;==>__FormHTML
 
 ; Injects a temporary notification box into the web page
-Func ShowWebNotification($sMessage, $sBgColor = "#4CAF50", $iDuration = 3000)
+Func ShowWebNotification($oWebV2M, $sMessage, $sBgColor = "#4CAF50", $iDuration = 3000)
 	; Local error handler for COM objects
 	Local $oMyError = ObjEvent("AutoIt.Error", __HtmlGUI_ErrFunc)
 	#forceref $oMyError
@@ -234,3 +238,8 @@ Func __HtmlGUI_ErrFunc($oError)
 			@TAB & "err.scriptline is: " & @TAB & $oError.scriptline & @CRLF & _
 			@TAB & "err.retcode is: " & @TAB & "0x" & Hex($oError.retcode) & @CRLF & @CRLF)
 EndFunc   ;==>__HtmlGUI_ErrFunc
+
+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/002-Html_Gui.au3

@@ -9,9 +9,9 @@
 #include <GUIConstantsEx.au3>
 #include "..\NetWebView2Lib.au3"
 
-Main()
+_Main()
 
-Func Main()
+Func _Main()
 	; --- Main GUI Setup ---
 	Local $hMainGUI = GUICreate("Multi-WebView2 v2.0.0 Standard", 1000, 600, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
 	GUISetState(@SW_SHOW, $hMainGUI)
@@ -41,31 +41,17 @@ Func Main()
 	; CleanUp
 	_NetWebView2_CleanUp($oWeb_1, $oBridge_1)
 ;~ 	_NetWebView2_CleanUp($oWeb_2, $oBridge_2)
-EndFunc   ;==>Main
+EndFunc   ;==>_Main
 
 ; ==============================================================================
 ; UPDATED HELPERS
 ; ==============================================================================
 
-Func UpdateWebUI($oManager, $sElementId, $sNewText)
+Func _UpdateWebUI($oManager, $sElementId, $sNewText)
 	If Not IsObj($oManager) Then Return
 	Local $sJS = StringFormat("document.getElementById('%s').innerText = '%s';", $sElementId, $sNewText)
 	_NetWebView2_ExecuteScript($oManager, $sJS, $NETWEBVIEW2_EXECUTEJS_MODE0_FIREANDFORGET)
-EndFunc   ;==>UpdateWebUI
-
-Func _NetWebView2_BrowserSetupWrapper($hOuterParentWindow, ByRef $oOuterWeb, $sEventPrefix, $sProfile, ByRef $oOuterBridge, ByRef $hInnerWebViewWindow, $iX, $iY, $iW, $iH, $s_AddBrowserArgs)
-	$hInnerWebViewWindow = GUICreate("", $iW, $iH, $iX, $iY, $WS_CHILD, -1, $hOuterParentWindow)
-	GUISetState(@SW_SHOW, $hInnerWebViewWindow)
-
-	$oOuterWeb = _NetWebView2_CreateManager("", $sEventPrefix & '_Manager__', $s_AddBrowserArgs)
-	If @error Then Return SetError(@error, @extended, $oOuterWeb)
-
-	Local $Result = _NetWebView2_Initialize($oOuterWeb, $hInnerWebViewWindow, $sProfile, 0, 0, $iW, $iH)
-	If @error Then Return SetError(@error, @extended, $Result)
-
-	$oOuterBridge = _NetWebView2_GetBridge($oOuterWeb, $sEventPrefix & "_Bridge__")
-	If @error Then Return SetError(@error, @extended, $oOuterBridge)
-EndFunc   ;==>_NetWebView2_BrowserSetupWrapper
+EndFunc   ;==>_UpdateWebUI
 
 Func _GetDemoHTML($sTitle)
 	Return '<html><title>Simple GUI</title><head><style>' & _
@@ -86,36 +72,41 @@ EndFunc   ;==>_GetDemoHTML
 
 #Region ; USER DEFINED EVENTS HANDLER FUNCTION
 ; BROWSER 1 - Manager Events
-Func __UserEventHandler_Web1__Manager__OnMessageReceived($oWebView, $hGUI, $sMsg)
-	#forceref $hGUI
-	ConsoleWrite("- [Browser 1]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
+Func __UserEventHandler_Web1__Manager__OnMessageReceived($oWebView, $hWindow, $sMsg)
+	#forceref $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)
 	EndIf
 EndFunc   ;==>__UserEventHandler_Web1__Manager__OnMessageReceived
 
 ; BROWSER 1 - JavaScript Bridge Events
-Func __UserEventHandler_Web1__Bridge__OnMessageReceived($oWebView, $hGUI, $sMsg)
+Func __UserEventHandler_Web1__Bridge__OnMessageReceived($oWebView, $hWindow, $sMsg)
 	Local Static $iMsgCnt = -1
 	ConsoleWrite(">> [JS 1]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
 
 	If $sMsg = "CLOSE_APP" Then
-		If MsgBox(36, "Confirm", "Close this Browser Instance?", 0, $hGUI) = 6 Then
+		If MsgBox(36, "Confirm", "Close this Browser Instance?", 0, $hWindow) = 6 Then
 			$oWebView.Cleanup()
-			GUIDelete($hGUI)
+			GUIDelete($hWindow)
 			ConsoleWrite("!> Browser 1 has been shut down." & @CRLF)
 		EndIf
 	Else
 		$iMsgCnt += 1
-		UpdateWebUI($oWebView, "mainTitle", "Counter: " & $iMsgCnt)
-		UpdateWebUI($oWebView, "statusMsg", "Last Message: " & $sMsg)
+		_UpdateWebUI($oWebView, "mainTitle", "Counter: " & $iMsgCnt)
+		_UpdateWebUI($oWebView, "statusMsg", "Last Message: " & $sMsg)
+		If $sMsg = "PING" Then
+			GUISetState(@SW_HIDE, $hWindow)
+			Sleep(200)
+			GUISetState(@SW_SHOW, $hWindow)
+		EndIf
 	EndIf
 EndFunc   ;==>__UserEventHandler_Web1__Bridge__OnMessageReceived
 
 ; BROWSER 2 - Manager Events
-Func __UserEventHandler_Web2__Manager__OnMessageReceived($oWebView, $hGUI, $sMsg)
-	#forceref $hGUI
-	ConsoleWrite("- [Browser 2]: " & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg) & @CRLF)
+Func __UserEventHandler_Web2__Manager__OnMessageReceived($oWebView, $hWindow, $sMsg)
+	#forceref $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)
 	EndIf
@@ -134,8 +125,13 @@ Func __UserEventHandler_Web2__Bridge__OnMessageReceived($oWebView, $hWindow, $sM
 		EndIf
 	Else
 		$iMsgCnt += 1
-		UpdateWebUI($oWebView, "mainTitle", "Counter: " & $iMsgCnt)
-		UpdateWebUI($oWebView, "statusMsg", "Last Message: " & $sMsg)
+		_UpdateWebUI($oWebView, "mainTitle", "Counter: " & $iMsgCnt)
+		_UpdateWebUI($oWebView, "statusMsg", "Last Message: " & $sMsg)
+		If $sMsg = "PING" Then
+			GUISetState(@SW_HIDE, $hWindow)
+			Sleep(200)
+			GUISetState(@SW_SHOW, $hWindow)
+		EndIf
 	EndIf
 EndFunc   ;==>__UserEventHandler_Web2__Bridge__OnMessageReceived
 #EndRegion ; USER DEFINED EVENTS HANDLER FUNCTION

examples/003-Multi-Basic.au3

@@ -31,40 +31,33 @@
 
 #include "..\NetWebView2Lib.au3"
 
-; ==============================================================================
-; WebView2 Multi-Channel Presentation Script^
-; ==============================================================================
+Global $idLabelStatus
 
-; Global objects
+_Example()
 
-; GUI & Controls
-Global $hGUI, $idLabelStatus
-
-Main()
-
-Func Main()
+Func _Example()
 	Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc)
 	#forceref $oMyError
 
 	; Create the UI
 	Local $iHeight = 800
-	$hGUI = GUICreate("WebView2 .NET Manager - Demo: " & @ScriptName, 1100, $iHeight, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
+	Local $hGUI = GUICreate("WebView2 .NET Manager - Demo: " & @ScriptName, 1100, $iHeight, -1, -1, BitOR($WS_OVERLAPPEDWINDOW, $WS_CLIPCHILDREN))
 	$idLabelStatus = GUICtrlCreateLabel("Status: Initializing Engine...", 10, $iHeight - 20, 880, 20)
 	GUICtrlSetFont(-1, 9, 400, 0, "Segoe UI")
 
 	; Initialize WebView2 Manager and register events
 	Local $oWebV2M = _NetWebView2_CreateManager("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36 Edg/144.0.0.0", "", "--mute-audio")
 	If @error Then Return SetError(@error, @extended, $oWebV2M)
 
-;~ 	; Initialize JavaScript Bridge
+;~ 	; Initialize JavaScript Bridge ; not needed in this example
 ;~ 	Local $oJSBridge = _NetWebView2_GetBridge($oWebV2M)
 ;~ 	If @error Then Return SetError(@error, @extended, $oWebV2M)
 
-	Local $sProfileDirectory = @TempDir & "\..\UserDataFolder"
+	Local $sProfileDirectory = @ScriptDir & "\NetWebView2Lib-UserDataFolder"
 	_NetWebView2_Initialize($oWebV2M, $hGUI, $sProfileDirectory, 0, 0, 0, $iHeight - 20, True, True, True, 1.2, "0x2B2B2B")
 
 	GUISetState(@SW_SHOW, $hGUI)
-	WinSetOnTop($hGUI, '', True)
+	WinSetOnTop($hGUI, '', $WINDOWS_ONTOP)
 
 	Local $s_PDF_FileFullPath
 
@@ -93,27 +86,15 @@ Func Main()
 		EndSwitch
 	WEnd
 
+	Local $oJSBridge
+	_NetWebView2_CleanUp($oWebV2M, $oJSBridge)
 	GUIDelete($hGUI)
-
-	_NetWebView2_CleanUp($oWebV2M)
-EndFunc   ;==>Main
-
-Func _GetFirstChildWindowHWND($hWnd)
-	Local $aData = _WinAPI_EnumChildWindows($hWnd)
-	ConsoleWrite("! $aData[1][0] = " & $aData[1][0] & @CRLF)
-;~  _ArrayDisplay($aData, '_WinAPI_EnumChildWindows')
-
-	If Not @error And UBound($aData) Then Return $aData[1][0]
-
-	Return SetError(1, @extended, False)
-EndFunc   ;==>_GetFirstChildWindowHWND
-
+EndFunc   ;==>_Example
 
 Func __WebView2_freezer($hMainGUI_Window, $hWebView2_Window)
 	Local $aPos = WinGetPos($hWebView2_Window)
 
 	Local $hPrev = GUISwitch($hMainGUI_Window)
-;~     Local $idPic = GUICtrlCreatePic('', $aPos[0], $aPos[1], $aPos[2], $aPos[3])
 	Local $idPic = GUICtrlCreatePic('', 0, 0, $aPos[2], $aPos[3])
 	Local $hPic = GUICtrlGetHandle($idPic)
 	GUISwitch($hPrev)