ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Fix Unicode directory handling

This commit is contained in:
Jeffrey Pfau 2016-10-13 13:42:12 -07:00
parent 135b345652
commit 124f9de7b7
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -4,6 +4,7 @@ Bugfixes:
- GBA BIOS: Fix MidiKey2Freq BIOS reads - GBA BIOS: Fix MidiKey2Freq BIOS reads
- GBA BIOS: Fix invalid CpuSet not setting BIOS prefetch - GBA BIOS: Fix invalid CpuSet not setting BIOS prefetch
- GB MBC: Fix SRAM dangling pointer with RTC games - GB MBC: Fix SRAM dangling pointer with RTC games
- Windows: Fix Unicode directory handling
0.5.1: (2016-10-05) 0.5.1: (2016-10-05)
Bugfixes: Bugfixes:

58
src/platform/windows/vfs-w32.c
View File

@ -6,6 +6,7 @@
#include "util/vfs.h" #include "util/vfs.h"
#include "util/string.h" #include "util/string.h"
#include <strsafe.h>
static bool _vdwClose(struct VDir* vd); static bool _vdwClose(struct VDir* vd);
static void _vdwRewind(struct VDir* vd); static void _vdwRewind(struct VDir* vd);
@ -20,7 +21,8 @@ static enum VFSType _vdweType(struct VDirEntry* vde);
struct VDirW32; struct VDirW32;
struct VDirEntryW32 { struct VDirEntryW32 {
struct VDirEntry d; struct VDirEntry d;
WIN32_FIND_DATA ffData; WIN32_FIND_DATAW ffData;
char* utf8Name;
}; };
struct VDirW32 { struct VDirW32 {
@ -34,10 +36,11 @@ struct VDir* VDirOpen(const char* path) {
if (!path || !path[0]) { if (!path || !path[0]) {
return 0; return 0;
} }
char name[MAX_PATH]; wchar_t name[MAX_PATH + 1];
_snprintf(name, sizeof(name), "%s\\*", path); MultiByteToWideChar(CP_UTF8, 0, path, -1, name, MAX_PATH);
WIN32_FIND_DATA ffData; StringCchCatNW(name, MAX_PATH, L"\\*", 2);
HANDLE handle = FindFirstFile(name, &ffData); WIN32_FIND_DATAW ffData;
HANDLE handle = FindFirstFileW(name, &ffData);
if (handle == INVALID_HANDLE_VALUE) { if (handle == INVALID_HANDLE_VALUE) {
return 0; return 0;
} }
@ -67,6 +70,11 @@ struct VDir* VDirOpen(const char* path) {
bool _vdwClose(struct VDir* vd) { bool _vdwClose(struct VDir* vd) {
struct VDirW32* vdw = (struct VDirW32*) vd; struct VDirW32* vdw = (struct VDirW32*) vd;
FindClose(vdw->handle); FindClose(vdw->handle);
free(vdw->path);
if (vdw->vde.utf8Name) {
free(vdw->vde.utf8Name);
vdw->vde.utf8Name = NULL;
}
free(vdw); free(vdw);
return true; return true;
} }
@ -74,14 +82,23 @@ bool _vdwClose(struct VDir* vd) {
void _vdwRewind(struct VDir* vd) { void _vdwRewind(struct VDir* vd) {
struct VDirW32* vdw = (struct VDirW32*) vd; struct VDirW32* vdw = (struct VDirW32*) vd;
FindClose(vdw->handle); FindClose(vdw->handle);
char name[MAX_PATH]; wchar_t name[MAX_PATH + 1];
_snprintf(name, sizeof(name), "%s\\*", vdw->path); MultiByteToWideChar(CP_UTF8, MB_PRECOMPOSED, vdw->path, -1, name, MAX_PATH);
vdw->handle = FindFirstFile(name, &vdw->vde.ffData); StringCchCatNW(name, MAX_PATH, L"\\*", 2);
if (vdw->vde.utf8Name) {
free(vdw->vde.utf8Name);
vdw->vde.utf8Name = NULL;
}
vdw->handle = FindFirstFileW(name, &vdw->vde.ffData);
} }
struct VDirEntry* _vdwListNext(struct VDir* vd) { struct VDirEntry* _vdwListNext(struct VDir* vd) {
struct VDirW32* vdw = (struct VDirW32*) vd; struct VDirW32* vdw = (struct VDirW32*) vd;
if (FindNextFile(vdw->handle, &vdw->vde.ffData)) { if (FindNextFileW(vdw->handle, &vdw->vde.ffData)) {
if (vdw->vde.utf8Name) {
free(vdw->vde.utf8Name);
vdw->vde.utf8Name = NULL;
}
return &vdw->vde.d; return &vdw->vde.d;
} }
@ -94,8 +111,9 @@ struct VFile* _vdwOpenFile(struct VDir* vd, const char* path, int mode) {
return 0; return 0;
} }
const char* dir = vdw->path; const char* dir = vdw->path;
char* combined = malloc(sizeof(char) * (strlen(path) + strlen(dir) + 2)); size_t size = sizeof(char) * (strlen(path) + strlen(dir) + 2);
sprintf(combined, "%s\\%s", dir, path); char* combined = malloc(size);
StringCbPrintf(combined, size, "%s\\%s", dir, path);
struct VFile* file = VFileOpen(combined, mode); struct VFile* file = VFileOpen(combined, mode);
free(combined); free(combined);
@ -108,8 +126,9 @@ struct VDir* _vdwOpenDir(struct VDir* vd, const char* path) {
return 0; return 0;
} }
const char* dir = vdw->path; const char* dir = vdw->path;
char* combined = malloc(sizeof(char) * (strlen(path) + strlen(dir) + 2)); size_t size = sizeof(char) * (strlen(path) + strlen(dir) + 2);
sprintf(combined, "%s\\%s", dir, path); char* combined = malloc(size);
StringCbPrintf(combined, size, "%s\\%s", dir, path);
struct VDir* vd2 = VDirOpen(combined); struct VDir* vd2 = VDirOpen(combined);
if (!vd2) { if (!vd2) {
@ -125,8 +144,9 @@ bool _vdwDeleteFile(struct VDir* vd, const char* path) {
return 0; return 0;
} }
const char* dir = vdw->path; const char* dir = vdw->path;
char* combined = malloc(sizeof(char) * (strlen(path) + strlen(dir) + 2)); size_t size = sizeof(char) * (strlen(path) + strlen(dir) + 2);
sprintf(combined, "%s\\%s", dir, path); char* combined = malloc(size);
StringCbPrintf(combined, size, "%s\\%s", dir, path);
bool ret = DeleteFile(combined); bool ret = DeleteFile(combined);
free(combined); free(combined);
@ -135,7 +155,13 @@ bool _vdwDeleteFile(struct VDir* vd, const char* path) {
const char* _vdweName(struct VDirEntry* vde) { const char* _vdweName(struct VDirEntry* vde) {
struct VDirEntryW32* vdwe = (struct VDirEntryW32*) vde; struct VDirEntryW32* vdwe = (struct VDirEntryW32*) vde;
return vdwe->ffData.cFileName; if (vdwe->utf8Name) {
return vdwe->utf8Name;
}
size_t len = 4 * wcslen(vdwe->ffData.cFileName);
vdwe->utf8Name = malloc(len);
WideCharToMultiByte(CP_UTF8, 0, vdwe->ffData.cFileName, -1, vdwe->utf8Name, len - 1, NULL, NULL);
return vdwe->utf8Name;
} }
static enum VFSType _vdweType(struct VDirEntry* vde) { static enum VFSType _vdweType(struct VDirEntry* vde) {