Skip to content

V
vlc-2-2
Commit 2ea30990 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

taglib: support long paths on Win32

parent 9197cdff
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
modules/meta_engine/taglib.cpp
View file @ 2ea30990
...@@ -447,14 +447,14 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -447,14 +447,14 @@ static int ReadMeta( vlc_object_t* p_this)
return VLC_ENOMEM; return VLC_ENOMEM;
#if defined(WIN32) || defined (UNDER_CE) #if defined(WIN32) || defined (UNDER_CE)
wchar_t wpath[MAX_PATH + 1]; wchar_t *wpath = ToWide( psz_path );
if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) ) if( wpath == NULL )
{ {
free( psz_path ); free( psz_path );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
wpath[MAX_PATH] = L'\0';
f = FileRef( wpath ); f = FileRef( wpath );
free( wpath );
#else #else
const char* local_name = ToLocale( psz_path ); const char* local_name = ToLocale( psz_path );
if( !local_name ) if( !local_name )
...@@ -679,11 +679,11 @@ static int WriteMeta( vlc_object_t *p_this ) ...@@ -679,11 +679,11 @@ static int WriteMeta( vlc_object_t *p_this )
} }
#if defined(WIN32) || defined (UNDER_CE) #if defined(WIN32) || defined (UNDER_CE)
wchar_t wpath[MAX_PATH + 1]; wchar_t *wpath = ToWide( p_export->psz_file );
if( !MultiByteToWideChar( CP_UTF8, 0, p_export->psz_file, -1, wpath, MAX_PATH) ) if( wpath == NULL )
return VLC_EGENERIC; return VLC_EGENERIC;
wpath[MAX_PATH] = L'\0';
f = FileRef( wpath ); f = FileRef( wpath );
free( wpath );
#else #else
const char* local_name = ToLocale( p_export->psz_file ); const char* local_name = ToLocale( p_export->psz_file );
if( !local_name ) if( !local_name )
......
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