webrtc/modules/desktop_capture/win/cursor.cc - Issue 1845113002: DirectX based screen capturer logic

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/desktop_capture/win/cursor.cc

Issue 1845113002: DirectX based screen capturer logic (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/modules/desktop_capture/win/cursor.cc

diff --git a/webrtc/modules/desktop_capture/win/cursor.cc b/webrtc/modules/desktop_capture/win/cursor.cc

index 304d5960d5ed7b3c450738ea31bf406b7cf23408..a46c40df9dcfe507987ee68112d8053522563794 100644

--- a/webrtc/modules/desktop_capture/win/cursor.cc

+++ b/webrtc/modules/desktop_capture/win/cursor.cc

@@ -110,11 +110,12 @@ bool HasAlphaChannel(const uint32_t* data, int stride, int width, int height) {

} // namespace

MouseCursor* CreateMouseCursorFromHCursor(HDC dc, HCURSOR cursor) {

- ICONINFO iinfo;

+ ICONINFO iinfo = { 0 };

if (!GetIconInfo(cursor, &iinfo)) {

LOG_F(LS_ERROR) << "Unable to get cursor icon info. Error = "

<< GetLastError();

- return NULL;

+ iinfo = { 0 };

+ assert(GetIconInfo(LoadCursor(nullptr, IDC_ARROW), &iinfo));

}

int hotspot_x = iinfo.xHotspot;