TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-14 08:21:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

scrap: avoid null duplication after HDR fallback failure

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages
2026-09-02 23:08:34 +08:00
parent 792618e59a
commit 89d444b950
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libs/scrap/src/dxgi/mod.rs
View File

@@ -247,9 +247,8 @@ impl Capturer {
} }
// Drops the tone-map and re-duplicates the output the legacy way, so DXGI // Drops the tone-map and re-duplicates the output the legacy way, so DXGI
// hands over clipped BGRA8 (the pre-HDR behaviour) and the session stays on // hands over clipped BGRA8 (the pre-HDR behaviour). If re-duplication fails,
// DXGI instead of being switched to GDI by the capture loop, which treats // switch to GDI before returning. The caller sees WouldBlock and asks again.
// any other error that way. The caller sees WouldBlock and asks again.
unsafe fn abandon_tonemap<T>(&mut self, err: io::Error) -> io::Result<T> { unsafe fn abandon_tonemap<T>(&mut self, err: io::Error) -> io::Result<T> {
if hdr::is_permanent(&err) { if hdr::is_permanent(&err) {
hdr::UNAVAILABLE.store(true, std::sync::atomic::Ordering::Relaxed); hdr::UNAVAILABLE.store(true, std::sync::atomic::Ordering::Relaxed);
@@ -259,9 +258,15 @@ impl Capturer {
(*self.duplication.0).ReleaseFrame(); (*self.duplication.0).ReleaseFrame();
self.duplication = ComPtr(ptr::null_mut()); self.duplication = ComPtr(ptr::null_mut());
let mut duplication = ptr::null_mut(); let mut duplication = ptr::null_mut();
wrap_hresult( let result = wrap_hresult(
(*self.display.inner.0).DuplicateOutput(self.device.0 as *mut _, &mut duplication), (*self.display.inner.0).DuplicateOutput(self.device.0 as *mut _, &mut duplication),
)?; );
if let Err(err) = result {
if self.set_gdi() {
return Err(io::ErrorKind::WouldBlock.into());
}
return Err(err);
}
self.duplication = ComPtr(duplication); self.duplication = ComPtr(duplication);
let mut desc: DXGI_OUTDUPL_DESC = mem::zeroed(); let mut desc: DXGI_OUTDUPL_DESC = mem::zeroed();
(*duplication).GetDesc(&mut desc); (*duplication).GetDesc(&mut desc);
@@ -422,6 +427,9 @@ impl Capturer {
} }
unsafe fn load_frame(&mut self, timeout: UINT) -> io::Result<(*const u8, i32)> { unsafe fn load_frame(&mut self, timeout: UINT) -> io::Result<(*const u8, i32)> {
if self.duplication.0.is_null() {
return Err(io::ErrorKind::AddrNotAvailable.into());
}
let mut frame = ptr::null_mut(); let mut frame = ptr::null_mut();
#[allow(invalid_value)] #[allow(invalid_value)]
let mut info = mem::MaybeUninit::uninit().assume_init(); let mut info = mem::MaybeUninit::uninit().assume_init();
@@ -681,6 +689,9 @@ impl Capturer {
} }
fn unmap(&self) { fn unmap(&self) {
if self.duplication.0.is_null() {
return;
}
unsafe { unsafe {
(*self.duplication.0).ReleaseFrame(); (*self.duplication.0).ReleaseFrame();
if self.fastlane { if self.fastlane {