test/energy
1
0
Fork 0
mirror of https://gitee.com/energye/energy.git synced 2024-11-29 18:28:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

U: 修复CEF49(WinXP)设置http头

Browse Source
This commit is contained in:
杨红岩 2024-01-10 18:11:05 +08:00
parent 254932b2d5
commit 17d6d152b3
5 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cef/aux_viewsource.go
View File

@ -43,7 +43,14 @@ func (m *ICefBrowser) createBrowserViewSource() {
}
if assetserve.AssetsServerHeaderKeyValue != "" {
viewSourceWindow.Chromium().SetOnBeforeResourceLoad(func(sender lcl.IObject, browser *ICefBrowser, frame *ICefFrame, request *ICefRequest, callback *ICefCallback, result *TCefReturnValue) {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
if application.IsSpecVer49() {
headerMap := request.GetHeaderMap()
headerMap.Append(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue)
request.SetHeaderMap(headerMap)
headerMap.Free()
} else {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
}
})
}
viewSourceWindow.Chromium().SetOnBeforePopup(func(sender lcl.IObject, browser *ICefBrowser, frame *ICefFrame, beforePopupInfo *BeforePopupInfo, popupFeatures *TCefPopupFeatures, windowInfo *TCefWindowInfo, client *ICefClient, settings *TCefBrowserSettings, resultExtraInfo *ICefDictionaryValue, noJavascriptAccess *bool) bool {

9
cef/browser_window_lcl.go
View File

@ -897,7 +897,14 @@ func (m *LCLBrowserWindow) registerDefaultEvent() {
})
m.Chromium().SetOnBeforeResourceLoad(func(sender lcl.IObject, browser *ICefBrowser, frame *ICefFrame, request *ICefRequest, callback *ICefCallback, result *consts.TCefReturnValue) {
if assetserve.AssetsServerHeaderKeyValue != "" {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
if application.IsSpecVer49() {
headerMap := request.GetHeaderMap()
headerMap.Append(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue)
request.SetHeaderMap(headerMap)
headerMap.Free()
} else {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
}
}
if bwEvent.onBeforeResourceLoad != nil {
bwEvent.onBeforeResourceLoad(sender, browser, frame, request, callback, result, m)

9
cef/browser_window_views_framework.go
View File

@ -370,7 +370,14 @@ func (m *ViewsFrameworkBrowserWindow) registerDefaultEvent() {
})
m.Chromium().SetOnBeforeResourceLoad(func(sender lcl.IObject, browser *ICefBrowser, frame *ICefFrame, request *ICefRequest, callback *ICefCallback, result *consts.TCefReturnValue) {
if assetserve.AssetsServerHeaderKeyValue != "" {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
if application.IsSpecVer49() {
headerMap := request.GetHeaderMap()
headerMap.Append(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue)
request.SetHeaderMap(headerMap)
headerMap.Free()
} else {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
}
}
if bwEvent.onBeforeResourceLoad != nil {
bwEvent.onBeforeResourceLoad(sender, browser, frame, request, callback, result, m)

9
cef/tray_views_frame_commponent_windows.go
View File

@ -108,7 +108,14 @@ func (m *ViewsFrameTray) registerChromiumEvent() {
})
m.trayWindow.Chromium().SetOnBeforeResourceLoad(func(sender lcl.IObject, browser *ICefBrowser, frame *ICefFrame, request *ICefRequest, callback *ICefCallback, result *consts.TCefReturnValue) {
if assetserve.AssetsServerHeaderKeyValue != "" {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
if application.IsSpecVer49() {
headerMap := request.GetHeaderMap()
headerMap.Append(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue)
request.SetHeaderMap(headerMap)
headerMap.Free()
} else {
request.SetHeaderByName(assetserve.AssetsServerHeaderKeyName, assetserve.AssetsServerHeaderKeyValue, true)
}
}
})
m.trayWindow.Chromium().SetOnBeforeClose(func(sender lcl.IObject, browser *ICefBrowser) {

22
cef/types_string_multi_map.go
View File

@ -69,20 +69,20 @@ func (m *ICefStringMultiMap) GetEnumerate(key string, index uint32) (r string) {
}
// GetKey 根据 index 获取key
func (m *ICefStringMultiMap) GetKey(index uint32) (r string) {
value := NewTString()
imports.Proc(def.StringMultimap_GetKey).Call(m.Instance(), uintptr(index), value.Instance())
r = value.Value()
value.Free()
return r
func (m *ICefStringMultiMap) GetKey(index uint32) (key string) {
tKey := NewTString()
imports.Proc(def.StringMultimap_GetKey).Call(m.Instance(), uintptr(index), tKey.Instance())
key = tKey.Value()
tKey.Free()
return
}
// GetValue 根据 index 获取value
func (m *ICefStringMultiMap) GetValue(index uint32) (r string) {
value := NewTString()
imports.Proc(def.StringMultimap_GetValue).Call(m.Instance(), uintptr(index), value.Instance())
r = value.Value()
value.Free()
func (m *ICefStringMultiMap) GetValue(index uint32) (value string) {
tValue := NewTString()
imports.Proc(def.StringMultimap_GetValue).Call(m.Instance(), uintptr(index), tValue.Instance())
value = tValue.Value()
tValue.Free()
return
}