admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix 'Image will be cropped if WindowCapturerWinGdi used'"

Browse Source 
This reverts commit 844225a76a98aa3be5aca09c19ab72a5e7b6c38a.

Reason for revert: potential nullptr dereference

Original change's description:
> Fix 'Image will be cropped if WindowCapturerWinGdi used'
>
> Bug: webrtc:15719
> Change-Id: I7daf8ee5b90fbe9f1246f1d99211ffa0d8a19f73
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/330780
> Reviewed-by: Alexander Cooper <alcooper@chromium.org>
> Commit-Queue: Alexander Cooper <alcooper@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#41503}

Bug: webrtc:15719
Change-Id: Ib38e1345c4c590b6a71bbea476a9d780a2f5e800
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334200
Owners-Override: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Manashi Sarkar <manashi@google.com>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#41509}
This commit is contained in:
Jeremy Leconte 2024-01-12 09:34:26 +00:00 committed by WebRTC LUCI CQ
parent 5aea42860b
commit 634cb403e6
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -120,7 +120,6 @@ Silviu Caragea <silviu.cpp@gmail.com>
Stefan Gula <steweg@gmail.com> Stefan Gula <steweg@gmail.com>
Stephan Hartmann <stha09@googlemail.com> Stephan Hartmann <stha09@googlemail.com>
Steve Reid <sreid@sea-to-sky.net> Steve Reid <sreid@sea-to-sky.net>
Tao chen <meemetao@gmail.com>
Takaaki Suzuki <takaakisuzuki.14@gmail.com> Takaaki Suzuki <takaakisuzuki.14@gmail.com>
Tarun Chawla <trnkumarchawla@gmail.com> Tarun Chawla <trnkumarchawla@gmail.com>
Todd Wong <todd.wong.ndq@gmail.com> Todd Wong <todd.wong.ndq@gmail.com>

7
modules/desktop_capture/win/window_capture_utils.cc
View File

@ -183,13 +183,6 @@ bool GetCroppedWindowRect(HWND window,
is_maximized) { is_maximized) {
// Only apply this cropping to windows with a resize border (otherwise, // Only apply this cropping to windows with a resize border (otherwise,
// it'd clip the edges of captured pop-up windows without this border). // it'd clip the edges of captured pop-up windows without this border).
RECT rect;
DwmGetWindowAttribute(window, DWMWA_EXTENDED_FRAME_BOUNDS, &rect,
sizeof(RECT));
// it's means that the window edge is not transparent
if (rect.left == original_rect->left()) {
return true;
}
LONG style = GetWindowLong(window, GWL_STYLE); LONG style = GetWindowLong(window, GWL_STYLE);
if (style & WS_THICKFRAME || style & DS_MODALFRAME) { if (style & WS_THICKFRAME || style & DS_MODALFRAME) {
int width = GetSystemMetrics(SM_CXSIZEFRAME); int width = GetSystemMetrics(SM_CXSIZEFRAME);