summaryrefslogtreecommitdiffstats
path: root/docs/release/src/osd/winui/winui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/src/osd/winui/winui.cpp')
-rw-r--r--docs/release/src/osd/winui/winui.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/docs/release/src/osd/winui/winui.cpp b/docs/release/src/osd/winui/winui.cpp
index b46ed105e18..2786e6b2234 100644
--- a/docs/release/src/osd/winui/winui.cpp
+++ b/docs/release/src/osd/winui/winui.cpp
@@ -999,7 +999,7 @@ int MameUIMain(HINSTANCE hInstance, LPWSTR lpCmdLine, int nCmdShow)
return 999;
for (i = 0; i < __argc; i++)
{
- utf8_argv[i] = utf8_from_tstring(__targv[i]);
+ utf8_argv[i] = ui_utf8_from_wstring(__targv[i]);
if (utf8_argv[i] == NULL)
{
free(utf8_argv);
@@ -1674,7 +1674,7 @@ static BOOL Win32UI_init(HINSTANCE hInstance, LPWSTR lpCmdLine, int nCmdShow)
HelpInit();
- t_inpdir = tstring_from_utf8(GetInpDir());
+ t_inpdir = ui_wstring_from_utf8(GetInpDir());
if( ! t_inpdir )
return FALSE;
@@ -2839,7 +2839,7 @@ static void CopyToolTipText(LPTOOLTIPTEXT lpttt)
SendMessage(hStatusBar, SB_GETTEXT, (WPARAM)iButton, (LPARAM)&String );
else {
//for first pane we get the Status directly, to get the line breaks
- t_gameinfostatus = tstring_from_utf8( GameInfoStatus(Picker_GetSelectedItem(hwndList), FALSE));
+ t_gameinfostatus = ui_wstring_from_utf8( GameInfoStatus(Picker_GetSelectedItem(hwndList), FALSE));
if( !t_gameinfostatus )
return;
_tcscpy(String, t_gameinfostatus);
@@ -3045,7 +3045,7 @@ static void EnableSelection(int nGame)
HMENU hMenu = GetMenu(hMain);
TCHAR* t_description;
- t_description = tstring_from_utf8(ConvertAmpersandString(ModifyThe(driver_list::driver(nGame).description)));
+ t_description = ui_wstring_from_utf8(ConvertAmpersandString(ModifyThe(driver_list::driver(nGame).description)));
if( !t_description )
return;
@@ -3202,7 +3202,7 @@ static BOOL TreeViewNotify(LPNMHDR nm)
if (ptvdi->item.pszText == NULL || _tcslen(ptvdi->item.pszText) == 0)
return FALSE;
- utf8_szText = utf8_from_tstring(ptvdi->item.pszText);
+ utf8_szText = ui_utf8_from_wstring(ptvdi->item.pszText);
if( !utf8_szText )
return FALSE;
@@ -3571,7 +3571,7 @@ static void PollGUIJoystick()
si.cb = sizeof(si);
exec_command = GetExecCommand();
- t_exec_command = tstring_from_utf8(exec_command);
+ t_exec_command = ui_wstring_from_utf8(exec_command);
if( !t_exec_command )
return;
CreateProcess(NULL, t_exec_command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
@@ -4316,7 +4316,7 @@ static BOOL MameCommand(HWND hwnd,int id, HWND hwndCtl, UINT codeNotify)
if (as[t1] == '\\') as[t1]='\0';
t1 = as.find(':');
if (t1 > 0)
- t_bgdir = tstring_from_utf8(as.c_str());
+ t_bgdir = ui_wstring_from_utf8(as.c_str());
OPENFILENAME OFN;
static TCHAR szFile[MAX_PATH] = TEXT("\0");
@@ -4347,7 +4347,7 @@ static BOOL MameCommand(HWND hwnd,int id, HWND hwndCtl, UINT codeNotify)
if (GetOpenFileName(&OFN))
{
osd_free(t_bgdir);
- utf8_szFile = utf8_from_tstring(szFile);
+ utf8_szFile = ui_utf8_from_wstring(szFile);
if( !utf8_szFile )
return FALSE;
@@ -4663,7 +4663,7 @@ static const TCHAR *GamePicker_GetItemString(HWND hwndPicker, int nItem, int nCo
if( utf8_s )
{
- TCHAR* t_s = tstring_from_utf8(utf8_s);
+ TCHAR* t_s = ui_wstring_from_utf8(utf8_s);
if( !t_s )
return s;
@@ -4746,7 +4746,7 @@ static void InitListView()
res = ListView_SetTextBkColor(hwndList, CLR_NONE);
res = ListView_SetBkColor(hwndList, CLR_NONE);
- t_bgdir = tstring_from_utf8(GetBgDir());
+ t_bgdir = ui_wstring_from_utf8(GetBgDir());
if( !t_bgdir )
return;
@@ -5140,7 +5140,7 @@ BOOL CommonFileDialog(common_file_dialog_proc cfd, char *filename, int filetype)
char *utf8_filename;
// convert the filename to UTF-8 and copy into buffer
- t_filename = tstring_from_utf8(filename);
+ t_filename = ui_wstring_from_utf8(filename);
if (t_filename)
{
_sntprintf(t_filename_buffer, ARRAY_LENGTH(t_filename_buffer), TEXT("%s"), t_filename);
@@ -5222,7 +5222,7 @@ BOOL CommonFileDialog(common_file_dialog_proc cfd, char *filename, int filetype)
dirname.resize(i);
if (dirname.empty())
dirname = ".";
- ofn.lpstrInitialDir = tstring_from_utf8(dirname.c_str());
+ ofn.lpstrInitialDir = ui_wstring_from_utf8(dirname.c_str());
ofn.lpstrTitle = NULL;
ofn.Flags = OFN_EXPLORER | OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY;
@@ -5239,7 +5239,7 @@ BOOL CommonFileDialog(common_file_dialog_proc cfd, char *filename, int filetype)
/*GetDirectory(filename,last_directory,sizeof(last_directory));*/
}
- utf8_filename = utf8_from_tstring(t_filename_buffer);
+ utf8_filename = ui_utf8_from_wstring(t_filename_buffer);
if (utf8_filename)
{
snprintf(filename, MAX_PATH, "%s", utf8_filename);
@@ -5251,7 +5251,7 @@ BOOL CommonFileDialog(common_file_dialog_proc cfd, char *filename, int filetype)
void SetStatusBarText(int part_index, const char *message)
{
- TCHAR* t_message = tstring_from_utf8(message);
+ TCHAR* t_message = ui_wstring_from_utf8(message);
if( !t_message )
return;
SendMessage(hStatusBar, SB_SETTEXT, (WPARAM) part_index, (LPARAM)(LPCTSTR) win_tstring_strdup(t_message));
@@ -5849,7 +5849,7 @@ static void UpdateMenu(HMENU hMenu)
if (have_selection)
{
- t_description = tstring_from_utf8(ConvertAmpersandString(ModifyThe(driver_list::driver(nGame).description)));
+ t_description = ui_wstring_from_utf8(ConvertAmpersandString(ModifyThe(driver_list::driver(nGame).description)));
if( !t_description )
return;
@@ -5965,7 +5965,7 @@ void InitTreeContextMenu(HMENU hTreeMenu)
for (i=0;g_folderData[i].m_lpTitle;i++)
{
- TCHAR* t_title = tstring_from_utf8(g_folderData[i].m_lpTitle);
+ TCHAR* t_title = ui_wstring_from_utf8(g_folderData[i].m_lpTitle);
if( !t_title )
return;