wchar_t vbuffer[MAX_PATH];
wchar_t dbuffer[256];
- if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, FONT_DIR_NT, 0, KEY_READ, &hKey) != ERROR_SUCCESS )
+ size_t fontname_len = strlen( font_name );
+
+ if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, FONT_DIR_NT, 0, KEY_READ, &hKey)
+ != ERROR_SUCCESS )
return 1;
for( int index = 0;; index++ )
DWORD vbuflen = MAX_PATH - 1;
DWORD dbuflen = 255;
- if( RegEnumValueW( hKey, index, vbuffer, &vbuflen,
- NULL, NULL, (LPBYTE)dbuffer, &dbuflen) != ERROR_SUCCESS )
- return 2;
+ LONG i_result = RegEnumValueW( hKey, index, vbuffer, &vbuflen,
+ NULL, NULL, (LPBYTE)dbuffer, &dbuflen);
+ if( i_result != ERROR_SUCCESS )
+ return i_result;
char *psz_value = FromWide( vbuffer );
break;
}
else {
- if( strcasecmp( psz_value, font_name ) == 0 )
+ if( strncasecmp( psz_value, font_name, fontname_len ) == 0 )
break;
}
}
{
VLC_UNUSED( i_size );
+ if( strlen( family ) < 1 )
+ goto fail;
+
/* */
LOGFONT lf;
lf.lfCharSet = DEFAULT_CHARSET;
}
}
else /* Let's take any font we can */
+fail:
{
char *psz_tmp;
if( asprintf( &psz_tmp, "%s\\%s", p_filter->p_sys->psz_win_fonts_path, "arial.ttf" ) == -1 )