Skip to content

win32: improve loading files from long paths #12119

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

Closed
pgasior wants to merge 1 commit into from
Closed

win32: improve loading files from long paths #12119

Show file tree
Hide file tree
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
41 changes: 35 additions & 6 deletions osdep/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,32 @@ char *mp_to_utf8(void *talloc_ctx, const wchar_t *s)
return ret;
}

wchar_t *mp_get_absolute_path(void *talloc_ctx, const char *path, const wchar_t *prefix) {
size_t prefix_length = wcslen(prefix);
size_t buffer_size = strlen(path) + 1;
wchar_t *buffer = talloc_array(talloc_ctx, wchar_t, buffer_size + prefix_length);
wcscpy(buffer, prefix);
wchar_t *wpath = mp_from_utf8(talloc_ctx, path);
DWORD ret = GetFullPathNameW(wpath, buffer_size, buffer + prefix_length, NULL);
if (ret > buffer_size) {
buffer = talloc_realloc(talloc_ctx, buffer, wchar_t, ret + prefix_length);
GetFullPathNameW(wpath, ret, buffer + prefix_length, NULL);
}
return buffer;
}

wchar_t *mp_resolve_path(void *talloc_ctx, const char *path) {
bstr bpath = bstr0(path);
bool absolute = mp_path_is_absolute(bpath);
if (strncmp("\\\\", path, 2) == 0) {
return mp_get_absolute_path(talloc_ctx, path, L"");
} else if (absolute && bpath.len < MAX_PATH) {
return mp_from_utf8(talloc_ctx, path);
} else {
return mp_get_absolute_path(talloc_ctx, path, L"\\\\?\\");
}
}

#endif // _WIN32

#ifdef __MINGW32__
Expand Down Expand Up @@ -270,12 +296,13 @@ static int hstat(HANDLE h, struct mp_stat *buf)

int mp_stat(const char *path, struct mp_stat *buf)
{
wchar_t *wpath = mp_from_utf8(NULL, path);
void *ctx = talloc_new(NULL);
wchar_t *wpath = mp_resolve_path(ctx, path);
HANDLE h = CreateFileW(wpath, FILE_READ_ATTRIBUTES,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | SECURITY_SQOS_PRESENT |
SECURITY_IDENTIFICATION, NULL);
talloc_free(wpath);
talloc_free(ctx);
if (h == INVALID_HANDLE_VALUE) {
set_errno_from_lasterror();
return -1;
Expand Down Expand Up @@ -458,9 +485,10 @@ int mp_open(const char *filename, int oflag, ...)
}

// Open the Windows file handle
wchar_t *wpath = mp_from_utf8(NULL, filename);
void *ctx = talloc_new(NULL);
wchar_t *wpath = mp_resolve_path(ctx, filename);
HANDLE h = CreateFileW(wpath, access, share, NULL, disposition, flags, NULL);
talloc_free(wpath);
talloc_free(ctx);
if (h == INVALID_HANDLE_VALUE) {
set_errno_from_lasterror();
return -1;
Expand Down Expand Up @@ -562,9 +590,10 @@ struct mp_dir {

DIR* mp_opendir(const char *path)
{
wchar_t *wpath = mp_from_utf8(NULL, path);
void *ctx = talloc_new(NULL);
wchar_t *wpath = mp_resolve_path(ctx, path);
_WDIR *wdir = _wopendir(wpath);
talloc_free(wpath);
talloc_free(ctx);
if (!wdir)
return NULL;
struct mp_dir *mpdir = talloc(NULL, struct mp_dir);
Expand Down
3 changes: 3 additions & 0 deletions osdep/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ void mp_flush_wakeup_pipe(int pipe_end);

#ifdef _WIN32
#include <wchar.h>
#include "options/path.h"
wchar_t *mp_from_utf8(void *talloc_ctx, const char *s);
char *mp_to_utf8(void *talloc_ctx, const wchar_t *s);
wchar_t *mp_get_absolute_path(void *talloc_ctx, const char *path, const wchar_t *prefix);
wchar_t *mp_resolve_path(void *talloc_ctx, const char *path);
#endif

#ifdef __CYGWIN__
Expand Down