krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

attempt to fix LowLevelFile, minor code reuse

Browse source
This commit is contained in:
greye 2014-05-19 10:47:02 +04:00
parent 2c82da8e6e
commit 6cb795ef7d
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
components/files/lowlevelfile.cpp
View file

@ -206,6 +206,8 @@ size_t LowLevelFile::read (void * data, size_t size)
} }
#elif FILE_API == FILE_API_WIN32 #elif FILE_API == FILE_API_WIN32
#include <boost/locale.hpp>
/* /*
* *
* Implementation of LowLevelFile methods using Win32 API calls * Implementation of LowLevelFile methods using Win32 API calls
@ -227,7 +229,8 @@ void LowLevelFile::open (char const * filename)
{ {
assert (mHandle == INVALID_HANDLE_VALUE); assert (mHandle == INVALID_HANDLE_VALUE);
HANDLE handle = CreateFileA (filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); std::wstring wname = boost::locale::conv::utf_to_utf<wchar_t>(filename);
HANDLE handle = CreateFileW (wname.c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
if (handle == NULL) if (handle == NULL)
{ {

8
components/settings/settings.cpp
View file

@ -8,6 +8,8 @@
#include <OgreStringConverter.h> #include <OgreStringConverter.h>
#include <OgreDataStream.h> #include <OgreDataStream.h>
#include <components/files/constrainedfiledatastream.hpp>
using namespace Settings; using namespace Settings;
namespace bfs = boost::filesystem; namespace bfs = boost::filesystem;
@ -19,15 +21,13 @@ CategorySettingValueMap Manager::mNewSettings = CategorySettingValueMap();
void Manager::loadUser (const std::string& file) void Manager::loadUser (const std::string& file)
{ {
bfs::ifstream fin((bfs::path(file))); Ogre::DataStreamPtr stream = openConstrainedFileDataStream(file.c_str());
Ogre::DataStreamPtr stream((OGRE_NEW Ogre::FileStreamDataStream(file, &fin, false)));
mFile.load(stream); mFile.load(stream);
} }
void Manager::loadDefault (const std::string& file) void Manager::loadDefault (const std::string& file)
{ {
bfs::ifstream fin((bfs::path(file))); Ogre::DataStreamPtr stream = openConstrainedFileDataStream(file.c_str());
Ogre::DataStreamPtr stream((OGRE_NEW Ogre::FileStreamDataStream(file, &fin, false)));
mDefaultFile.load(stream); mDefaultFile.load(stream);
} }