ST-ize pfCrashHandler.

Sources/Plasma/CoreLib/hsThread.h

@@ -43,11 +43,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define hsThread_Defined
 
 #include "HeadSpin.h"
+#include "hsLockGuard.h"
+
 #include <atomic>
-#include <mutex>
 #include <condition_variable>
+#include <mutex>
 #include <thread>
-#include "hsLockGuard.h"
+
+#include <string_theory/string>
 
 typedef uint32_t hsMilliseconds;
 
@@ -153,7 +156,7 @@ class hsGlobalSemaphore {
 #endif
 #endif
 public:
-    hsGlobalSemaphore(int initialValue = 0, const char* name = nullptr);
+    hsGlobalSemaphore(int initialValue = 0, const ST::string& name = {});
     ~hsGlobalSemaphore();
 
 #ifdef HS_BUILD_FOR_WIN32

Sources/Plasma/CoreLib/hsThread_Unix.cpp

@@ -72,14 +72,14 @@ int clock_gettime(int clocktype, struct timespec* ts)
 
 /////////////////////////////////////////////////////////////////////////////
 
-hsGlobalSemaphore::hsGlobalSemaphore(int initialValue, const char* name)
+hsGlobalSemaphore::hsGlobalSemaphore(int initialValue, const ST::string& name)
 {
 #ifdef USE_SEMA
     fPSema = nullptr;
-    fNamed = (name != nullptr);
+    fNamed = !name.empty();
     if (fNamed) {
         /* Named semaphore shared between processes */
-        fPSema = sem_open(name, O_CREAT, 0666, initialValue);
+        fPSema = sem_open(name.c_str(), O_CREAT, 0666, initialValue);
         if (fPSema == SEM_FAILED)
         {
             hsAssert(0, "hsOSException");

Sources/Plasma/CoreLib/hsThread_Win.cpp

@@ -46,9 +46,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsThread.h"
 #include "hsExceptions.h"
 
-hsGlobalSemaphore::hsGlobalSemaphore(int initialValue, const char *name)
+hsGlobalSemaphore::hsGlobalSemaphore(int initialValue, const ST::string& name)
 {
-    fSemaH = ::CreateSemaphore(nullptr, initialValue, kPosInfinity32, name);
+    fSemaH = ::CreateSemaphoreW(nullptr, initialValue, kPosInfinity32, name.to_wchar().data());
     if (fSemaH == nullptr)
         throw hsOSException(-1);
 }

Sources/Plasma/FeatureLib/pfCrashHandler/plCrashBase.cpp

@@ -43,18 +43,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plCrashBase.h"
 #include "plCrash_Private.h"
 
+#include <string_theory/format>
+
 plCrashBase::~plCrashBase()
 {
     delete fCrashed;
     delete fHandled;
 }
 
-void plCrashBase::IInit(const char* file)
+void plCrashBase::IInit(const ST::string& file)
 {
-    char sema[128];
-    snprintf(sema, std::size(sema), "%s-%s", file, CRASH_NOTIFY_SUFFIX);
-    fCrashed = new hsGlobalSemaphore(0, sema);
-
-    snprintf(sema, std::size(sema), "%s-%s", file, CRASH_HANDLE_SUFFIX);
-    fHandled = new hsGlobalSemaphore(0, sema);
+    fCrashed = new hsGlobalSemaphore(0, ST::format("{}-{}", file, CRASH_NOTIFY_SUFFIX));
+    fHandled = new hsGlobalSemaphore(0, ST::format("{}-{}", file, CRASH_HANDLE_SUFFIX));
 }

Sources/Plasma/FeatureLib/pfCrashHandler/plCrashBase.h

@@ -45,14 +45,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "hsThread.h"
 
+namespace ST { class string; }
+
 class plCrashBase
 {
 protected:
     hsGlobalSemaphore* fCrashed;
     hsGlobalSemaphore* fHandled;
 
     ~plCrashBase();
-    void IInit(const char* file);
+    void IInit(const ST::string& file);
 };
 
 #endif // _pfCrashBase_h_

Sources/Plasma/FeatureLib/pfCrashHandler/plCrashCli.cpp

@@ -43,6 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "plCrashCli.h"
 #include "plCrash_Private.h"
 
+#include <string_theory/format>
+
 #ifdef HS_BUILD_FOR_WIN32
 
 #ifdef _MSC_VER
@@ -63,17 +65,15 @@ static void IPureVirtualCall()
 plCrashCli::plCrashCli()
     : fLink(), fLinkH()
 {
-    char mapname[128];
-    char cmdline[128];
-    snprintf(mapname, std::size(mapname), "Plasma20CrashHandler-%u", GetCurrentProcessId());
-    snprintf(cmdline, std::size(cmdline), "%s %s", CRASH_HANDLER_EXE, mapname);
+    ST::string mapname = ST::format("Plasma20CrashHandler-{}", GetCurrentProcessId());
+    ST::string cmdline = ST::format("{} {}", CRASH_HANDLER_EXE, mapname);
     memset(&fCrashSrv, 0, sizeof(PROCESS_INFORMATION));
 
     // Initialize the semas
     IInit(mapname);
 
     // Initialize the shared memory
-    fLinkH = CreateFileMappingA(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, sizeof(plCrashMemLink), mapname);
+    fLinkH = CreateFileMappingW(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, sizeof(plCrashMemLink), mapname.to_wchar().data());
     hsAssert(fLinkH, "Failed to create plCrashHandler mapping");
     if (!fLinkH)
         return;
@@ -87,11 +87,11 @@ plCrashCli::plCrashCli()
     fLink->fClientProcessID = GetCurrentProcessId();
 
     // Start the plCrashHandler before a crash
-    STARTUPINFOA info; memset(&info, 0, sizeof(info));
-    info.cb = sizeof(STARTUPINFOA);
-    CreateProcessA(
-                   CRASH_HANDLER_EXE, // plCrashHandler.exe
-                   cmdline,           // plCrashHandler.exe Plasma20CrashHandler-%u
+    STARTUPINFOW info{};
+    info.cb = sizeof(info);
+    CreateProcessW(
+                   CRASH_HANDLER_EXE.data(),  // plCrashHandler.exe
+                   cmdline.to_wchar().data(), // plCrashHandler.exe Plasma20CrashHandler-%u
                    nullptr,
                    nullptr,
                    FALSE,

Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.cpp

@@ -50,14 +50,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <dbghelp.h>
 #include <shlobj.h>
 
-plCrashSrv::plCrashSrv(const char* file)
+plCrashSrv::plCrashSrv(const ST::string& file)
     : fLink(), fLinkH()
 {
     // Init semas
     IInit(file);
 
     // Open the linked memory
-    fLinkH = OpenFileMappingA(FILE_MAP_ALL_ACCESS, FALSE, file);
+    fLinkH = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, file.to_wchar().data());
     hsAssert(fLinkH, "Failed to open plCrashHandler mapping");
     if (!fLinkH)
         return;
@@ -87,7 +87,7 @@ void plCrashSrv::IHandleCrash()
                               nullptr
     );
 
-    MINIDUMP_EXCEPTION_INFORMATION e;
+    MINIDUMP_EXCEPTION_INFORMATION e{};
     e.ClientPointers = TRUE;
     e.ExceptionPointers = fLink->fExceptionPtrs;
     e.ThreadId = fLink->fClientThreadID;

Sources/Plasma/FeatureLib/pfCrashHandler/plCrashSrv.h

@@ -59,7 +59,7 @@ class plCrashSrv : public plCrashBase
     void IHandleCrash();
 
 public:
-    plCrashSrv(const char* file);
+    plCrashSrv(const ST::string& file);
     ~plCrashSrv();
 
     void HandleCrash();

Sources/Plasma/FeatureLib/pfCrashHandler/plCrash_Private.h

@@ -46,14 +46,16 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "HeadSpin.h"
 #include "hsWindows.h"
 
-#define CRASH_NOTIFY_SUFFIX "CrashNotify"
-#define CRASH_HANDLE_SUFFIX "CrashHandled"
+#include <string_view>
+
+constexpr std::string_view CRASH_NOTIFY_SUFFIX = "CrashNotify";
+constexpr std::string_view CRASH_HANDLE_SUFFIX = "CrashHandled";
 
 #ifdef HS_BUILD_FOR_WIN32
 #   ifdef PLASMA_EXTERNAL_RELEASE
-#       define CRASH_HANDLER_EXE "UruCrashHandler.exe"
+        constexpr std::wstring_view CRASH_HANDLER_EXE = L"UruCrashHandler.exe";
 #   else
-#       define CRASH_HANDLER_EXE "plCrashHandler.exe"
+        constexpr std::wstring_view CRASH_HANDLER_EXE = L"plCrashHandler.exe";
 #   endif // PLASMA_EXTERNAL_RELEASE
 #endif // HS_BUILD_FOR_WIN32