Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
c308dfca
W
wpf
项目概览
dotNET Platform
/
wpf
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wpf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c308dfca
编写于
7月 04, 2022
作者:
J
Jan Kučera
提交者:
GitHub
7月 04, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ignore NotImplementedException from ITaskbarList (#6547)
Co-authored-by:
N
Jan Kučera
<
miloush@users.noreply.github.com
>
上级
b296f3bf
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
5 deletion
+13
-5
src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs
...esentationFramework/MS/Internal/AppModel/ShellProvider.cs
+2
-1
src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
...et.Wpf/src/PresentationFramework/System/Windows/Window.cs
+11
-4
未找到文件。
src/Microsoft.DotNet.Wpf/src/PresentationFramework/MS/Internal/AppModel/ShellProvider.cs
浏览文件 @
c308dfca
...
...
@@ -697,7 +697,8 @@ internal interface ITaskbarList
/// <summary>
/// This function must be called first to validate use of other members.
/// </summary>
void
HrInit
();
[
PreserveSig
]
HRESULT
HrInit
();
/// <summary>
/// This function adds a tab for hwnd to the taskbar.
...
...
src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
浏览文件 @
c308dfca
...
...
@@ -637,7 +637,7 @@ private void HandleTaskbarListError(HRESULT hr)
// Explorer being non-responsive should be a transient issue. Post back to apply the full TaskbarItemInfo.
_taskbarRetryTimer
.
Start
();
}
else
if
(
hr
==
(
HRESULT
)
Win32Error
.
ERROR_INVALID_WINDOW_HANDLE
)
else
if
(
hr
==
(
HRESULT
)
Win32Error
.
ERROR_INVALID_WINDOW_HANDLE
||
hr
==
HRESULT
.
E_NOTIMPL
)
{
// We'll get this when Explorer's not running. This means there's no Shell to integrate with.
if
(
TraceShell
.
IsEnabled
)
...
...
@@ -6292,6 +6292,7 @@ private void ApplyTaskbarItemInfo()
return
;
}
HRESULT
hr
=
HRESULT
.
S_OK
;
if
(
_taskbarList
==
null
)
{
// If we don't have a handle and there isn't a TaskbarItemInfo, then we don't have anything to apply or remove.
...
...
@@ -6304,12 +6305,19 @@ private void ApplyTaskbarItemInfo()
try
{
taskbarList
=
(
ITaskbarList
)
Activator
.
CreateInstance
(
Type
.
GetTypeFromCLSID
(
new
Guid
(
CLSID
.
TaskbarList
)));
taskbarList
.
HrInit
();
hr
=
taskbarList
.
HrInit
();
if
(
hr
!=
HRESULT
.
S_OK
)
{
// Taskbar not available (no user logged in, running under terminal service, custom shell, etc.)
HandleTaskbarListError
(
hr
);
return
;
}
// This QI will only work on Win7.
_taskbarList
=
(
ITaskbarList3
)
taskbarList
;
taskbarList
=
null
;
}
}
finally
{
Utilities
.
SafeRelease
(
ref
taskbarList
);
...
...
@@ -6334,7 +6342,6 @@ private void ApplyTaskbarItemInfo()
}
// Apply (or clear) all aspects of the TaskbarItemInfo to this Window.
HRESULT
hr
=
HRESULT
.
S_OK
;
hr
=
RegisterTaskbarThumbButtons
();
if
(
hr
.
Succeeded
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录