Skip to content

V
vlc-2-2
Commit 58035595 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

WinRT: do not use GetLogicalDrives

parent 6ada7e01
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
src/win32/filesystem.c
View file @ 58035595
...@@ -148,6 +148,7 @@ DIR *vlc_opendir (const char *dirname) ...@@ -148,6 +148,7 @@ DIR *vlc_opendir (const char *dirname)
return NULL; return NULL;
} }
#if !VLC_WINSTORE_APP
/* Special mode to list drive letters */ /* Special mode to list drive letters */
if (wpath[0] == L'\0' || (wcscmp (wpath, L"\\") == 0)) if (wpath[0] == L'\0' || (wcscmp (wpath, L"\\") == 0))
{ {
...@@ -156,6 +157,7 @@ DIR *vlc_opendir (const char *dirname) ...@@ -156,6 +157,7 @@ DIR *vlc_opendir (const char *dirname)
p_dir->u.drives = GetLogicalDrives (); p_dir->u.drives = GetLogicalDrives ();
return (void *)p_dir; return (void *)p_dir;
} }
#endif
assert (wpath[0]); // wpath[1] is defined assert (wpath[0]); // wpath[1] is defined
p_dir->u.insert_dot_dot = !wcscmp (wpath + 1, L":\\"); p_dir->u.insert_dot_dot = !wcscmp (wpath + 1, L":\\");
...@@ -175,6 +177,7 @@ char *vlc_readdir (DIR *dir) ...@@ -175,6 +177,7 @@ char *vlc_readdir (DIR *dir)
{ {
vlc_DIR *p_dir = (vlc_DIR *)dir; vlc_DIR *p_dir = (vlc_DIR *)dir;
#if !VLC_WINSTORE_APP
/* Drive letters mode */ /* Drive letters mode */
if (p_dir->wdir == NULL) if (p_dir->wdir == NULL)
{ {
...@@ -193,6 +196,7 @@ char *vlc_readdir (DIR *dir) ...@@ -193,6 +196,7 @@ char *vlc_readdir (DIR *dir)
return NULL; return NULL;
return ret; return ret;
} }
#endif
if (p_dir->u.insert_dot_dot) if (p_dir->u.insert_dot_dot)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment