aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ProcessUtils.cpp2
-rw-r--r--RadTerminal.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/ProcessUtils.cpp b/ProcessUtils.cpp
index 4a44ae3..e3effc9 100644
--- a/ProcessUtils.cpp
+++ b/ProcessUtils.cpp
@@ -87,7 +87,7 @@ namespace {
}
TCHAR localcmd[MAX_PATH];
- wcscpy_s(localcmd, cmd);
+ _tcscpy_s(localcmd, cmd);
if (!CreateProcess(nullptr, localcmd, nullptr, nullptr, bInheritHandles, dwCreationFlags, nullptr, nullptr, &si.StartupInfo, &spd.pi))
{
spd.hr = HRESULT_FROM_WIN32(GetLastError());
diff --git a/RadTerminal.cpp b/RadTerminal.cpp
index 2e6e2c7..dec0b31 100644
--- a/RadTerminal.cpp
+++ b/RadTerminal.cpp
@@ -562,9 +562,13 @@ BOOL RadTerminalWindowOnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
tsm_vte_set_osc_cb(data->vte, tsm_vte_osc, hWnd);
if (rtc->strScheme != nullptr)
{
+#ifdef _UNICODE
char scheme[1024];
WideCharToMultiByte(CP_UTF8, 0, rtc->strScheme, -1, scheme, ARRAYSIZE(scheme), nullptr, nullptr);
e = tsm_vte_set_palette(data->vte, scheme);
+#else
+ e = tsm_vte_set_palette(data->vte, rtc->strScheme);
+#endif
}
for (int b = 0; b < 2; ++b)