Skip to content

Support Unicode paths on Windows #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glebm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Unicode paths on Windows #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion libmpq/mpq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@
/* support for platform specific things */
#include "platform.h"

#if defined(_WIN64) || defined(_WIN32)
/* Suppress definitions of `min` and `max` macros by <windows.h>: */
#define NOMINMAX 1
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shlwapi.h>
#endif

/* static error constants. */
static const char *__libmpq_error_strings[] = {
"success",
Expand Down Expand Up @@ -72,6 +80,39 @@ const char *libmpq__strerror(int32_t return_code) {
return __libmpq_error_strings[-return_code];
}

#if defined(_WIN64) || defined(_WIN32)
static wchar_t *to_wide_char(const char *str) {
const size_t size = strlen(str);
const uint32_t flags = MB_ERR_INVALID_CHARS;
const int wide_size = MultiByteToWideChar(CP_UTF8, flags, str, size, NULL, 0);
if (wide_size == 0)
return NULL;
wchar_t *result = malloc(sizeof(wchar_t) * (wide_size + 1));
if (result == NULL) {
return NULL;
}
if (MultiByteToWideChar(CP_UTF8, flags, str, size, result, wide_size) != wide_size) {
free(result);
return NULL;
}
result[wide_size] = L'\0';
return result;
}
#endif

static FILE *fopen_utf8(const char *filename) {
#if defined(_WIN64) || defined(_WIN32)
wchar_t *filename_wide = to_wide_char(filename);
if (filename_wide == NULL) return NULL;
FILE *result = _wfopen(filename_wide, L"rb");
free(filename_wide);
filename_wide = NULL;
return result;
#else
return fopen(filename, "rb");
#endif
}

/* this function read a file and verify if it is a valid mpq archive, then it read and decrypt the hash table. */
int32_t libmpq__archive_open(mpq_archive_s **mpq_archive, const char *mpq_filename, libmpq__off_t archive_offset) {

Expand All @@ -93,7 +134,7 @@ int32_t libmpq__archive_open(mpq_archive_s **mpq_archive, const char *mpq_filena
}

/* check if file exists and is readable */
if (((*mpq_archive)->fp = fopen(mpq_filename, "rb")) == NULL) {
if (((*mpq_archive)->fp = fopen_utf8(mpq_filename)) == NULL) {

/* file could not be opened. */
result = LIBMPQ_ERROR_OPEN;
Expand Down