Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
OpenCorePKG_MOD
提交
ac4dd020
O
OpenCorePKG_MOD
项目概览
btwise
/
OpenCorePKG_MOD
通知
26
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
OpenCorePKG_MOD
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ac4dd020
编写于
2月 20, 2021
作者:
V
vit9696
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OpenCanopy: Fix switching to graphics mode when entering canopy
closes acidanthera/bugtracker#1512
上级
12f15107
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
20 deletion
+47
-20
Changelog.md
Changelog.md
+1
-0
Platform/OpenCanopy/OcBootstrap.c
Platform/OpenCanopy/OcBootstrap.c
+45
-20
Platform/OpenCanopy/OpenCanopy.inf
Platform/OpenCanopy/OpenCanopy.inf
+1
-0
未找到文件。
Changelog.md
浏览文件 @
ac4dd020
...
...
@@ -10,6 +10,7 @@ OpenCore Changelog
-
Added workaround for firmware not specifying DeviceHandle at bootstrap
-
Added support for R/O page tables in
`SetupVirtualMap`
quirk
-
Added OEM preservation for certain Apple SMBIOS tables
-
Fixed switching to graphics mode when entering OpenCanopy
#### v0.6.6
-
Added keyboard and pointer entry scroll support in OpenCanopy
...
...
Platform/OpenCanopy/OcBootstrap.c
浏览文件 @
ac4dd020
...
...
@@ -33,9 +33,48 @@
extern
BOOT_PICKER_GUI_CONTEXT
mGuiContext
;
extern
CONST
GUI_IMAGE
mBackgroundImage
;
STATIC
GUI_DRAWING_CONTEXT
mDrawContext
;
STATIC
EFI_CONSOLE_CONTROL_SCREEN_MODE
mPreviousMode
;
STATIC
EFI_STATUS
OcShowMenyByOcEnter
(
IN
OC_BOOT_CONTEXT
*
BootContext
)
{
EFI_STATUS
Status
;
Status
=
GuiLibConstruct
(
BootContext
->
PickerContext
,
mGuiContext
.
CursorDefaultX
,
mGuiContext
.
CursorDefaultY
);
if
(
EFI_ERROR
(
Status
))
{
return
Status
;
}
//
// Extension for OpenCore builtin renderer to mark that we control text output here.
//
gST
->
ConOut
->
TestString
(
gST
->
ConOut
,
OC_CONSOLE_MARK_CONTROLLED
);
mPreviousMode
=
OcConsoleControlSetMode
(
EfiConsoleControlScreenGraphics
);
return
EFI_SUCCESS
;
}
STATIC
GUI_DRAWING_CONTEXT
mDrawContext
;
VOID
OcShowMenyByOcLeave
(
VOID
)
{
GuiLibDestruct
();
//
// Extension for OpenCore builtin renderer to mark that we no longer control text output here.
//
gST
->
ConOut
->
TestString
(
gST
->
ConOut
,
OC_CONSOLE_MARK_UNCONTROLLED
);
OcConsoleControlSetMode
(
mPreviousMode
);
}
EFI_STATUS
EFIAPI
...
...
@@ -56,20 +95,11 @@ OcShowMenuByOc (
mGuiContext
.
PickerContext
=
BootContext
->
PickerContext
;
mGuiContext
.
AudioPlaybackTimeout
=
-
1
;
Status
=
GuiLibConstruct
(
BootContext
->
PickerContext
,
mGuiContext
.
CursorDefaultX
,
mGuiContext
.
CursorDefaultY
);
Status
=
OcShowMenyByOcEnter
(
BootContext
);
if
(
EFI_ERROR
(
Status
))
{
return
Status
;
}
//
// Extension for OpenCore builtin renderer to mark that we control text output here.
//
gST
->
ConOut
->
TestString
(
gST
->
ConOut
,
OC_CONSOLE_MARK_CONTROLLED
);
//
// Do not play intro animation for blind.
//
...
...
@@ -83,7 +113,7 @@ OcShowMenuByOc (
InternalGetCursorImage
);
if
(
EFI_ERROR
(
Status
))
{
GuiLibDestruct
();
OcShowMenyByOcLeave
();
return
Status
;
}
...
...
@@ -95,7 +125,7 @@ OcShowMenuByOc (
Index
==
BootContext
->
DefaultEntry
->
EntryIndex
-
1
);
if
(
EFI_ERROR
(
Status
))
{
GuiLibDestruct
();
OcShowMenyByOcLeave
();
return
Status
;
}
}
...
...
@@ -138,12 +168,7 @@ OcShowMenuByOc (
//
GuiClearScreen
(
&
mDrawContext
,
mBackgroundImage
.
Buffer
);
BootPickerViewDeinitialize
(
&
mDrawContext
,
&
mGuiContext
);
GuiLibDestruct
();
//
// Extension for OpenCore builtin renderer to mark that we no longer control text output here.
//
gST
->
ConOut
->
TestString
(
gST
->
ConOut
,
OC_CONSOLE_MARK_UNCONTROLLED
);
OcShowMenyByOcLeave
();
*
ChosenBootEntry
=
mGuiContext
.
BootEntry
;
BootContext
->
PickerContext
->
HideAuxiliary
=
mGuiContext
.
HideAuxiliary
;
...
...
Platform/OpenCanopy/OpenCanopy.inf
浏览文件 @
ac4dd020
...
...
@@ -71,6 +71,7 @@
MtrrLib
OcAppleKeyMapLib
OcCompressionLib
OcConsoleLib
OcGuardLib
OcMiscLib
OcPngLib
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录