Skip to content

Commit c806300

Browse files
ioa747ioa747
authored
Merge pull request #99 from ioa747/Legacy-ProgIDs
New ProgIDs
2 parents 153162a + c3328a4 commit c806300

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

‎NetWebView2Lib.au3‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#Tidy_Parameters=/tcb=-1
88

9-
; NetWebView2Lib.au3 - Script Version: 2026.2.16.20 🚩
9+
; NetWebView2Lib.au3 - Script Version: 2026.2.17.5 🚩
1010

1111
#include <Array.au3>
1212
#include <GUIConstantsEx.au3>
@@ -136,7 +136,7 @@ Func _NetWebView2_CreateManager($sUserAgent = '', $s_fnEventPrefix = "", $s_AddB
136136
Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc) ; Local COM Error Handler
137137
#forceref $oMyError
138138

139-
Local $oWebV2M = ObjCreate("NetWebView2.Manager") ; REGISTERED VERSION
139+
Local $oWebV2M = ObjCreate("NetWebView2Lib.WebView2Manager") ; REGISTERED VERSION
140140
If @error Then __NetWebView2_Log(@ScriptLineNumber, $s_Prefix & " Manager Creation ERROR", 1)
141141
If @error Then Return SetError(@error, @extended, 0)
142142

@@ -245,7 +245,7 @@ EndFunc ;==>_NetWebView2_Initialize
245245
Func __NetWebView2_WaitForReadyState($oWebV2M, $hTimer, $iTimeOut_ms = 5000)
246246
Local Const $s_Prefix = ">>>[_NetWebView2_WaitForReadyState]:"
247247

248-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(2, 0, False)
248+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(2, 0, False)
249249
Local $sReadyState = ""
250250

251251
While 1
@@ -291,10 +291,10 @@ Func _NetWebView2_IsRegisteredCOMObject()
291291
Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_fake_COMErrFunc) ; Local COM Error Handler
292292
#forceref $oMyError
293293

294-
ObjCreate("NetWebView2.Manager")
294+
ObjCreate("NetWebView2Lib.WebView2Manager")
295295
If @error Then Return SetError(1, 0, False)
296296

297-
ObjCreate("NetJson.Parser")
297+
ObjCreate("NetWebView2Lib.WebView2Parser")
298298
If @error Then Return SetError(2, 0, False)
299299

300300
Return True
@@ -360,7 +360,7 @@ Func _NetWebView2_CleanUp(ByRef $oWebV2M, ByRef $oJSBridge)
360360
Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc) ; Local COM Error Handler
361361
#forceref $oMyError
362362

363-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, __NetWebView2_Log(@ScriptLineNumber, $s_Prefix & " ! Object not found", 1))
363+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, __NetWebView2_Log(@ScriptLineNumber, $s_Prefix & " ! Object not found", 1))
364364

365365
; Update Static Map to delete Handle
366366
__NetWebView2_LastMessage_KEEPER($oWebV2M, -1)
@@ -833,15 +833,15 @@ EndFunc ;==>_NetWebView2_PrintToPdfStream
833833
; Example .......: No
834834
; ===============================================================================================================================
835835
Func _NetWebView2_AddInitializationScript($oWebV2M, $vScript)
836-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, "ERROR: Invalid Object")
836+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, "ERROR: Invalid Object")
837837

838838
; Smart Detection
839839
If FileExists($vScript) Then $vScript = FileRead($vScript)
840840

841841
Local $sScriptId = $oWebV2M.AddInitializationScript($vScript)
842842
If StringInStr($sScriptId, "ERROR:") Then Return SetError(2, 0, $sScriptId)
843843
Return SetError(0, 0, $sScriptId)
844-
EndFunc ;==>New_NetWebView2_AddInitializationScript
844+
EndFunc ;==>_NetWebView2_AddInitializationScript
845845

846846
; #FUNCTION# ====================================================================================================================
847847
; Name...........: _NetWebView2_RemoveInitializationScript
@@ -859,7 +859,7 @@ EndFunc ;==>New_NetWebView2_AddInitializationScript
859859
; Example .......: No
860860
; ===============================================================================================================================
861861
Func _NetWebView2_RemoveInitializationScript($oWebV2M, $sScriptId)
862-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, False) ; Error 1: Not an object
862+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, False) ; Error 1: Not an object
863863
$oWebV2M.RemoveInitializationScript($sScriptId)
864864
Return SetError(@error, 0, (@error ? False : True))
865865
EndFunc ;==>_NetWebView2_RemoveInitializationScript
@@ -882,7 +882,7 @@ EndFunc ;==>_NetWebView2_RemoveInitializationScript
882882
; Example .......: No
883883
; ===============================================================================================================================
884884
Func _NetWebView2_SetVirtualHostNameToFolderMapping($oWebV2M, $sHostName, $sFolderPath, $iAccessKind = 0)
885-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, False)
885+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, False)
886886
$oWebV2M.SetVirtualHostNameToFolderMapping($sHostName, $sFolderPath, $iAccessKind)
887887
Return SetError(@error, 0, (@error ? False : True))
888888
EndFunc ;==>_NetWebView2_SetVirtualHostNameToFolderMapping
@@ -903,7 +903,7 @@ EndFunc ;==>_NetWebView2_SetVirtualHostNameToFolderMapping
903903
; Example .......: No
904904
; ===============================================================================================================================
905905
Func _NetWebView2_SetLockState($oWebV2M, $bLockState)
906-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, False)
906+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, False)
907907
$oWebV2M.SetLockState($bLockState)
908908
Return SetError(@error, 0, (@error ? False : True))
909909
EndFunc ;==>_NetWebView2_SetLockState
@@ -924,7 +924,7 @@ EndFunc ;==>_NetWebView2_SetLockState
924924
; Example .......: No
925925
; ===============================================================================================================================
926926
Func _NetWebView2_EncodeBinaryToB64($oWebV2M, ByRef $dBinary)
927-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, "")
927+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, "")
928928
Local $sResult = $oWebV2M.EncodeBinaryToB64($dBinary)
929929
If @error Then Return SetError(@error, 0, "")
930930
Return SetError(0, 0, $sResult)
@@ -946,7 +946,7 @@ EndFunc ;==>_NetWebView2_EncodeBinaryToB64
946946
; Example .......: No
947947
; ===============================================================================================================================
948948
Func _NetWebView2_DecodeB64ToBinary($oWebV2M, ByRef $sB64)
949-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, Binary(""))
949+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, Binary(""))
950950
Local $dResult = $oWebV2M.DecodeB64ToBinary($sB64)
951951
If @error Then Return SetError(@error, 0, Binary(""))
952952
Return SetError(0, 0, $dResult)
@@ -968,7 +968,7 @@ EndFunc ;==>_NetWebView2_DecodeB64ToBinary
968968
; Example .......: No
969969
; ===============================================================================================================================
970970
Func _NetWebView2_SetBuiltInErrorPageEnabled($oWebV2M, $bEnabled)
971-
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2.Manager' Then Return SetError(1, 0, False)
971+
If (Not IsObj($oWebV2M)) Or ObjName($oWebV2M, $OBJ_PROGID) <> 'NetWebView2Lib.WebView2Manager' Then Return SetError(1, 0, False)
972972
$oWebV2M.IsBuiltInErrorPageEnabled = $bEnabled
973973
Return SetError(@error, 0, (@error ? False : True))
974974
EndFunc ;==>_NetWebView2_SetBuiltInErrorPageEnabled
@@ -1011,7 +1011,7 @@ Func _NetJson_CreateParser($sInitialJson = "{}")
10111011
#forceref $oMyError
10121012

10131013
If $sInitialJson = "" Or $sInitialJson = Default Then $sInitialJson = "{}"
1014-
Local $oParser = ObjCreate("NetJson.Parser") ; REGISTERED VERSION
1014+
Local $oParser = ObjCreate("NetWebView2Lib.WebView2Parser") ; REGISTERED VERSION
10151015
;~ If $_g_bNetWebView2_DebugDev Then __NetWebView2_ObjName_FlagsValue($oParser) ; FOR DEV TESTING ONLY
10161016
If Not IsObj($oParser) Then Return SetError(1, 0, 0)
10171017
If @error Then Return SetError(@error, @extended, 0)
@@ -2151,6 +2151,3 @@ EndFunc ;==>__NetWebView2_Events__OnScreenCaptureStarting
21512151
#EndRegion ; NetWebView2Lib UDF - === EVENT HANDLERS === #TODO
21522152

21532153
#EndRegion ; NetWebView2Lib UDF - === EVENT HANDLERS ===
2154-
2155-
2156-

0 commit comments

Comments
 (0)