Use VERBOSE_LOG for more common calls

This commit is contained in:
Luke Street 2025-10-08 18:12:50 -06:00
parent 2ffc56f5c2
commit 15ea650fd5
2 changed files with 9 additions and 8 deletions

View File

@ -17,13 +17,13 @@ void setLastErrorFromErrno() { wibo::lastError = wibo::winErrorFromErrno(errno);
DWORD WIN_FUNC GetLastError() { DWORD WIN_FUNC GetLastError() {
HOST_CONTEXT_GUARD(); HOST_CONTEXT_GUARD();
DEBUG_LOG("GetLastError() -> %u\n", wibo::lastError); VERBOSE_LOG("GetLastError() -> %u\n", wibo::lastError);
return wibo::lastError; return wibo::lastError;
} }
void WIN_FUNC SetLastError(DWORD dwErrCode) { void WIN_FUNC SetLastError(DWORD dwErrCode) {
HOST_CONTEXT_GUARD(); HOST_CONTEXT_GUARD();
DEBUG_LOG("SetLastError(%u)\n", dwErrCode); VERBOSE_LOG("SetLastError(%u)\n", dwErrCode);
wibo::lastError = dwErrCode; wibo::lastError = dwErrCode;
} }

View File

@ -1,5 +1,6 @@
#include "stringapiset.h" #include "stringapiset.h"
#include "common.h"
#include "context.h" #include "context.h"
#include "errors.h" #include "errors.h"
#include "strutil.h" #include "strutil.h"
@ -14,8 +15,8 @@ namespace kernel32 {
int WIN_FUNC WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWCH lpWideCharStr, int cchWideChar, int WIN_FUNC WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWCH lpWideCharStr, int cchWideChar,
LPSTR lpMultiByteStr, int cbMultiByte, LPCCH lpDefaultChar, LPBOOL lpUsedDefaultChar) { LPSTR lpMultiByteStr, int cbMultiByte, LPCCH lpDefaultChar, LPBOOL lpUsedDefaultChar) {
HOST_CONTEXT_GUARD(); HOST_CONTEXT_GUARD();
DEBUG_LOG("WideCharToMultiByte(%u, %u, %p, %d, %p, %d, %p, %p)\n", CodePage, dwFlags, lpWideCharStr, cchWideChar, VERBOSE_LOG("WideCharToMultiByte(%u, %u, %p, %d, %p, %d, %p, %p)\n", CodePage, dwFlags, lpWideCharStr, cchWideChar,
lpMultiByteStr, cbMultiByte, lpDefaultChar, lpUsedDefaultChar); lpMultiByteStr, cbMultiByte, lpDefaultChar, lpUsedDefaultChar);
(void)CodePage; (void)CodePage;
(void)dwFlags; (void)dwFlags;
@ -37,7 +38,7 @@ int WIN_FUNC WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWCH lpWideChar
if (wibo::debugEnabled) { if (wibo::debugEnabled) {
std::string s(lpMultiByteStr, lpMultiByteStr + cchWideChar); std::string s(lpMultiByteStr, lpMultiByteStr + cchWideChar);
DEBUG_LOG("Converted string: [%s] (len %d)\n", s.c_str(), cchWideChar); VERBOSE_LOG("Converted string: [%s] (len %d)\n", s.c_str(), cchWideChar);
} }
return cchWideChar; return cchWideChar;
@ -46,7 +47,7 @@ int WIN_FUNC WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWCH lpWideChar
int WIN_FUNC MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCCH lpMultiByteStr, int cbMultiByte, int WIN_FUNC MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCCH lpMultiByteStr, int cbMultiByte,
LPWSTR lpWideCharStr, int cchWideChar) { LPWSTR lpWideCharStr, int cchWideChar) {
HOST_CONTEXT_GUARD(); HOST_CONTEXT_GUARD();
DEBUG_LOG("MultiByteToWideChar(%u, %u, %d, %d)\n", CodePage, dwFlags, cbMultiByte, cchWideChar); VERBOSE_LOG("MultiByteToWideChar(%u, %u, %d, %d)\n", CodePage, dwFlags, cbMultiByte, cchWideChar);
(void)CodePage; (void)CodePage;
(void)dwFlags; (void)dwFlags;
@ -60,7 +61,7 @@ int WIN_FUNC MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCCH lpMultiByte
} }
if (wibo::debugEnabled) { if (wibo::debugEnabled) {
std::string s(lpMultiByteStr, lpMultiByteStr + cbMultiByte); std::string s(lpMultiByteStr, lpMultiByteStr + cbMultiByte);
DEBUG_LOG("Converting string: [%s] (len %d)\n", s.c_str(), cbMultiByte); VERBOSE_LOG("Converting string: [%s] (len %d)\n", s.c_str(), cbMultiByte);
} }
assert(cbMultiByte <= cchWideChar); assert(cbMultiByte <= cchWideChar);