Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

misc. string fixes

Browse Source 
convert remaining %s to %hs or %ls
use WPRINTF_ARGS on unicode printf functions
fix: __func__ can't be widened via preprocessor (-> revert to char*)
convert remaining external_[directory|file_string to string()
Util: don't mix fwprintf and fprintf
Formation: fix dangling pointer (storing result of c_str())

This was SVN commit r7164.
This commit is contained in:
janwas 2009-11-04 15:29:28 +00:00
parent e29d5a779f
commit 77d2c67ada
39 changed files with 130 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/collada/CommonConvert.cpp
View File

@ -79,9 +79,9 @@ void FColladaErrorHandler::OnError(FUError::Level errorLevel, uint32 errorCode,
errorString = "Unknown error code"; errorString = "Unknown error code";
if (errorLevel == FUError::DEBUG_LEVEL) if (errorLevel == FUError::DEBUG_LEVEL)
Log(LOG_INFO, "FCollada message %d: %s", errorCode, errorString); Log(LOG_INFO, "FCollada message %d: %hs", errorCode, errorString);
else if (errorLevel == FUError::WARNING_LEVEL) else if (errorLevel == FUError::WARNING_LEVEL)
Log(LOG_WARNING, "FCollada warning %d: %s", errorCode, errorString); Log(LOG_WARNING, "FCollada warning %d: %hs", errorCode, errorString);
else else
throw ColladaException(errorString); throw ColladaException(errorString);
} }
@ -97,7 +97,7 @@ void FColladaDocument::LoadFromText(const char *text)
size_t newTextSize = 0; size_t newTextSize = 0;
FixBrokenXML(text, &newText, &newTextSize); FixBrokenXML(text, &newText, &newTextSize);
// Log(LOG_INFO, "%s", newText); // Log(LOG_INFO, "%hs", newText);
bool status = FCollada::LoadDocumentFromMemory("unknown.dae", document.get(), (void*)newText, newTextSize); bool status = FCollada::LoadDocumentFromMemory("unknown.dae", document.get(), (void*)newText, newTextSize);
if (newText != text) if (newText != text)
@ -143,7 +143,7 @@ CommonConvert::CommonConvert(const char* text, std::string& xmlErrors)
throw ColladaException("Couldn't find object to convert"); throw ColladaException("Couldn't find object to convert");
assert(m_Instance); assert(m_Instance);
Log(LOG_INFO, "Converting '%s'", m_Instance->GetEntity()->GetName().c_str()); Log(LOG_INFO, "Converting '%hs'", m_Instance->GetEntity()->GetName().c_str());
m_IsXSI = false; m_IsXSI = false;
FCDAsset* asset = m_Doc.GetDocument()->GetAsset(); FCDAsset* asset = m_Doc.GetDocument()->GetAsset();
@ -254,7 +254,7 @@ static void FindInstances(FCDSceneNode* node, std::vector<FoundInstance>& instan
f.transform = transform * node->ToMatrix(); f.transform = transform * node->ToMatrix();
f.instance = node->GetInstance(i); f.instance = node->GetInstance(i);
instances.push_back(f); instances.push_back(f);
Log(LOG_INFO, "Found convertible object '%s'", node->GetName().c_str()); Log(LOG_INFO, "Found convertible object '%hs'", node->GetName().c_str());
} }
} }

12
source/collada/DLL.cpp
View File

@ -27,7 +27,7 @@
void default_logger(int severity, const char* message) void default_logger(int severity, const char* message)
{ {
fprintf(stderr, "[%d] %s\n", severity, message); fprintf(stderr, "[%d] %hs\n", severity, message);
} }
static LogFn g_Logger = &default_logger; static LogFn g_Logger = &default_logger;
@ -111,9 +111,9 @@ int convert_dae_to_whatever(const char* dae, OutputFn writer, void* cb_data, voi
catch (const ColladaException& e) catch (const ColladaException& e)
{ {
if (! xmlErrors.empty()) if (! xmlErrors.empty())
Log(LOG_ERROR, "%s", xmlErrors.c_str()); Log(LOG_ERROR, "%hs", xmlErrors.c_str());
Log(LOG_ERROR, "%s", e.what()); Log(LOG_ERROR, "%hs", e.what());
FCollada::Release(); FCollada::Release();
@ -124,7 +124,7 @@ int convert_dae_to_whatever(const char* dae, OutputFn writer, void* cb_data, voi
if (! xmlErrors.empty()) if (! xmlErrors.empty())
{ {
Log(LOG_ERROR, "%s", xmlErrors.c_str()); Log(LOG_ERROR, "%hs", xmlErrors.c_str());
return -1; return -1;
} }
@ -152,9 +152,9 @@ EXPORT int set_skeleton_definitions(const char* xml, int length)
catch (const ColladaException& e) catch (const ColladaException& e)
{ {
if (! xmlErrors.empty()) if (! xmlErrors.empty())
Log(LOG_ERROR, "%s", xmlErrors.c_str()); Log(LOG_ERROR, "%hs", xmlErrors.c_str());
Log(LOG_ERROR, "%s", e.what()); Log(LOG_ERROR, "%hs", e.what());
return -1; return -1;
} }

10
source/collada/PMDConvert.cpp
View File

@ -152,9 +152,9 @@ public:
Log(LOG_WARNING, "Mismatched bone counts (skin has %d, skeleton has %d)", Log(LOG_WARNING, "Mismatched bone counts (skin has %d, skeleton has %d)",
skin->GetJointCount(), controllerInstance.GetJointCount()); skin->GetJointCount(), controllerInstance.GetJointCount());
for (size_t i = 0; i < skin->GetJointCount(); ++i) for (size_t i = 0; i < skin->GetJointCount(); ++i)
Log(LOG_INFO, "Skin joint %d: %s", i, skin->GetJoint(i)->GetId().c_str()); Log(LOG_INFO, "Skin joint %d: %hs", i, skin->GetJoint(i)->GetId().c_str());
for (size_t i = 0; i < controllerInstance.GetJointCount(); ++i) for (size_t i = 0; i < controllerInstance.GetJointCount(); ++i)
Log(LOG_INFO, "Skeleton joint %d: %s", i, controllerInstance.GetJoint(i)->GetName().c_str()); Log(LOG_INFO, "Skeleton joint %d: %hs", i, controllerInstance.GetJoint(i)->GetName().c_str());
} }
// Get the skinned mesh for this entity // Get the skinned mesh for this entity
@ -212,7 +212,7 @@ public:
{ {
// The relevant joint does exist, but it's not a recognised // The relevant joint does exist, but it's not a recognised
// bone in our chosen skeleton structure // bone in our chosen skeleton structure
Log(LOG_ERROR, "Vertex influenced by unrecognised bone '%s'", joint->GetName().c_str()); Log(LOG_ERROR, "Vertex influenced by unrecognised bone '%hs'", joint->GetName().c_str());
continue; continue;
} }
@ -287,7 +287,7 @@ public:
// Strip off the "prop-" from the name // Strip off the "prop-" from the name
std::string propPointName (child->GetName().substr(5)); std::string propPointName (child->GetName().substr(5));
Log(LOG_INFO, "Adding prop point %s", propPointName.c_str()); Log(LOG_INFO, "Adding prop point %hs", propPointName.c_str());
// Get translation and orientation of local transform // Get translation and orientation of local transform
@ -426,7 +426,7 @@ public:
{ {
uint32 nameLen = (uint32)propPoints[i].name.length(); uint32 nameLen = (uint32)propPoints[i].name.length();
write(output, nameLen); write(output, nameLen);
output((char*)propPoints[i].name.c_str(), nameLen); output(propPoints[i].name.c_str(), nameLen);
write(output, propPoints[i].translation); write(output, propPoints[i].translation);
write(output, propPoints[i].orientation); write(output, propPoints[i].orientation);
write(output, propPoints[i].bone); write(output, propPoints[i].bone);

2
source/collada/XMLFix.cpp
View File

@ -154,7 +154,7 @@ static bool processDocument(xmlNode* root)
if (! authoring_tool_text) return false; if (! authoring_tool_text) return false;
if (authoring_tool_text->type != XML_TEXT_NODE) return false; if (authoring_tool_text->type != XML_TEXT_NODE) return false;
xmlChar* toolname = authoring_tool_text->content; xmlChar* toolname = authoring_tool_text->content;
Log(LOG_INFO, "Authoring tool: %s", toolname); Log(LOG_INFO, "Authoring tool: %hs", toolname);
if (strcmp((const char*)toolname, "FBX COLLADA exporter") == 0) if (strcmp((const char*)toolname, "FBX COLLADA exporter") == 0)
return applyFBXFixes(root); return applyFBXFixes(root);
else else

2
source/gui/CGUI.h
View File

@ -303,7 +303,7 @@ private:
* *
* @param str Error message * @param str Error message
*/ */
void ReportParseError(const wchar_t* str, ...) PRINTF_ARGS(2); void ReportParseError(const wchar_t* str, ...) WPRINTF_ARGS(2);
/** /**
* You input the name of the object type, and let's * You input the name of the object type, and let's

2
source/gui/scripting/JSInterface_IGUIObject.cpp
View File

@ -587,7 +587,7 @@ JSBool JSI_IGUIObject::toString(JSContext* cx, JSObject* obj, uintN UNUSED(argc)
IGUIObject* e = (IGUIObject*)JS_GetPrivate( cx, obj ); IGUIObject* e = (IGUIObject*)JS_GetPrivate( cx, obj );
char buffer[256]; char buffer[256];
snprintf(buffer, 256, "[GUIObject: %s]", e->GetName().c_str()); snprintf(buffer, 256, "[GUIObject: %hs]", e->GetName().c_str());
buffer[255] = 0; buffer[255] = 0;
*rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buffer)); *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, buffer));
return JS_TRUE; return JS_TRUE;

20
source/lib/debug.cpp
View File

@ -294,7 +294,7 @@ private:
// split out of debug_DisplayError because it's used by the self-test. // split out of debug_DisplayError because it's used by the self-test.
const wchar_t* debug_BuildErrorMessage( const wchar_t* debug_BuildErrorMessage(
const wchar_t* description, const wchar_t* description,
const wchar_t* filename, int line, const wchar_t* func, const wchar_t* filename, int line, const char* func,
void* context, const wchar_t* lastFuncToSkip, void* context, const wchar_t* lastFuncToSkip,
ErrorMessageMem* emm) ErrorMessageMem* emm)
{ {
@ -308,7 +308,7 @@ const wchar_t* debug_BuildErrorMessage(
// header // header
if(!writer( if(!writer(
L"%ls\r\n" L"%ls\r\n"
L"Location: %ls:%d (%ls)\r\n" L"Location: %ls:%d (%hs)\r\n"
L"\r\n" L"\r\n"
L"Call stack:\r\n" L"Call stack:\r\n"
L"\r\n", L"\r\n",
@ -449,7 +449,7 @@ static ErrorReaction PerformErrorReaction(ErrorReaction er, size_t flags, u8* su
ErrorReaction debug_DisplayError(const wchar_t* description, ErrorReaction debug_DisplayError(const wchar_t* description,
size_t flags, void* context, const wchar_t* lastFuncToSkip, size_t flags, void* context, const wchar_t* lastFuncToSkip,
const wchar_t* pathname, int line, const wchar_t* func, const wchar_t* pathname, int line, const char* func,
u8* suppress) u8* suppress)
{ {
// "suppressing" this error means doing nothing and returning ER_CONTINUE. // "suppressing" this error means doing nothing and returning ER_CONTINUE.
@ -469,7 +469,7 @@ ErrorReaction debug_DisplayError(const wchar_t* description,
if(line <= 0) if(line <= 0)
line = 0; line = 0;
if(!func || func[0] == '\0') if(!func || func[0] == '\0')
func = L"?"; func = "?";
// .. _FILE__ evaluates to the full path (albeit without drive letter) // .. _FILE__ evaluates to the full path (albeit without drive letter)
// which is rather long. we only display the base name for clarity. // which is rather long. we only display the base name for clarity.
const wchar_t* filename = path_name_only(pathname); const wchar_t* filename = path_name_only(pathname);
@ -523,12 +523,13 @@ static bool ShouldSkipThisError(LibError err)
return false; return false;
} }
ErrorReaction debug_OnError(LibError err, u8* suppress, const wchar_t* file, int line, const wchar_t* func) ErrorReaction debug_OnError(LibError err, u8* suppress, const wchar_t* file, int line, const char* func)
{ {
if(ShouldSkipThisError(err)) if(ShouldSkipThisError(err))
return ER_CONTINUE; return ER_CONTINUE;
void* context = 0; const wchar_t* lastFuncToSkip = __wfunc__; void* context = 0;
const wchar_t* lastFuncToSkip = L"debug_OnError";
wchar_t buf[400]; wchar_t buf[400];
wchar_t err_buf[200]; error_description_r(err, err_buf, ARRAY_SIZE(err_buf)); wchar_t err_buf[200]; error_description_r(err, err_buf, ARRAY_SIZE(err_buf));
swprintf_s(buf, ARRAY_SIZE(buf), L"Function call failed: return value was %d (%ls)", err, err_buf); swprintf_s(buf, ARRAY_SIZE(buf), L"Function call failed: return value was %d (%ls)", err, err_buf);
@ -549,12 +550,13 @@ static bool ShouldSkipThisAssertion()
return ShouldSkipThisError(ERR::ASSERTION_FAILED); return ShouldSkipThisError(ERR::ASSERTION_FAILED);
} }
ErrorReaction debug_OnAssertionFailure(const wchar_t* expr, u8* suppress, const wchar_t* file, int line, const wchar_t* func) ErrorReaction debug_OnAssertionFailure(const wchar_t* expr, u8* suppress, const wchar_t* file, int line, const char* func)
{ {
if(ShouldSkipThisAssertion()) if(ShouldSkipThisAssertion())
return ER_CONTINUE; return ER_CONTINUE;
void* context = 0; const wchar_t* lastFuncToSkip = __wfunc__; void* context = 0;
const std::wstring lastFuncToSkip = L"debug_OnAssertionFailure";
wchar_t buf[400]; wchar_t buf[400];
swprintf_s(buf, ARRAY_SIZE(buf), L"Assertion failed: \"%ls\"", expr); swprintf_s(buf, ARRAY_SIZE(buf), L"Assertion failed: \"%ls\"", expr);
return debug_DisplayError(buf, DE_MANUAL_BREAK, context, lastFuncToSkip, file,line,func, suppress); return debug_DisplayError(buf, DE_MANUAL_BREAK, context, lastFuncToSkip.c_str(), file,line,func, suppress);
} }

21
source/lib/debug.h
View File

@ -48,7 +48,8 @@ extern void debug_break();
#define WIDEN2(x) L ## x #define WIDEN2(x) L ## x
#define WIDEN(x) WIDEN2(x) #define WIDEN(x) WIDEN2(x)
#define __WFILE__ WIDEN(__FILE__) #define __WFILE__ WIDEN(__FILE__)
#define __wfunc__ WIDEN(__func__) // note: C99 says __func__ is a magic *variable*, and GCC doesn't allow
// widening it via preprocessor.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -155,7 +156,7 @@ enum ErrorReaction
* @param flags: see DebugDisplayErrorFlags. * @param flags: see DebugDisplayErrorFlags.
* @param context, lastFuncToSkip: see debug_DumpStack. * @param context, lastFuncToSkip: see debug_DumpStack.
* @param file, line, func: location of the error (typically passed as * @param file, line, func: location of the error (typically passed as
* __WFILE__, __LINE__, __wfunc__ from a macro) * __WFILE__, __LINE__, __func__ from a macro)
* @param suppress pointer to a caller-allocated flag that can be used to * @param suppress pointer to a caller-allocated flag that can be used to
* suppress this error. if NULL, this functionality is skipped and the * suppress this error. if NULL, this functionality is skipped and the
* "Suppress" dialog button will be disabled. * "Suppress" dialog button will be disabled.
@ -163,13 +164,13 @@ enum ErrorReaction
* provides the storage. values: see DEBUG_SUPPRESS above. * provides the storage. values: see DEBUG_SUPPRESS above.
* @return ErrorReaction (user's choice: continue running or stop?) * @return ErrorReaction (user's choice: continue running or stop?)
**/ **/
LIB_API ErrorReaction debug_DisplayError(const wchar_t* description, size_t flags, void* context, const wchar_t* lastFuncToSkip, const wchar_t* file, int line, const wchar_t* func, u8* suppress); LIB_API ErrorReaction debug_DisplayError(const wchar_t* description, size_t flags, void* context, const wchar_t* lastFuncToSkip, const wchar_t* file, int line, const char* func, u8* suppress);
/** /**
* convenience version, in case the advanced parameters aren't needed. * convenience version, in case the advanced parameters aren't needed.
* macro instead of providing overload/default values for C compatibility. * macro instead of providing overload/default values for C compatibility.
**/ **/
#define DEBUG_DISPLAY_ERROR(text) debug_DisplayError(text, 0, 0, L"debug_DisplayError", __WFILE__,__LINE__,__wfunc__, 0) #define DEBUG_DISPLAY_ERROR(text) debug_DisplayError(text, 0, 0, L"debug_DisplayError", __WFILE__,__LINE__,__func__, 0)
// //
@ -269,7 +270,7 @@ STMT(\
static u8 suppress__;\ static u8 suppress__;\
if(!(expr))\ if(!(expr))\
{\ {\
switch(debug_OnAssertionFailure(WIDEN(#expr), &suppress__, __WFILE__, __LINE__, __wfunc__))\ switch(debug_OnAssertionFailure(WIDEN(#expr), &suppress__, __WFILE__, __LINE__, __func__))\
{\ {\
case ER_BREAK:\ case ER_BREAK:\
debug_break();\ debug_break();\
@ -293,7 +294,7 @@ STMT(\
#define debug_warn(expr) \ #define debug_warn(expr) \
STMT(\ STMT(\
static u8 suppress__;\ static u8 suppress__;\
switch(debug_OnAssertionFailure(expr, &suppress__, __WFILE__, __LINE__, __wfunc__))\ switch(debug_OnAssertionFailure(expr, &suppress__, __WFILE__, __LINE__, __func__))\
{\ {\
case ER_BREAK:\ case ER_BREAK:\
debug_break();\ debug_break();\
@ -312,7 +313,7 @@ STMT(\
#define DEBUG_WARN_ERR(err)\ #define DEBUG_WARN_ERR(err)\
STMT(\ STMT(\
static u8 suppress__;\ static u8 suppress__;\
switch(debug_OnError(err, &suppress__, __WFILE__, __LINE__, __wfunc__))\ switch(debug_OnError(err, &suppress__, __WFILE__, __LINE__, __func__))\
{\ {\
case ER_BREAK:\ case ER_BREAK:\
debug_break();\ debug_break();\
@ -334,7 +335,7 @@ STMT(\
* @param func name of the function containing it * @param func name of the function containing it
* @return ErrorReaction (user's choice: continue running or stop?) * @return ErrorReaction (user's choice: continue running or stop?)
**/ **/
LIB_API ErrorReaction debug_OnAssertionFailure(const wchar_t* assert_expr, u8* suppress, const wchar_t* file, int line, const wchar_t* func); LIB_API ErrorReaction debug_OnAssertionFailure(const wchar_t* assert_expr, u8* suppress, const wchar_t* file, int line, const char* func);
/** /**
* called when a DEBUG_WARN_ERR indicates an error occurred; * called when a DEBUG_WARN_ERR indicates an error occurred;
@ -346,7 +347,7 @@ LIB_API ErrorReaction debug_OnAssertionFailure(const wchar_t* assert_expr, u8* s
* @param func name of the function containing it * @param func name of the function containing it
* @return ErrorReaction (user's choice: continue running or stop?) * @return ErrorReaction (user's choice: continue running or stop?)
**/ **/
LIB_API ErrorReaction debug_OnError(LibError err, u8* suppress, const wchar_t* file, int line, const wchar_t* func); LIB_API ErrorReaction debug_OnError(LibError err, u8* suppress, const wchar_t* file, int line, const char* func);
/** /**
@ -540,6 +541,6 @@ LIB_API void debug_FreeErrorMessage(ErrorMessageMem* emm);
* fallback in case heap alloc fails. should be freed via * fallback in case heap alloc fails. should be freed via
* debug_FreeErrorMessage when no longer needed. * debug_FreeErrorMessage when no longer needed.
**/ **/
LIB_API const wchar_t* debug_BuildErrorMessage(const wchar_t* description, const wchar_t* fn_only, int line, const wchar_t* func, void* context, const wchar_t* lastFuncToSkip, ErrorMessageMem* emm); LIB_API const wchar_t* debug_BuildErrorMessage(const wchar_t* description, const wchar_t* fn_only, int line, const char* func, void* context, const wchar_t* lastFuncToSkip, ErrorMessageMem* emm);
#endif // #ifndef INCLUDED_DEBUG #endif // #ifndef INCLUDED_DEBUG

2
source/lib/file/vfs/vfs_lookup.cpp
View File

@ -70,7 +70,7 @@ LibError vfs_Lookup(const VfsPath& pathname, VfsDirectory* startDirectory, VfsDi
currentPath /= subdirectoryName; currentPath /= subdirectoryName;
fs::path currentPath_c = path_from_wpath(currentPath); fs::path currentPath_c = path_from_wpath(currentPath);
const int ret = mkdir(currentPath_c.external_directory_string().c_str(), S_IRWXU); const int ret = mkdir(currentPath_c.string().c_str(), S_IRWXU);
if(ret == 0) if(ret == 0)
{ {
PRealDirectory realDirectory(new RealDirectory(currentPath, 0, 0)); PRealDirectory realDirectory(new RealDirectory(currentPath, 0, 0));

2
source/lib/res/graphics/cursor.cpp
View File

@ -266,7 +266,7 @@ static LibError Cursor_to_string(const Cursor* c, char* buf)
break; break;
} }
snprintf(buf, H_STRING_LEN, "cursor (%s)", type); snprintf(buf, H_STRING_LEN, "cursor (%hs)", type);
return INFO::OK; return INFO::OK;
} }

12
source/lib/res/sound/snd_mgr.cpp
View File

@ -107,11 +107,11 @@ static LibError list_free_all();
static void hsd_list_free_all(); static void hsd_list_free_all();
static void al_ReportError(ALenum err, const wchar_t* caller, int line) static void al_ReportError(ALenum err, const char* caller, int line)
{ {
debug_assert(al_initialized); debug_assert(al_initialized);
debug_printf(L"OpenAL error: %hs; called from %ls (line %d)\n", alGetString(err), caller, line); debug_printf(L"OpenAL error: %hs; called from %hs (line %d)\n", alGetString(err), caller, line);
debug_assert(0); debug_assert(0);
} }
@ -123,7 +123,7 @@ static void al_ReportError(ALenum err, const wchar_t* caller, int line)
* @param line line number of the call site (typically passed via __LINE__) * @param line line number of the call site (typically passed via __LINE__)
* (identifies the exact call site since there may be several per caller) * (identifies the exact call site since there may be several per caller)
*/ */
static void al_check(const wchar_t* caller, int line) static void al_check(const char* caller, int line)
{ {
ALenum err = alGetError(); ALenum err = alGetError();
if(err != AL_NO_ERROR) if(err != AL_NO_ERROR)
@ -131,7 +131,7 @@ static void al_check(const wchar_t* caller, int line)
} }
// convenience version that automatically passes in function name. // convenience version that automatically passes in function name.
#define AL_CHECK al_check(__wfunc__, __LINE__) #define AL_CHECK al_check(__func__, __LINE__)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -841,7 +841,7 @@ static LibError SndData_validate(const SndData * sd)
static LibError SndData_to_string(const SndData* sd, char* buf) static LibError SndData_to_string(const SndData* sd, char* buf)
{ {
const char* type = "clip"; const char* type = "clip";
snprintf(buf, H_STRING_LEN, "%s; al_buf=%d", type, sd->al_buf); snprintf(buf, H_STRING_LEN, "%hs; al_buf=%d", type, sd->al_buf);
return INFO::OK; return INFO::OK;
} }
@ -1479,7 +1479,7 @@ static void vsrc_latch(VSrc* vs)
debug_printf(L" pitch: %f\n", vs->pitch); debug_printf(L" pitch: %f\n", vs->pitch);
debug_printf(L" loop: %d\n", (int)vs->loop); debug_printf(L" loop: %d\n", (int)vs->loop);
al_ReportError(err, __wfunc__, __LINE__); al_ReportError(err, __func__, __LINE__);
} }
} }

2
source/lib/sysdep/os/win/wdir_watch.cpp
View File

@ -173,7 +173,7 @@ public:
WinScopedPreserveLastError s; // CreateFile WinScopedPreserveLastError s; // CreateFile
const DWORD share = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; const DWORD share = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE;
const DWORD flags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED; const DWORD flags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED;
const std::wstring dirPath = m_path.external_directory_string(); const std::wstring dirPath = m_path.string();
m_hDir = CreateFileW(dirPath.c_str(), FILE_LIST_DIRECTORY, share, 0, OPEN_EXISTING, flags, 0); m_hDir = CreateFileW(dirPath.c_str(), FILE_LIST_DIRECTORY, share, 0, OPEN_EXISTING, flags, 0);
if(m_hDir == INVALID_HANDLE_VALUE) if(m_hDir == INVALID_HANDLE_VALUE)
throw std::runtime_error(""); throw std::runtime_error("");

2
source/lib/sysdep/os/win/wdll_ver.cpp
View File

@ -42,7 +42,7 @@ static LibError ReadVersionString(const fs::wpath& modulePathname_, wchar_t* out
WinScopedPreserveLastError s; // GetFileVersion*, Ver* WinScopedPreserveLastError s; // GetFileVersion*, Ver*
WinScopedDisableWow64Redirection noRedirect; WinScopedDisableWow64Redirection noRedirect;
const std::wstring modulePathname = modulePathname_.external_file_string(); const std::wstring modulePathname = modulePathname_.string();
// determine size of and allocate memory for version information. // determine size of and allocate memory for version information.
DWORD unused; DWORD unused;

2
source/lib/sysdep/os/win/wposix/wfilesystem.cpp
View File

@ -295,7 +295,7 @@ DIR* opendir(const char* path)
// information about that directory; trailing slashes aren't allowed. // information about that directory; trailing slashes aren't allowed.
// for dir entries to be returned, we have to append "\\*". // for dir entries to be returned, we have to append "\\*".
char search_path[PATH_MAX]; char search_path[PATH_MAX];
sprintf_s(search_path, ARRAY_SIZE(search_path), "%s\\*", path); sprintf_s(search_path, ARRAY_SIZE(search_path), "%hs\\*", path);
// note: we could store search_path and defer FindFirstFile until // note: we could store search_path and defer FindFirstFile until
// readdir. this way is a bit more complex but required for // readdir. this way is a bit more complex but required for

2
source/lib/sysdep/os/win/wposix/wutsname.cpp
View File

@ -39,7 +39,7 @@ int uname(struct utsname* un)
sprintf(un->release, "SP %d", sp); sprintf(un->release, "SP %d", sp);
// version // version
sprintf(un->version, "%s.%lu", wutil_WindowsVersionString(), vi.dwBuildNumber & 0xFFFF); sprintf(un->version, "%hs.%lu", wutil_WindowsVersionString(), vi.dwBuildNumber & 0xFFFF);
// node name // node name
DWORD buf_size = sizeof(un->nodename); DWORD buf_size = sizeof(un->nodename);

3
source/lib/sysdep/os/win/wseh.cpp
View File

@ -23,6 +23,7 @@
#include "wseh.h" #include "wseh.h"
#include "lib/byte_order.h" // FOURCC #include "lib/byte_order.h" // FOURCC
#include "lib/wchar.h"
#include "lib/sysdep/cpu.h" #include "lib/sysdep/cpu.h"
#include "win.h" #include "win.h"
#include "wutil.h" #include "wutil.h"
@ -280,7 +281,7 @@ long __stdcall wseh_ExceptionFilter(struct _EXCEPTION_POINTERS* ep)
if(ep->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) if(ep->ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE)
flags = DE_NO_CONTINUE; flags = DE_NO_CONTINUE;
const wchar_t* const lastFuncToSkip = WIDEN(STRINGIZE(DECORATED_NAME(wseh_ExceptionFilter))); const wchar_t* const lastFuncToSkip = WIDEN(STRINGIZE(DECORATED_NAME(wseh_ExceptionFilter)));
ErrorReaction er = debug_DisplayError(message, flags, ep->ContextRecord, lastFuncToSkip, file,line,func, 0); ErrorReaction er = debug_DisplayError(message, flags, ep->ContextRecord, lastFuncToSkip, file,line,string_from_wstring(func).c_str(), 0);
debug_assert(er == ER_CONTINUE); // nothing else possible debug_assert(er == ER_CONTINUE); // nothing else possible
// invoke the Win32 default handler - it calls ExitProcess for // invoke the Win32 default handler - it calls ExitProcess for

2
source/lib/sysdep/tests/test_sysdep.h
View File

@ -104,7 +104,7 @@ public:
if (! tmpdir) tmpdir = P_tmpdir; if (! tmpdir) tmpdir = P_tmpdir;
char root[PATH_MAX]; char root[PATH_MAX];
sprintf_s(root, PATH_MAX, "%s/pyrogenesis-test-sysdep-XXXXXX", tmpdir); sprintf_s(root, PATH_MAX, "%hs/pyrogenesis-test-sysdep-XXXXXX", tmpdir);
TS_ASSERT(mkdtemp(root)); TS_ASSERT(mkdtemp(root));
std::string rootstr(root); std::string rootstr(root);

4
source/network/NetClient.cpp
View File

@ -258,7 +258,7 @@ bool CNetClient::OnError( void* pContext, CFsmEvent* pEvent )
CErrorMessage* pMessage = ( CErrorMessage* )pEvent->GetParamRef(); CErrorMessage* pMessage = ( CErrorMessage* )pEvent->GetParamRef();
if ( pMessage ) if ( pMessage )
{ {
LOG( CLogger::Error, LOG_CATEGORY, L"CNetClient::OnError(): Error description %s", pMessage->m_Error ); LOG( CLogger::Error, LOG_CATEGORY, L"CNetClient::OnError(): Error description %hs", pMessage->m_Error );
if ( pClient->m_OnConnectComplete.Defined() ) if ( pClient->m_OnConnectComplete.Defined() )
{ {
@ -461,7 +461,7 @@ bool CNetClient::OnPreGame( void* pContext, CFsmEvent* pEvent )
break; break;
default: default:
LOG( CLogger::Warning, LOG_CATEGORY, L"Invalid slot assignment %s", pMessage->ToString().c_str() ); LOG( CLogger::Warning, LOG_CATEGORY, L"Invalid slot assignment %hs", pMessage->ToString().c_str() );
break; break;
} }
} }

2
source/network/NetLog.cpp
View File

@ -260,7 +260,7 @@ CNetLogFileSink::CNetLogFileSink( void )
// Make relative path // Make relative path
fs::wpath path(psLogDir()/L"net_log"); fs::wpath path(psLogDir()/L"net_log");
path /= CStrW(time)+L".txt"; path /= CStrW(time)+L".txt";
m_FileName = path.external_file_string(); m_FileName = path.string();
m_Append = true; m_Append = true;
} }

4
source/network/NetServer.cpp
View File

@ -413,7 +413,7 @@ bool CNetServer::OnError( void* pContext, CFsmEvent* pEvent )
else else
{ {
// Weird stuff... // Weird stuff...
LOG( CLogger::Warning, LOG_CATEGORY, L"NMT_ERROR: %s", pMessage->ToString().c_str() ); LOG( CLogger::Warning, LOG_CATEGORY, L"NMT_ERROR: %hs", pMessage->ToString().c_str() );
} }
} }
@ -1022,7 +1022,7 @@ void CNetServer::QueueIncomingCommand( CNetMessage* pMessage )
// Validate parameters // Validate parameters
if ( !pMessage ) return; if ( !pMessage ) return;
//LOG( NORMAL, LOG_CATEGORY, L"CNetServer::QueueIncomingCommand(): %s.", pMessage->ToString().c_str() ); //LOG( NORMAL, LOG_CATEGORY, L"CNetServer::QueueIncomingCommand(): %hs.", pMessage->ToString().c_str() );
QueueMessage( 2, pMessage ); QueueMessage( 2, pMessage );
} }

12
source/network/NetSession.cpp
View File

@ -159,7 +159,7 @@ bool CNetHost::Connect( const CStr& host, uint port )
if ( !SetupSession( pNewSession ) ) return false; if ( !SetupSession( pNewSession ) ) return false;
NET_LOG3( "Successfully connected to server %s:%d succeeded", host.c_str(), port ); NET_LOG3( "Successfully connected to server %hs:%d succeeded", host.c_str(), port );
// Successfully handled? // Successfully handled?
if ( !HandleConnect( pNewSession ) ) if ( !HandleConnect( pNewSession ) )
@ -177,7 +177,7 @@ bool CNetHost::Connect( const CStr& host, uint port )
return true; return true;
} }
NET_LOG3( "Connection to server %s:%d failed", host.c_str(), port ); NET_LOG3( "Connection to server %hs:%d failed", host.c_str(), port );
// 3 seconds are up or a host was disconnected // 3 seconds are up or a host was disconnected
enet_peer_reset( pPeer ); enet_peer_reset( pPeer );
@ -420,7 +420,7 @@ bool CNetHost::Poll( void )
CNetMessage* pNewMessage = CNetMessageFactory::CreateMessage( event.packet->data, event.packet->dataLength ); CNetMessage* pNewMessage = CNetMessageFactory::CreateMessage( event.packet->data, event.packet->dataLength );
if ( !pNewMessage ) return false; if ( !pNewMessage ) return false;
NET_LOG4( "Message %s of size %lu was received from %p", pNewMessage->ToString().c_str(), (unsigned long)pNewMessage->GetSerializedLength(), event.peer->data ); NET_LOG4( "Message %hs of size %lu was received from %p", pNewMessage->ToString().c_str(), (unsigned long)pNewMessage->GetSerializedLength(), event.peer->data );
// Successfully handled? // Successfully handled?
if ( !HandleMessageReceive( pNewMessage, it->pSession ) ) { if ( !HandleMessageReceive( pNewMessage, it->pSession ) ) {
@ -526,7 +526,7 @@ bool CNetHost::SendMessage(
} }
else else
{ {
NET_LOG4( "Message %s of size %lu was sent to %p", NET_LOG4( "Message %hs of size %lu was sent to %p",
pMessage->ToString().c_str(), (unsigned long)pMessage->GetSerializedLength(), pSession->m_Peer->data ); pMessage->ToString().c_str(), (unsigned long)pMessage->GetSerializedLength(), pSession->m_Peer->data );
} }
@ -866,7 +866,7 @@ bool CNetServerSession::BaseHandler(
else else
{ {
// Not disconnected? Weired... // Not disconnected? Weired...
LOG( WARNING, LOG_CATEGORY, L"CNetServerSession::BaseHandler() NMT_ERROR: %s", pErrMessage->ToString().c_str() ); LOG( WARNING, LOG_CATEGORY, L"CNetServerSession::BaseHandler() NMT_ERROR: %hs", pErrMessage->ToString().c_str() );
} }
delete pMessage; delete pMessage;
@ -892,7 +892,7 @@ bool CNetServerSession::HandshakeHandler(
CNetServerSession* pSrvSession = dynamic_cast< CNetServerSession* >( pSession ); CNetServerSession* pSrvSession = dynamic_cast< CNetServerSession* >( pSession );
if ( !pSrvSession ) return false; if ( !pSrvSession ) return false;
LOG( NORMAL, LOG_CATEGORY, L"CNetServerSession::HandshakeHandler() %s", pMessage->ToString().c_str() ); LOG( NORMAL, LOG_CATEGORY, L"CNetServerSession::HandshakeHandler() %hs", pMessage->ToString().c_str() );
// Call base handler if other message thant NMT_ClientHandshake // Call base handler if other message thant NMT_ClientHandshake
if ( pMessage->GetType() != NMT_ClientHandshake ) BaseHandler( pMessage, pSession ); if ( pMessage->GetType() != NMT_ClientHandshake ) BaseHandler( pMessage, pSession );

14
source/network/Network.cpp
View File

@ -139,7 +139,7 @@ CStr CCloseRequestMessage::ToString( void ) const
void CMessageSocket::Push(CNetMessage *msg) void CMessageSocket::Push(CNetMessage *msg)
{ {
NET_LOG2( "CMessageSocket::Push(): %s", msg->ToString().c_str() ); NET_LOG2( "CMessageSocket::Push(): %hs", msg->ToString().c_str() );
m_OutQ.Lock(); m_OutQ.Lock();
m_OutQ.push_back(msg); m_OutQ.push_back(msg);
@ -222,7 +222,7 @@ void CMessageSocket::StartWriteNextMessage()
PS_RESULT res=Write(m_pWrBuffer, hdr.m_MsgLength+HEADER_LENGTH); PS_RESULT res=Write(m_pWrBuffer, hdr.m_MsgLength+HEADER_LENGTH);
if (res != PS_OK) if (res != PS_OK)
{ {
NET_LOG2( "CMessageSocket::StartWriteNextMessage(): %s", res ); NET_LOG2( "CMessageSocket::StartWriteNextMessage(): %hs", res );
// Queue Error Message // Queue Error Message
m_InQ.Lock(); m_InQ.Lock();
@ -246,7 +246,7 @@ void CMessageSocket::StartWriteNextMessage()
void CMessageSocket::WriteComplete(PS_RESULT ec) void CMessageSocket::WriteComplete(PS_RESULT ec)
{ {
NET_LOG2( "CMessageSocket::WriteComplete(): %s", ec ); NET_LOG2( "CMessageSocket::WriteComplete(): %hs", ec );
if (ec == PS_OK) if (ec == PS_OK)
{ {
@ -285,7 +285,7 @@ void CMessageSocket::StartReadHeader()
PS_RESULT res=Read(m_pRdBuffer, HEADER_LENGTH); PS_RESULT res=Read(m_pRdBuffer, HEADER_LENGTH);
if (res != PS_OK) if (res != PS_OK)
{ {
NET_LOG2( "CMessageSocket::StartReadHeader(): %s", res ); NET_LOG2( "CMessageSocket::StartReadHeader(): %hs", res );
// Push an error message // Push an error message
CScopeLock scopeLock(m_InQ.m_Mutex); CScopeLock scopeLock(m_InQ.m_Mutex);
@ -319,7 +319,7 @@ void CMessageSocket::StartReadMessage()
PS_RESULT res=Read(m_pRdBuffer+HEADER_LENGTH, hdr.m_MsgLength); PS_RESULT res=Read(m_pRdBuffer+HEADER_LENGTH, hdr.m_MsgLength);
if (res != PS_OK) if (res != PS_OK)
{ {
NET_LOG2( "CMessageSocket::StartReadMessage(): %s", res ); NET_LOG2( "CMessageSocket::StartReadMessage(): %hs", res );
// Queue an error message // Queue an error message
CScopeLock scopeLock(m_InQ); CScopeLock scopeLock(m_InQ);
@ -330,7 +330,7 @@ void CMessageSocket::StartReadMessage()
void CMessageSocket::ReadComplete(PS_RESULT ec) void CMessageSocket::ReadComplete(PS_RESULT ec)
{ {
NET_LOG3( "CMessageSocket::ReadComplete(%s): %s", m_ReadingData ? "data":"header", ec ); NET_LOG3( "CMessageSocket::ReadComplete(%ls): %hs", m_ReadingData ? L"data":L"header", ec );
// Check if we were reading header or message // Check if we were reading header or message
// If header: // If header:
@ -368,7 +368,7 @@ void CMessageSocket::OnMessage(CNetMessage *pMsg)
{ {
m_InQ.Lock(); m_InQ.Lock();
m_InQ.push_back(pMsg); m_InQ.push_back(pMsg);
NET_LOG2( "CMessageSocket::OnMessage(): %s", pMsg->ToString().c_str() ); NET_LOG2( "CMessageSocket::OnMessage(): %hs", pMsg->ToString().c_str() );
NET_LOG2( "CMessageSocket::OnMessage(): Queue size now %lu", (unsigned long)m_InQ.size() ); NET_LOG2( "CMessageSocket::OnMessage(): Queue size now %lu", (unsigned long)m_InQ.size() );
m_InQ.Unlock(); m_InQ.Unlock();
} }

2
source/network/ServerSocket.cpp
View File

@ -37,7 +37,7 @@ void CServerSocket::OnRead()
{ {
// All errors are non-critical, so no need to do anything special besides // All errors are non-critical, so no need to do anything special besides
// not calling OnAccept [ shouldn't be, that is ;-) ] // not calling OnAccept [ shouldn't be, that is ;-) ]
NET_LOG2( "CServerSocket::OnRead(): PreAccept returned an error: %s", res ); NET_LOG2( "CServerSocket::OnRead(): PreAccept returned an error: %hs", res );
} }
} }

20
source/network/SocketBase.cpp
View File

@ -78,7 +78,7 @@ PS_RESULT GetPS_RESULT(int error)
default: default:
char buf[256]; char buf[256];
Network_GetErrorString(error, buf, sizeof(buf)); Network_GetErrorString(error, buf, sizeof(buf));
LOG(CLogger::Error, LOG_CATEGORY, L"SocketBase.cpp::GetPS_RESULT(): Unrecognized error %s[%d]", buf, error); LOG(CLogger::Error, LOG_CATEGORY, L"SocketBase.cpp::GetPS_RESULT(): Unrecognized error %hs[%d]", buf, error);
return PS_FAIL; return PS_FAIL;
} }
} }
@ -369,7 +369,7 @@ PS_RESULT CSocketBase::Read(void *buf, size_t len, size_t *bytesRead)
case ETIMEDOUT:*/ case ETIMEDOUT:*/
default: default:
Network_GetErrorString(error, errbuf, sizeof(errbuf)); Network_GetErrorString(error, errbuf, sizeof(errbuf));
NET_LOG3("Read error %s [%d]", errbuf, error); NET_LOG3("Read error %hs [%d]", errbuf, error);
m_State=SS_UNCONNECTED; m_State=SS_UNCONNECTED;
m_Error=GetPS_RESULT(error); m_Error=GetPS_RESULT(error);
return m_Error; return m_Error;
@ -420,7 +420,7 @@ PS_RESULT CSocketBase::Write(void *buf, size_t len, size_t *bytesWritten)
case EHOSTUNREACH:*/ case EHOSTUNREACH:*/
default: default:
Network_GetErrorString(err, errbuf, sizeof(errbuf)); Network_GetErrorString(err, errbuf, sizeof(errbuf));
NET_LOG3("Write error %s [%d]", errbuf, err); NET_LOG3("Write error %hs [%d]", errbuf, err);
m_State=SS_UNCONNECTED; m_State=SS_UNCONNECTED;
return CONNECTION_BROKEN; return CONNECTION_BROKEN;
} }
@ -491,7 +491,7 @@ PS_RESULT CSocketBase::Bind(const CSocketAddress &address)
break; break;
default: default:
Network_GetErrorString(err, errBuf, sizeof(errBuf)); Network_GetErrorString(err, errBuf, sizeof(errBuf));
LOG(CLogger::Error, LOG_CATEGORY, L"CServerSocket::Bind(): bind: %s [%d] => PS_FAIL", errBuf, err); LOG(CLogger::Error, LOG_CATEGORY, L"CServerSocket::Bind(): bind: %hs [%d] => PS_FAIL", errBuf, err);
} }
m_State=SS_UNCONNECTED; m_State=SS_UNCONNECTED;
m_Error=ret; m_Error=ret;
@ -503,7 +503,7 @@ PS_RESULT CSocketBase::Bind(const CSocketAddress &address)
{ {
int err=Network_LastError; int err=Network_LastError;
Network_GetErrorString(err, errBuf, sizeof(errBuf)); Network_GetErrorString(err, errBuf, sizeof(errBuf));
LOG(CLogger::Error, LOG_CATEGORY, L"CServerSocket::Bind(): listen: %s [%d] => PS_FAIL", errBuf, err); LOG(CLogger::Error, LOG_CATEGORY, L"CServerSocket::Bind(): listen: %hs [%d] => PS_FAIL", errBuf, err);
m_State=SS_UNCONNECTED; m_State=SS_UNCONNECTED;
return PS_FAIL; return PS_FAIL;
} }
@ -579,7 +579,7 @@ bool CSocketBase::ConnectError(CSocketBase *pSocket)
{ {
pSocket->m_State=SS_UNCONNECTED; pSocket->m_State=SS_UNCONNECTED;
PS_RESULT connErr=GetPS_RESULT(errno); PS_RESULT connErr=GetPS_RESULT(errno);
NET_LOG4("Connect error: %s [%d:%s]", connErr, errno, strerror(errno)); NET_LOG4("Connect error: %hs [%d:%hs]", connErr, errno, strerror(errno));
pSocket->m_Error=connErr; pSocket->m_Error=connErr;
return true; return true;
} }
@ -644,7 +644,7 @@ void CSocketBase::SocketReadable(CSocketBase *pSock)
// success, nRead != 0 means alive stream socket // success, nRead != 0 means alive stream socket
if (res == -1 && errno != EINVAL) if (res == -1 && errno != EINVAL)
{ {
NET_LOG3("RunWaitLoop:ioctl: Connection broken [%d:%s]", errno, strerror(errno)); NET_LOG3("RunWaitLoop:ioctl: Connection broken [%d:%hs]", errno, strerror(errno));
// Don't use API function - we both hold a lock and // Don't use API function - we both hold a lock and
// it is unnecessary to SendWaitLoopUpdate at this // it is unnecessary to SendWaitLoopUpdate at this
// stage // stage
@ -880,7 +880,7 @@ void CSocketBase::RunWaitLoop()
{ {
ret=GetLastError(); ret=GetLastError();
Network_GetErrorString(ret, (LPSTR)&errBuf, 256); Network_GetErrorString(ret, (LPSTR)&errBuf, 256);
NET_LOG3("RegisterClass: %s [%d]", errBuf, ret); NET_LOG3("RegisterClass: %hs [%d]", errBuf, ret);
return; return;
} }
@ -891,7 +891,7 @@ void CSocketBase::RunWaitLoop()
{ {
ret=GetLastError(); ret=GetLastError();
Network_GetErrorString(ret, errBuf, sizeof(errBuf)); Network_GetErrorString(ret, errBuf, sizeof(errBuf));
NET_LOG3("CreateWindowEx: %s [%d]", errBuf, ret); NET_LOG3("CreateWindowEx: %hs [%d]", errBuf, ret);
return; return;
} }
@ -915,7 +915,7 @@ void CSocketBase::RunWaitLoop()
{ {
ret=GetLastError(); ret=GetLastError();
Network_GetErrorString(ret, errBuf, sizeof(errBuf)); Network_GetErrorString(ret, errBuf, sizeof(errBuf));
NET_LOG3("GetMessage: %s [%d]", errBuf, ret); NET_LOG3("GetMessage: %hs [%d]", errBuf, ret);
} }
{ {
TranslateMessage(&msg); TranslateMessage(&msg);

8
source/network/StreamSocket.cpp
View File

@ -42,7 +42,7 @@ void *CStreamSocket_ConnectThread(void *data)
CSocketAddress addr; CSocketAddress addr;
res=CSocketAddress::Resolve(pSock->m_pConnectHost, pSock->m_ConnectPort, addr); res=CSocketAddress::Resolve(pSock->m_pConnectHost, pSock->m_ConnectPort, addr);
NET_LOG4("CStreamSocket_ConnectThread: Resolve: %s -> %s [%s]", pSock->m_pConnectHost, addr.GetString().c_str(), res); NET_LOG4("CStreamSocket_ConnectThread: Resolve: %hs -> %hs [%hs]", pSock->m_pConnectHost, addr.GetString().c_str(), res);
if (res == PS_OK) if (res == PS_OK)
{ {
pSock->Initialize(); pSock->Initialize();
@ -53,7 +53,7 @@ void *CStreamSocket_ConnectThread(void *data)
pSock->SetOpMask(0); pSock->SetOpMask(0);
pSock->SetNonBlocking(false); pSock->SetNonBlocking(false);
res=pSock->Connect(addr); res=pSock->Connect(addr);
NET_LOG2("CStreamSocket_ConnectThread: Connect: %s", res); NET_LOG2("CStreamSocket_ConnectThread: Connect: %hs", res);
} }
if (res == PS_OK) if (res == PS_OK)
@ -128,7 +128,7 @@ PS_RESULT CStreamSocket::Write(void *buf, size_t len)
} }
#define MakeDefaultCallback(_nm) void CStreamSocket::_nm(PS_RESULT error) \ #define MakeDefaultCallback(_nm) void CStreamSocket::_nm(PS_RESULT error) \
{ NET_LOG2("CStreamSocket::"#_nm"(): %s", error); } { NET_LOG2("CStreamSocket::"#_nm"(): %hs", error); }
MakeDefaultCallback(OnClose) MakeDefaultCallback(OnClose)
MakeDefaultCallback(ConnectComplete) MakeDefaultCallback(ConnectComplete)
@ -173,7 +173,7 @@ void CStreamSocket::OnRead()
((u8 *)m_ReadContext.m_pBuffer)+m_ReadContext.m_Completed, ((u8 *)m_ReadContext.m_pBuffer)+m_ReadContext.m_Completed,
m_ReadContext.m_Length-m_ReadContext.m_Completed, m_ReadContext.m_Length-m_ReadContext.m_Completed,
&bytes); &bytes);
NET_LOG4("CStreamSocket::OnRead(): %s, %lu bytes read of %lu", NET_LOG4("CStreamSocket::OnRead(): %hs, %lu bytes read of %lu",
res, (unsigned long)bytes, res, (unsigned long)bytes,
(unsigned long)(m_ReadContext.m_Length-m_ReadContext.m_Completed)); (unsigned long)(m_ReadContext.m_Length-m_ReadContext.m_Completed));
if (res != PS_OK) if (res != PS_OK)

4
source/ps/CLogger.cpp
View File

@ -55,10 +55,10 @@ const wchar_t* html_footer = L"";
CLogger::CLogger() CLogger::CLogger()
{ {
fs::wpath mainlogPath(psLogDir()/L"mainlog.html"); fs::wpath mainlogPath(psLogDir()/L"mainlog.html");
m_MainLog = new std::wofstream(mainlogPath.external_file_string().c_str(), std::ofstream::out | std::ofstream::trunc); m_MainLog = new std::wofstream(mainlogPath.string().c_str(), std::ofstream::out | std::ofstream::trunc);
fs::wpath interestinglogPath(psLogDir()/L"interestinglog.html"); fs::wpath interestinglogPath(psLogDir()/L"interestinglog.html");
m_InterestingLog = new std::wofstream(interestinglogPath.external_file_string().c_str(), std::ofstream::out | std::ofstream::trunc); m_InterestingLog = new std::wofstream(interestinglogPath.string().c_str(), std::ofstream::out | std::ofstream::trunc);
m_OwnsStreams = true; m_OwnsStreams = true;
m_UseDebugPrintf = true; m_UseDebugPrintf = true;

10
source/ps/CLogger.h
View File

@ -64,15 +64,15 @@ public:
// Function to log stuff to file // Function to log stuff to file
// -- This function has not been removed because the build would break. // -- This function has not been removed because the build would break.
void Log(ELogMethod method, const wchar_t* category, const wchar_t* fmt, ...) PRINTF_ARGS(4); void Log(ELogMethod method, const wchar_t* category, const wchar_t* fmt, ...) WPRINTF_ARGS(4);
// Similar to Log, but only outputs each message once no matter how many times it's called // Similar to Log, but only outputs each message once no matter how many times it's called
// -- This function has not been removed because the build would break. // -- This function has not been removed because the build would break.
void LogOnce(ELogMethod method, const wchar_t* category, const wchar_t* fmt, ...) PRINTF_ARGS(4); void LogOnce(ELogMethod method, const wchar_t* category, const wchar_t* fmt, ...) WPRINTF_ARGS(4);
// Functions to write a message, warning or error to file. // Functions to write a message, warning or error to file.
void LogMessage(const wchar_t* fmt, ...) PRINTF_ARGS(2); void LogMessage(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
void LogWarning(const wchar_t* fmt, ...) PRINTF_ARGS(2); void LogWarning(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
void LogError(const wchar_t* fmt, ...) PRINTF_ARGS(2); void LogError(const wchar_t* fmt, ...) WPRINTF_ARGS(2);
private: private:
void Init(); void Init();

2
source/ps/CStr.h
View File

@ -30,7 +30,7 @@ Examples:
The following shows several examples of traditional ANSI vs UNICODE. The following shows several examples of traditional ANSI vs UNICODE.
// ANSI // ANSI
LPCSTR str = "PI"; LPCSTR str = "PI";
printf( "%s = %fn", str, 3.1459f ); printf( "%hs = %fn", str, 3.1459f );
// UNICODE // UNICODE
LPCWSTR str = L"PI"; LPCWSTR str = L"PI";

2
source/ps/Profile.cpp
View File

@ -111,7 +111,7 @@ CStr CProfileNodeTable::GetTitle()
{ {
char buf[512]; char buf[512];
snprintf(buf, sizeof(buf), "Profiling Information for: %s (Time in node: %.3f msec/frame)", node->GetName(), node->GetFrameTime() * 1000.0f ); snprintf(buf, sizeof(buf), "Profiling Information for: %hs (Time in node: %.3f msec/frame)", node->GetName(), node->GetFrameTime() * 1000.0f );
buf[sizeof(buf)-1] = '\0'; buf[sizeof(buf)-1] = '\0';
return buf; return buf;

2
source/ps/ProfileViewer.cpp
View File

@ -430,7 +430,7 @@ void CProfileViewer::SaveToFile()
// Open the file. (It will be closed when the CProfileViewer // Open the file. (It will be closed when the CProfileViewer
// destructor is called.) // destructor is called.)
fs::wpath path(psLogDir()/L"profile.txt"); fs::wpath path(psLogDir()/L"profile.txt");
m->outputStream.open(path.external_file_string().c_str(), std::ofstream::out | std::ofstream::trunc); m->outputStream.open(path.string().c_str(), std::ofstream::out | std::ofstream::trunc);
if (m->outputStream.fail()) if (m->outputStream.fail())
{ {

20
source/ps/Util.cpp
View File

@ -86,15 +86,15 @@ void WriteSystemInfo()
struct tm* t = gmtime(&seconds); struct tm* t = gmtime(&seconds);
const size_t charsWritten = wcsftime(timestampBuf, ARRAY_SIZE(timestampBuf), L"(generated %Y-%m-%d %H:%M:%S UTC)", t); const size_t charsWritten = wcsftime(timestampBuf, ARRAY_SIZE(timestampBuf), L"(generated %Y-%m-%d %H:%M:%S UTC)", t);
debug_assert(charsWritten != 0); debug_assert(charsWritten != 0);
fwprintf(f, L"%ls\n\n", timestampBuf); fprintf(f, "%ls\n\n", timestampBuf);
} }
// OS // OS
fprintf(f, "OS : %s %s (%s)\n", un.sysname, un.release, un.version); fprintf(f, "OS : %hs %hs (%hs)\n", un.sysname, un.release, un.version);
// CPU // CPU
const CpuTopology* topology = cpu_topology_Detect(); const CpuTopology* topology = cpu_topology_Detect();
fprintf(f, "CPU : %s, %s (%dx%dx%d)", un.machine, cpu_IdentifierString(), (int)cpu_topology_NumPackages(topology), (int)cpu_topology_CoresPerPackage(topology), (int)cpu_topology_LogicalPerCore(topology)); fprintf(f, "CPU : %hs, %hs (%dx%dx%d)", un.machine, cpu_IdentifierString(), (int)cpu_topology_NumPackages(topology), (int)cpu_topology_CoresPerPackage(topology), (int)cpu_topology_LogicalPerCore(topology));
const double cpu_freq = os_cpu_ClockFrequency(); const double cpu_freq = os_cpu_ClockFrequency();
if(cpu_freq != 0.0f) if(cpu_freq != 0.0f)
{ {
@ -110,13 +110,13 @@ void WriteSystemInfo()
fprintf(f, "Memory : %u MiB; %u MiB free\n", (unsigned)os_cpu_MemorySize(), (unsigned)os_cpu_MemoryAvailable()); fprintf(f, "Memory : %u MiB; %u MiB free\n", (unsigned)os_cpu_MemorySize(), (unsigned)os_cpu_MemoryAvailable());
// graphics // graphics
fwprintf(f, L"Graphics Card : %ls\n", gfx_card); fprintf(f, "Graphics Card : %ls\n", gfx_card);
fprintf(f, "OpenGL Drivers : %s; %ls\n", glGetString(GL_VERSION), gfx_drv_ver); fprintf(f, "OpenGL Drivers : %hs; %ls\n", glGetString(GL_VERSION), gfx_drv_ver);
fprintf(f, "Video Mode : %dx%d:%d@%d\n", g_xres, g_yres, g_bpp, g_freq); fprintf(f, "Video Mode : %dx%d:%d@%d\n", g_xres, g_yres, g_bpp, g_freq);
// sound // sound
fwprintf(f, L"Sound Card : %ls\n", snd_card); fprintf(f, "Sound Card : %ls\n", snd_card);
fwprintf(f, L"Sound Drivers : %ls\n", snd_drv_ver); fprintf(f, "Sound Drivers : %ls\n", snd_drv_ver);
// //
@ -129,7 +129,7 @@ void WriteSystemInfo()
(void)gethostname(hostname, sizeof(hostname)-1); (void)gethostname(hostname, sizeof(hostname)-1);
// -1 makes sure it's 0-terminated. if the function fails, // -1 makes sure it's 0-terminated. if the function fails,
// we display "(unknown)" and will skip IP output below. // we display "(unknown)" and will skip IP output below.
fprintf(f, "Network Name : %s", hostname); fprintf(f, "Network Name : %hs", hostname);
{ {
// ignore exception here - see https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=114032 // ignore exception here - see https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=114032
@ -147,7 +147,7 @@ void WriteSystemInfo()
// separate entries but avoid trailing comma // separate entries but avoid trailing comma
if(i != 0) if(i != 0)
fprintf(f, ", "); fprintf(f, ", ");
fprintf(f, "%s", inet_ntoa(*ips[i])); fprintf(f, "%hs", inet_ntoa(*ips[i]));
} }
fprintf(f, ")"); fprintf(f, ")");
} }
@ -159,7 +159,7 @@ no_ip:
// OpenGL extensions (write them last, since it's a lot of text) // OpenGL extensions (write them last, since it's a lot of text)
const char* exts = ogl_ExtensionString(); const char* exts = ogl_ExtensionString();
if (!exts) exts = "{unknown}"; if (!exts) exts = "{unknown}";
fprintf(f, "\nOpenGL Extensions: \n%s\n", SplitExts(exts).c_str()); fprintf(f, "\nOpenGL Extensions: \n%hs\n", SplitExts(exts).c_str());
fclose(f); fclose(f);
f = 0; f = 0;

4
source/ps/XML/Xeromyces.cpp
View File

@ -33,7 +33,7 @@
static void errorHandler(void* UNUSED(userData), xmlErrorPtr error) static void errorHandler(void* UNUSED(userData), xmlErrorPtr error)
{ {
LOG(CLogger::Error, LOG_CATEGORY, L"CXeromyces: Parse %hs: %ls:%d: %hs", LOG(CLogger::Error, LOG_CATEGORY, L"CXeromyces: Parse %ls: %hs:%d: %hs",
error->level == XML_ERR_WARNING ? L"warning" : L"error", error->level == XML_ERR_WARNING ? L"warning" : L"error",
error->file, error->line, error->message); error->file, error->line, error->message);
// TODO: The (non-fatal) warnings and errors don't get stored in the XMB, // TODO: The (non-fatal) warnings and errors don't get stored in the XMB,
@ -83,7 +83,7 @@ void CXeromyces::GetXMBPath(const PIVFS& vfs, const VfsPath& xmlFilename, const
const wchar_t* modPath = wcsstr(XMBRealPath, L"mods/"); const wchar_t* modPath = wcsstr(XMBRealPath, L"mods/");
debug_assert(modPath != 0); debug_assert(modPath != 0);
wchar_t modName[PATH_MAX]; wchar_t modName[PATH_MAX];
// .. NOTE: can't use %s, of course (keeps going beyond '/') // .. NOTE: can't use %ls, of course (keeps going beyond '/')
int matches = swscanf(modPath, L"mods/%[^/]", modName); int matches = swscanf(modPath, L"mods/%[^/]", modName);
debug_assert(matches == 1); debug_assert(matches == 1);

2
source/ps/scripting/JSCollection.h
View File

@ -249,7 +249,7 @@ template<typename T, JSClass* ScriptType> bool CJSCollection<T, ScriptType>::Get
if( ToPrimitive( g_ScriptingHost.GetContext(), m, Storage ) ) if( ToPrimitive( g_ScriptingHost.GetContext(), m, Storage ) )
return( true ); return( true );
JS_ReportError( g_ScriptingHost.GetContext(), "Only objects of type %s can be stored in this collection.", ScriptType->name ); JS_ReportError( g_ScriptingHost.GetContext(), "Only objects of type %hs can be stored in this collection.", ScriptType->name );
return( false ); return( false );
} }

8
source/scripting/ScriptGlue.cpp
View File

@ -187,7 +187,7 @@ JSBool GetEntityTemplate( JSContext* cx, JSObject*, uintN argc, jsval* argv, jsv
CEntityTemplate* v = g_EntityTemplateCollection.GetTemplate( templateName, player ); CEntityTemplate* v = g_EntityTemplateCollection.GetTemplate( templateName, player );
if( !v ) if( !v )
{ {
JS_ReportError( cx, "No such template: %s", CStr(templateName).c_str() ); JS_ReportError( cx, "No such template: %hs", CStr(templateName).c_str() );
return( JS_TRUE ); return( JS_TRUE );
} }
@ -1064,13 +1064,13 @@ JSBool GetBuildTimestamp( JSContext* cx, JSObject*, uintN argc, jsval* argv, jsv
switch(mode) switch(mode)
{ {
case -1: case -1:
sprintf_s(buf, ARRAY_SIZE(buf), "%s %s (%ls)", __DATE__, __TIME__, svn_revision); sprintf_s(buf, ARRAY_SIZE(buf), "%hs %hs (%ls)", __DATE__, __TIME__, svn_revision);
break; break;
case 0: case 0:
sprintf_s(buf, ARRAY_SIZE(buf), "%s", __DATE__); sprintf_s(buf, ARRAY_SIZE(buf), "%hs", __DATE__);
break; break;
case 1: case 1:
sprintf_s(buf, ARRAY_SIZE(buf), "%s", __TIME__); sprintf_s(buf, ARRAY_SIZE(buf), "%hs", __TIME__);
break; break;
case 2: case 2:
sprintf_s(buf, ARRAY_SIZE(buf), "%ls", svn_revision); sprintf_s(buf, ARRAY_SIZE(buf), "%ls", svn_revision);

6
source/scripting/ScriptingHost.cpp
View File

@ -409,16 +409,16 @@ void ScriptingHost::ErrorReporter(JSContext* UNUSED(cx), const char* pmessage, J
// apparently there is no further information in this struct we can use // apparently there is no further information in this struct we can use
// because linebuf/tokenptr require a buffer to have been allocated. // because linebuf/tokenptr require a buffer to have been allocated.
// that doesn't look possible since we are a callback and there is // that doesn't look possible since we are a callback and there is
// no mention in the dox about where this would happen (typical). // no mention in the docs about where this would happen (typical).
// for developer convenience: write to output window so they can // for developer convenience: write to output window so they can
// doubleclick on that line and be taken to the error locus. // double-click on that line and be taken to the error locus.
debug_printf(L"%ls(%d): %ls\n", file.c_str(), line, message.c_str()); debug_printf(L"%ls(%d): %ls\n", file.c_str(), line, message.c_str());
// note: CLogger's LOG already takes care of writing to the console, // note: CLogger's LOG already takes care of writing to the console,
// so don't do that here. // so don't do that here.
LOG(CLogger::Error, LOG_CATEGORY, L"JavaScript Error (%s, line %d): %s", file.c_str(), line, message.c_str()); LOG(CLogger::Error, LOG_CATEGORY, L"JavaScript Error (%ls, line %d): %ls", file.c_str(), line, message.c_str());
} }
#ifndef NDEBUG #ifndef NDEBUG

2
source/simulation/EntityScriptInterface.cpp
View File

@ -183,7 +183,7 @@ JSBool CEntity::Construct( JSContext* cx, JSObject* UNUSED(obj), uintN argc, jsv
if( !baseEntity ) if( !baseEntity )
{ {
*rval = JSVAL_NULL; *rval = JSVAL_NULL;
JS_ReportError( cx, "No such template: %s", CStr8(templateName).c_str() ); JS_ReportError( cx, "No such template: %hs", CStr8(templateName).c_str() );
return( JS_TRUE ); return( JS_TRUE );
} }

3
source/simulation/Formation.cpp
View File

@ -120,8 +120,7 @@ bool CFormation::LoadXml(const VfsPath& filename)
m_fileSpacing = CStr(Attr.Value).ToFloat(); m_fileSpacing = CStr(Attr.Value).ToFloat();
else else
{ {
const char* invAttr = XeroFile.GetAttributeString(Attr.Name).c_str(); LOG(CLogger::Error, LOG_CATEGORY, L"CFormation::LoadXml: Invalid attribute %hs defined in formation file %ls. Load failed.", XeroFile.GetAttributeString(Attr.Name).c_str(), filename.string().c_str() );
LOG(CLogger::Error, LOG_CATEGORY, L"CFormation::LoadXml: Invalid attribute %hs defined in formation file %ls. Load failed.", invAttr, filename.string().c_str() );
return( false ); return( false );
} }
} }

12
source/sound/CMusicPlayer.cpp
View File

@ -47,7 +47,7 @@ CMusicPlayer::~CMusicPlayer(void)
Release(); Release();
} }
void CMusicPlayer::Open(char* UNUSED(filename)) void CMusicPlayer::Open(const VfsPath& UNUSED(pathname))
{ {
// If a new file is opened while another is already in memory, // If a new file is opened while another is already in memory,
// close the old one first. // close the old one first.
@ -57,19 +57,19 @@ void CMusicPlayer::Open(char* UNUSED(filename))
/* /*
void* p; void* p;
size_t sizeOfFile; size_t sizeOfFile;
if(vfs_load(filename, p, sizeOfFile) != INFO::OK) if(vfs_load(pathname, p, sizeOfFile) != INFO::OK)
{ {
LOG(CLogger::Error, LOG_CATEGORY, L"CMusicPlayer::open(): vfs_load for %s failed!\n", filename); LOG(CLogger::Error, LOG_CATEGORY, L"CMusicPlayer::open(): vfs_load for %ls failed!\n", pathname.string().c_str());
return; return;
} }
else else
LOG(CLogger::Normal, LOG_CATEGORY, L"CMusicPlayer::open(): file %s loaded successfully\n", filename); LOG(CLogger::Normal, LOG_CATEGORY, L"CMusicPlayer::open(): file %ls loaded successfully\n", pathname.string().c_str());
memFile.dataPtr = (char*)p; memFile.dataPtr = (char*)p;
memFile.dataRead = 0; memFile.dataRead = 0;
memFile.dataSize = sizeOfFile; memFile.dataSize = sizeOfFile;
*/ */
/* /*
hf = vfs_open(filename); hf = vfs_open(pathname);
for(int i = 0; i < NUM_BUFS; i++) for(int i = 0; i < NUM_BUFS; i++)
{ {
@ -233,7 +233,7 @@ void CMusicPlayer::Check()
if(error != AL_NO_ERROR) if(error != AL_NO_ERROR)
{ {
std::string str = errorString(error); std::string str = errorString(error);
LOG(CLogger::Error, LOG_CATEGORY, L"OpenAL error: %s\n", str.c_str()); LOG(CLogger::Error, LOG_CATEGORY, L"OpenAL error: %hs\n", str.c_str());
} }
*/ */
} }

4
source/sound/CMusicPlayer.h
View File

@ -22,6 +22,8 @@
#include <iostream> #include <iostream>
#include <stdio.h> #include <stdio.h>
#include "lib/file/vfs/vfs_path.h"
//#include "oal.h" //#include "oal.h"
/* /*
@ -48,7 +50,7 @@ class CMusicPlayer
public: public:
CMusicPlayer(void); CMusicPlayer(void);
~CMusicPlayer(void); ~CMusicPlayer(void);
void Open(char *filename); void Open(const VfsPath& pathname);
void Release(); void Release();
bool Play(); bool Play();
bool IsPlaying(); bool IsPlaying();