konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win,debug

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-03-07 20:29:44 +08:00
parent ea44eb5380
commit 4f60dc9522
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/flutter-nightly.yml vendored
View File

@ -86,7 +86,7 @@ jobs:
shell: bash shell: bash
- name: Build rustdesk - name: Build rustdesk
run: python3 .\build.py --portable --hwcodec --flutter --idd-driver run: python3 .\build.py --portable --hwcodec --flutter --feature IddDriver
- name: Sign rustdesk files - name: Sign rustdesk files
uses: GermanBluefox/code-sign-action@v7 uses: GermanBluefox/code-sign-action@v7

6
build.py
View File

@ -106,12 +106,6 @@ def make_parser():
action='store_true', action='store_true',
help='Skip cargo build process, only flutter version + Linux supported currently' help='Skip cargo build process, only flutter version + Linux supported currently'
) )
if windows:
parser.add_argument(
'--idd-driver',
action='store_true',
help='Build idd driver for virtual display.'
)
return parser return parser

10
src/platform/windows.rs
View File

@ -1908,7 +1908,7 @@ pub fn user_accessible_folder() -> ResultType<PathBuf> {
} }
mod cert { mod cert {
use hbb_common::{bail, log, ResultType}; use hbb_common::{allow_err, bail, log, ResultType};
use std::{path::Path, str::from_utf8}; use std::{path::Path, str::from_utf8};
use winapi::shared::{ use winapi::shared::{
minwindef::{BYTE, DWORD, TRUE}, minwindef::{BYTE, DWORD, TRUE},
@ -1946,7 +1946,7 @@ mod cert {
&mut size, &mut size,
) == TRUE ) == TRUE
{ {
(thumbprint.to_vec(), hex::encode(thumbprint)) (thumbprint.to_vec(), hex::encode(thumbprint).to_ascii_uppercase())
} else { } else {
(thumbprint.to_vec(), "".to_owned()) (thumbprint.to_vec(), "".to_owned())
} }
@ -1988,7 +1988,7 @@ mod cert {
log::debug!("Thumbprint of cert {}", &thumbprint.1); log::debug!("Thumbprint of cert {}", &thumbprint.1);
let reg_cert_key = open_reg_cert_store()?; let reg_cert_key = open_reg_cert_store()?;
let (cert_key, _) = reg_cert_key.create_subkey(&thumbprint.1.to_ascii_uppercase())?; let (cert_key, _) = reg_cert_key.create_subkey(&thumbprint.1)?;
let data = winreg::RegValue { let data = winreg::RegValue {
vtype: REG_BINARY, vtype: REG_BINARY,
bytes: create_cert_blob(thumbprint.0, cert_bytes), bytes: create_cert_blob(thumbprint.0, cert_bytes),
@ -2021,7 +2021,7 @@ mod cert {
buf.len() as _, buf.len() as _,
); );
if cb_size != 1 { if cb_size != 1 {
if let Ok(issuer) = from_utf8(&buf) { if let Ok(issuer) = from_utf8(&buf[..cb_size as _]) {
for iss in issuers_to_rm.iter() { for iss in issuers_to_rm.iter() {
if issuer.contains(iss) { if issuer.contains(iss) {
let (_, thumbprint) = compute_thumbprint( let (_, thumbprint) = compute_thumbprint(
@ -2047,7 +2047,7 @@ mod cert {
let thumbprints = get_thumbprints_to_rm()?; let thumbprints = get_thumbprints_to_rm()?;
let reg_cert_key = unsafe { open_reg_cert_store()? }; let reg_cert_key = unsafe { open_reg_cert_store()? };
for thumbprint in thumbprints.iter() { for thumbprint in thumbprints.iter() {
reg_cert_key.delete_subkey(&hex::encode(thumbprint)).ok(); allow_err!(reg_cert_key.delete_subkey(thumbprint));
} }
Ok(()) Ok(())
} }