preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-16 07:50:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Win32: Switch to a UNICODE build. This took quite a bit of fixing.

Browse Source
This commit is contained in:
Henrik Rydgard committed 2013-08-26 19:00:16 +02:00
1 parent fdaff2af98
commit 55aa3d13c7
63 files changed
+572 -517
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/W32Util/ShellUtil.cpp
+27 -31
View File
@@ -3,7 +3,9 @@
#include "stdafx.h"
#include "shlobj.h"
#include "util/text/utf8.h"
#include "ShellUtil.h"
#include "CommDlg.h"
#include <shlobj.h>
#include <commdlg.h>
@@ -15,17 +17,17 @@ namespace W32Util
BROWSEINFO info;
memset(&info,0,sizeof(info));
info.hwndOwner = parent;
info.lpszTitle = title;
info.lpszTitle = ConvertUTF8ToWString(title).c_str();
info.ulFlags = BIF_EDITBOX | BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
//info.pszDisplayName
LPCITEMIDLIST idList = SHBrowseForFolder(&info);
char temp[MAX_PATH];
wchar_t temp[MAX_PATH];
SHGetPathFromIDList(idList, temp);
if (strlen(temp))
if (wcslen(temp))
{
return temp;
return ConvertWStringToUTF8(temp);
}
else
return "";
@@ -38,33 +40,30 @@ namespace W32Util
const char *_pInitialFolder,const char *_pFilter,const char *_pExtension,
std::string& _strFileName)
{
char szFile [MAX_PATH+1];
char szFileTitle [MAX_PATH+1];
strcpy (szFile,"");
strcpy (szFileTitle,"");
wchar_t szFile [MAX_PATH+1] = {0};
wchar_t szFileTitle [MAX_PATH+1] = {0};
OPENFILENAME ofn;
ZeroMemory (&ofn,sizeof (ofn));
ofn.lStructSize = sizeof (OPENFILENAME);
ofn.lpstrInitialDir = _pInitialFolder;
ofn.lpstrFilter = _pFilter;
ofn.lpstrInitialDir = ConvertUTF8ToWString(_pInitialFolder).c_str();
ofn.lpstrFilter = ConvertUTF8ToWString(_pFilter).c_str();
ofn.nMaxFile = sizeof (szFile);
ofn.lpstrFile = szFile;
ofn.lpstrFileTitle = szFileTitle;
ofn.nMaxFileTitle = sizeof (szFileTitle);
ofn.lpstrDefExt = _pExtension;
ofn.lpstrDefExt = ConvertUTF8ToWString(_pExtension).c_str();
ofn.hwndOwner = _hParent;
ofn.Flags = OFN_NOCHANGEDIR | OFN_EXPLORER | OFN_HIDEREADONLY;
if (_strFileName.size () != 0)
ofn.lpstrFile = (char *)_strFileName.c_str();
ofn.lpstrFile = (wchar_t *)_strFileName.c_str();
if (((_bLoad)?GetOpenFileName (&ofn):GetSaveFileName (&ofn)))
if (((_bLoad) ? GetOpenFileName(&ofn) : GetSaveFileName (&ofn)))
{
_strFileName = ofn.lpstrFile;
_strFileName = ConvertWStringToUTF8(ofn.lpstrFile);
return true;
}
else
@@ -74,46 +73,43 @@ namespace W32Util
std::vector<std::string> BrowseForFileNameMultiSelect(bool _bLoad, HWND _hParent, const char *_pTitle,
const char *_pInitialFolder,const char *_pFilter,const char *_pExtension)
{
char szFile [MAX_PATH+1+2048*2];
char szFileTitle [MAX_PATH+1];
strcpy (szFile,"");
strcpy (szFileTitle,"");
wchar_t szFile [MAX_PATH+1+2048*2] = {0};
wchar_t szFileTitle [MAX_PATH+1] = {0};
OPENFILENAME ofn;
ZeroMemory (&ofn,sizeof (ofn));
ofn.lStructSize = sizeof (OPENFILENAME);
ofn.lpstrInitialDir = _pInitialFolder;
ofn.lpstrFilter = _pFilter;
ofn.lpstrInitialDir = ConvertUTF8ToWString(_pInitialFolder).c_str();
ofn.lpstrFilter = ConvertUTF8ToWString(_pFilter).c_str();
ofn.nMaxFile = sizeof (szFile);
ofn.lpstrFile = szFile;
ofn.lpstrFileTitle = szFileTitle;
ofn.nMaxFileTitle = sizeof (szFileTitle);
ofn.lpstrDefExt = _pExtension;
ofn.lpstrDefExt = ConvertUTF8ToWString(_pExtension).c_str();
ofn.hwndOwner = _hParent;
ofn.Flags = OFN_NOCHANGEDIR | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_ALLOWMULTISELECT ;
std::vector<std::string> files;
if (((_bLoad) ? GetOpenFileName (&ofn):GetSaveFileName (&ofn)))
if (((_bLoad) ? GetOpenFileName(&ofn) : GetSaveFileName(&ofn)))
{
std::string directory = ofn.lpstrFile;
char *temp = ofn.lpstrFile;
char *oldtemp = temp;
temp+=strlen(temp)+1;
std::string directory = ConvertWStringToUTF8(ofn.lpstrFile);
wchar_t *temp = ofn.lpstrFile;
wchar_t *oldtemp = temp;
temp += wcslen(temp)+1;
if (*temp==0)
{
//we only got one file
files.push_back(std::string(oldtemp));
files.push_back(ConvertWStringToUTF8(oldtemp));
}
else
{
while (*temp)
{
files.push_back(directory+"\\"+std::string(temp));
temp+=strlen(temp)+1;
files.push_back(directory+"\\"+ConvertWStringToUTF8(temp));
temp += wcslen(temp)+1;
}
}
return files;