lifegpc/msg-tool
1
0
Fork 0
mirror of https://github.com/lifegpc/msg-tool.git synced 2026-07-08 01:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable useless WC_ERR_INVALID_CHARS CHECK

Browse Source
This commit is contained in:
lifegpc
2025-08-14 17:32:07 +08:00
parent 3820dbb194
commit c25bd62ff1
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/encoding_win.rs
View File

@@ -1,7 +1,6 @@
use windows_sys::Win32::Foundation::{ERROR_NO_UNICODE_TRANSLATION, GetLastError}; use windows_sys::Win32::Foundation::{ERROR_NO_UNICODE_TRANSLATION, GetLastError};
use windows_sys::Win32::Globalization::{ use windows_sys::Win32::Globalization::{
CP_UTF7, CP_UTF8, MB_ERR_INVALID_CHARS, MultiByteToWideChar, WC_ERR_INVALID_CHARS, CP_UTF7, CP_UTF8, MB_ERR_INVALID_CHARS, MultiByteToWideChar, WideCharToMultiByte,
WideCharToMultiByte,
}; };
use windows_sys::Win32::System::Diagnostics::Debug::{ use windows_sys::Win32::System::Diagnostics::Debug::{
FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_IGNORE_INSERTS, FormatMessageW, FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_IGNORE_INSERTS, FormatMessageW,
@@ -100,16 +99,11 @@ pub fn encode_string(cp: u32, data: &str, check: bool) -> Result<Vec<u8>, WinErr
if data.is_empty() { if data.is_empty() {
return Ok(Vec::new()); return Ok(Vec::new());
} }
let dwflags = if check && cp == 65001 {
WC_ERR_INVALID_CHARS
} else {
0
};
let wstr = data.encode_utf16().collect::<Vec<u16>>(); let wstr = data.encode_utf16().collect::<Vec<u16>>();
let needed_len = unsafe { let needed_len = unsafe {
WideCharToMultiByte( WideCharToMultiByte(
cp, cp,
dwflags, 0,
wstr.as_ptr(), wstr.as_ptr(),
wstr.len() as i32, wstr.len() as i32,
std::ptr::null_mut(), std::ptr::null_mut(),
@@ -127,7 +121,7 @@ pub fn encode_string(cp: u32, data: &str, check: bool) -> Result<Vec<u8>, WinErr
let result = unsafe { let result = unsafe {
WideCharToMultiByte( WideCharToMultiByte(
cp, cp,
dwflags, 0,
wstr.as_ptr(), wstr.as_ptr(),
wstr.len() as i32, wstr.len() as i32,
mb.as_mut_ptr(), mb.as_mut_ptr(),