Add options to wchar / char convert

This commit is contained in:
2025-04-21 21:18:26 +08:00
parent 252c20d068
commit b0bd9db0ae
2 changed files with 7 additions and 6 deletions

View File

@@ -72,8 +72,8 @@ unsigned long wchar_util::getWideCharToMultiByteOptions(const unsigned long ori_
return ori_options;
}
bool wchar_util::str_to_wstr(std::wstring& out, std::string inp, unsigned int cp) {
DWORD opt = getMultiByteToWideCharOptions(MB_ERR_INVALID_CHARS, cp);
bool wchar_util::str_to_wstr(std::wstring& out, std::string inp, unsigned int cp, unsigned long options) {
DWORD opt = getMultiByteToWideCharOptions(options, cp);
int wlen = MultiByteToWideChar(cp, opt, inp.c_str(), inp.length(), nullptr, 0);
if (!wlen) {
return false;
@@ -91,8 +91,8 @@ bool wchar_util::str_to_wstr(std::wstring& out, std::string inp, unsigned int cp
return true;
}
bool wchar_util::wstr_to_str(std::string& out, std::wstring inp, unsigned int cp) {
DWORD opt = getWideCharToMultiByteOptions(WC_ERR_INVALID_CHARS, cp);
bool wchar_util::wstr_to_str(std::string& out, std::wstring inp, unsigned int cp, unsigned long options) {
DWORD opt = getWideCharToMultiByteOptions(options, cp);
int len = WideCharToMultiByte(cp, opt, inp.c_str(), inp.length(), nullptr, 0, nullptr, nullptr);
if (!len) {
return false;

View File

@@ -1,6 +1,7 @@
#ifndef _UTIL_WCHAR_UTIL_H
#define _UTIL_WCHAR_UTIL_H
#include<string>
#include <Windows.h>
namespace wchar_util {
#if _WIN32
@@ -25,7 +26,7 @@ namespace wchar_util {
* @param cp Code page of input string
* @returns true if successed
*/
bool str_to_wstr(std::wstring& out, std::string inp, unsigned int cp);
bool str_to_wstr(std::wstring& out, std::string inp, unsigned int cp, unsigned long options = MB_ERR_INVALID_CHARS);
/**
* @brief Convert wstring to string
* @param out Output string
@@ -33,7 +34,7 @@ namespace wchar_util {
* @param cp Code page of output string
* @returns true if successed
*/
bool wstr_to_str(std::string& out, std::wstring inp, unsigned int cp);
bool wstr_to_str(std::string& out, std::wstring inp, unsigned int cp, unsigned long options = WC_ERR_INVALID_CHARS);
/**
* @brief Get unicode version argv by using win api
* @param argv Result argv (need free memory by calling freeArgv.