rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-13 19:29:14 +01:00
Code Issues Projects Releases Wiki Activity

Handle non-ASCII characters properly in paths

Browse Source
This commit is contained in:
ishitatsuyuki 2020-09-10 12:02:53 +09:00 committed by Philip Rebohle
parent 7bf02a1925
commit bb85a4caa8
10 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d11/d3d11_shader.cpp
View File

@ -27,7 +27,7 @@ namespace dxvk {
const std::string dumpPath = env::getEnvVar("DXVK_SHADER_DUMP_PATH");
if (dumpPath.size() != 0) {
reader.store(std::ofstream(str::format(dumpPath, "/", name, ".dxbc"),
reader.store(std::ofstream(str::tows(str::format(dumpPath, "/", name, ".dxbc").c_str()).c_str(),
std::ios_base::binary | std::ios_base::trunc));
}
@ -43,7 +43,7 @@ namespace dxvk {
if (dumpPath.size() != 0) {
std::ofstream dumpStream(
str::format(dumpPath, "/", name, ".spv"),
str::tows(str::format(dumpPath, "/", name, ".spv").c_str()).c_str(),
std::ios_base::binary | std::ios_base::trunc);
m_shader->dump(dumpStream);

4
src/d3d9/d3d9_fixed_function.cpp
View File

@ -2340,7 +2340,7 @@ namespace dxvk {
if (dumpPath.size() != 0) {
std::ofstream dumpStream(
str::format(dumpPath, "/", Name, ".spv"),
str::tows(str::format(dumpPath, "/", Name, ".spv").c_str()).c_str(),
std::ios_base::binary | std::ios_base::trunc);
m_shader->dump(dumpStream);
@ -2460,4 +2460,4 @@ namespace dxvk {
DxsoIsgn g_ffIsgn = CreateFixedFunctionIsgn();
}
}

8
src/d3d9/d3d9_shader.cpp
View File

@ -32,7 +32,7 @@ namespace dxvk {
DxsoReader reader(
reinterpret_cast<const char*>(pShaderBytecode));
reader.store(std::ofstream(str::format(dumpPath, "/", name, ".dxso"),
reader.store(std::ofstream(str::tows(str::format(dumpPath, "/", name, ".dxso").c_str()).c_str(),
std::ios_base::binary | std::ios_base::trunc), bytecodeLength);
char comment[2048];
@ -44,7 +44,7 @@ namespace dxvk {
&blob);
if (SUCCEEDED(hr)) {
std::ofstream disassembledOut(str::format(dumpPath, "/", name, ".dxso.dis"), std::ios_base::binary | std::ios_base::trunc);
std::ofstream disassembledOut(str::tows(str::format(dumpPath, "/", name, ".dxso.dis").c_str()).c_str(), std::ios_base::binary | std::ios_base::trunc);
disassembledOut.write(
reinterpret_cast<const char*>(blob->GetBufferPointer()),
blob->GetBufferSize());
@ -83,7 +83,7 @@ namespace dxvk {
if (dumpPath.size() != 0) {
std::ofstream dumpStream(
str::format(dumpPath, "/", name, ".spv"),
str::tows(str::format(dumpPath, "/", name, ".spv").c_str()).c_str(),
std::ios_base::binary | std::ios_base::trunc);
m_shaders[0]->dump(dumpStream);
@ -147,4 +147,4 @@ namespace dxvk {
return commonShader;
}
}
}

12
src/dxvk/dxvk_state_cache.cpp
View File

@ -128,12 +128,12 @@ namespace dxvk {
Logger::warn("DXVK: Creating new state cache file");
// Start with an empty file
std::ofstream file(getCacheFileName(),
std::ofstream file(getCacheFileName().c_str(),
std::ios_base::binary |
std::ios_base::trunc);
if (!file && env::createDirectory(getCacheDir())) {
file = std::ofstream(getCacheFileName(),
file = std::ofstream(getCacheFileName().c_str(),
std::ios_base::binary |
std::ios_base::trunc);
}
@ -349,7 +349,7 @@ namespace dxvk {
bool DxvkStateCache::readCacheFile() {
// Open state file and just fail if it doesn't exist
std::ifstream ifile(getCacheFileName(), std::ios_base::binary);
std::ifstream ifile(getCacheFileName().c_str(), std::ios_base::binary);
if (!ifile) {
Logger::warn("DXVK: No state cache file found");
@ -935,7 +935,7 @@ namespace dxvk {
}
if (!file) {
file = std::ofstream(getCacheFileName(),
file = std::ofstream(getCacheFileName().c_str(),
std::ios_base::binary |
std::ios_base::app);
}
@ -945,7 +945,7 @@ namespace dxvk {
}
std::string DxvkStateCache::getCacheFileName() const {
std::wstring DxvkStateCache::getCacheFileName() const {
std::string path = getCacheDir();
if (!path.empty() && *path.rbegin() != '/')
@ -958,7 +958,7 @@ namespace dxvk {
exeName.erase(extp);
path += exeName + ".dxvk-cache";
return path;
return str::tows(path.c_str());
}

4
src/dxvk/dxvk_state_cache.h
View File

@ -176,7 +176,7 @@ namespace dxvk {
void writerFunc();
std::string getCacheFileName() const;
std::wstring getCacheFileName() const;
std::string getCacheDir() const;
@ -191,4 +191,4 @@ namespace dxvk {
};
}
}

2
src/util/config/config.cpp
View File

@ -593,7 +593,7 @@ namespace dxvk {
filePath = "dxvk.conf";
// Open the file if it exists
std::ifstream stream(filePath);
std::ifstream stream(str::tows(filePath.c_str()).c_str());
if (!stream)
return config;

2
src/util/log/log.cpp
View File

@ -10,7 +10,7 @@ namespace dxvk {
auto path = getFileName(file_name);
if (!path.empty())
m_fileStream = std::ofstream(path);
m_fileStream = std::ofstream(str::tows(path.c_str()).c_str());
}
}

11
src/util/util_env.cpp
View File

@ -5,10 +5,13 @@
namespace dxvk::env {
std::string getEnvVar(const char* name) {
char* result = std::getenv(name);
return (result)
? result
: "";
std::vector<WCHAR> result;
result.resize(MAX_PATH + 1);
DWORD len = ::GetEnvironmentVariableW(str::tows(name).c_str(), result.data(), MAX_PATH);
result.resize(len);
return str::fromws(result.data());
}

16
src/util/util_string.cpp
View File

@ -24,4 +24,20 @@ namespace dxvk::str {
wcs, wcsLen);
}
std::wstring tows(const char* mbs) {
size_t len = ::MultiByteToWideChar(CP_UTF8,
0, mbs, -1, nullptr, 0);
if (len <= 1)
return L"";
len -= 1;
std::wstring result;
result.resize(len);
::MultiByteToWideChar(CP_UTF8, 0, mbs, -1,
&result.at(0), len);
return result;
}
}

2
src/util/util_string.h
View File

@ -16,6 +16,8 @@ namespace dxvk::str {
void tows(const char* mbs, WCHAR (&wcs)[N]) {
return tows(mbs, wcs, N);
}
std::wstring tows(const char* mbs);
inline void format1(std::stringstream&) { }