From fc872b5b15f16bd89a9df09d20efe7bae7e6e30f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 12 Jan 2011 20:32:10 +0100 Subject: [PATCH] avifil32: Append the *.* extension by hand after loading the string. --- dlls/avifil32/api.c | 19 +++++-------------- dlls/avifil32/avifile_Cs.rc | 2 +- dlls/avifil32/avifile_Da.rc | 2 +- dlls/avifil32/avifile_De.rc | 2 +- dlls/avifil32/avifile_En.rc | 2 +- dlls/avifil32/avifile_Es.rc | 2 +- dlls/avifil32/avifile_Fr.rc | 2 +- dlls/avifil32/avifile_He.rc | 2 +- dlls/avifil32/avifile_Hu.rc | 2 +- dlls/avifil32/avifile_It.rc | 2 +- dlls/avifil32/avifile_Ja.rc | 2 +- dlls/avifil32/avifile_Ko.rc | 2 +- dlls/avifil32/avifile_Lt.rc | 2 +- dlls/avifil32/avifile_Nl.rc | 2 +- dlls/avifil32/avifile_No.rc | 2 +- dlls/avifil32/avifile_Pl.rc | 2 +- dlls/avifil32/avifile_Pt.rc | 4 ++-- dlls/avifil32/avifile_Ro.rc | 2 +- dlls/avifil32/avifile_Ru.rc | 2 +- dlls/avifil32/avifile_Si.rc | 2 +- dlls/avifil32/avifile_Sr.rc | 4 ++-- dlls/avifil32/avifile_Sv.rc | 2 +- dlls/avifil32/avifile_Tr.rc | 2 +- dlls/avifil32/avifile_Uk.rc | 2 +- dlls/avifil32/avifile_Zh.rc | 4 ++-- 25 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 11eb4dd5434..ea532244c56 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -995,6 +995,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) */ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) { + static const WCHAR all_files[] = { '*','.','*',0,0 }; static const WCHAR szClsid[] = {'C','L','S','I','D',0}; static const WCHAR szExtensionFmt[] = {';','*','.','%','s',0}; static const WCHAR szAVIFileExtensions[] = @@ -1117,22 +1118,12 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) /* add "All files" "*.*" filter if enough space left */ size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, - szAllFiles, sizeof(szAllFiles)/sizeof(szAllFiles[0])) + 1; + szAllFiles, (sizeof(szAllFiles) - sizeof(all_files))/sizeof(WCHAR)) + 1; + memcpy( szAllFiles + size, all_files, sizeof(all_files) ); + size += sizeof(all_files) / sizeof(WCHAR); + if (cbFilter > size) { - int i; - - /* replace '@' with \000 to separate description of filter */ - for (i = 0; i < size && szAllFiles[i] != 0; i++) { - if (szAllFiles[i] == '@') { - szAllFiles[i] = 0; - break; - } - } - memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0])); - szFilter += size; - szFilter[0] = 0; - return AVIERR_OK; } else { szFilter[0] = 0; diff --git a/dlls/avifil32/avifile_Cs.rc b/dlls/avifil32/avifile_Cs.rc index 98301f11ad5..cdd3c894476 100644 --- a/dlls/avifil32/avifile_Cs.rc +++ b/dlls/avifil32/avifile_Cs.rc @@ -49,7 +49,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "Všechny soubory multimédií" - IDS_ALLFILES "Všechny soubory (*.*)@*.*" + IDS_ALLFILES "Všechny soubory (*.*)" IDS_VIDEO "video" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Da.rc b/dlls/avifil32/avifile_Da.rc index 191e07e5093..ff2c8bc3b79 100644 --- a/dlls/avifil32/avifile_Da.rc +++ b/dlls/avifil32/avifile_Da.rc @@ -46,7 +46,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Lydkurve: %s" IDS_WAVEFILETYPE "Lydkurve" IDS_ALLMULTIMEDIA "Alle multimedia filer" - IDS_ALLFILES "Alle filer (*.*)@*.*" + IDS_ALLFILES "Alle filer (*.*)" IDS_VIDEO "video" IDS_AUDIO "lyd" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_De.rc b/dlls/avifil32/avifile_De.rc index 0448c9ea292..a1727fc59df 100644 --- a/dlls/avifil32/avifile_De.rc +++ b/dlls/avifil32/avifile_De.rc @@ -45,7 +45,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "Alle Multimedia-Dateien" - IDS_ALLFILES "Alle Dateien (*.*)@*.*" + IDS_ALLFILES "Alle Dateien (*.*)" IDS_VIDEO "Video" IDS_AUDIO "Audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_En.rc b/dlls/avifil32/avifile_En.rc index 98efdf7a3ba..ef55bdb6207 100644 --- a/dlls/avifil32/avifile_En.rc +++ b/dlls/avifil32/avifile_En.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "All multimedia files" - IDS_ALLFILES "All files (*.*)@*.*" + IDS_ALLFILES "All files (*.*)" IDS_VIDEO "video" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Es.rc b/dlls/avifil32/avifile_Es.rc index b62fe82c3bb..6170327b0f2 100644 --- a/dlls/avifil32/avifile_Es.rc +++ b/dlls/avifil32/avifile_Es.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Formato de ondas: %s" IDS_WAVEFILETYPE "Formato de ondas" IDS_ALLMULTIMEDIA "Todos los archivos multimedia" - IDS_ALLFILES "Todos los archivos (*.*)@*.*" + IDS_ALLFILES "Todos los archivos (*.*)" IDS_VIDEO "vídeo" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Fr.rc b/dlls/avifil32/avifile_Fr.rc index fc58730c486..e8e088e6ef5 100644 --- a/dlls/avifil32/avifile_Fr.rc +++ b/dlls/avifil32/avifile_Fr.rc @@ -50,7 +50,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform : %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "Tous les fichiers multimédia" - IDS_ALLFILES "Tous les fichiers (*.*)@*.*" + IDS_ALLFILES "Tous les fichiers (*.*)" IDS_VIDEO "vidéo" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_He.rc b/dlls/avifil32/avifile_He.rc index fb04558e936..9dfcd1151e8 100644 --- a/dlls/avifil32/avifile_He.rc +++ b/dlls/avifil32/avifile_He.rc @@ -47,7 +47,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "כל קובצי המולטימדיה" - IDS_ALLFILES "כל ×”×§×‘×¦×™× (*.*)@*.*" + IDS_ALLFILES "כל ×”×§×‘×¦×™× (*.*)" IDS_VIDEO "ויד×ו" IDS_AUDIO "שמע" IDS_AVISTREAMFORMAT "%s %s מס׳ %d" diff --git a/dlls/avifil32/avifile_Hu.rc b/dlls/avifil32/avifile_Hu.rc index 29652efa9b5..c148b799c58 100644 --- a/dlls/avifil32/avifile_Hu.rc +++ b/dlls/avifil32/avifile_Hu.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Hullámforma: %s" IDS_WAVEFILETYPE "Hullámforma" IDS_ALLMULTIMEDIA "Minden multimédia fájl" - IDS_ALLFILES "Minden fájl (*.*)@*.*" + IDS_ALLFILES "Minden fájl (*.*)" IDS_VIDEO "video" IDS_AUDIO "hang" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_It.rc b/dlls/avifil32/avifile_It.rc index 6e2b5823612..0d4010ebda2 100644 --- a/dlls/avifil32/avifile_It.rc +++ b/dlls/avifil32/avifile_It.rc @@ -44,7 +44,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Formato wave: %s" IDS_WAVEFILETYPE "Formato wave" IDS_ALLMULTIMEDIA "Tutti i file multimediali" - IDS_ALLFILES "Tutti i file (*.*)@*.*" + IDS_ALLFILES "Tutti i file (*.*)" IDS_VIDEO "Video" IDS_AUDIO "Audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Ja.rc b/dlls/avifil32/avifile_Ja.rc index c62c03fc05d..df707b52fc0 100644 --- a/dlls/avifil32/avifile_Ja.rc +++ b/dlls/avifil32/avifile_Ja.rc @@ -46,7 +46,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveファイル: %s" IDS_WAVEFILETYPE "Waveファイル" IDS_ALLMULTIMEDIA "å…¨ã¦ã®ãƒžãƒ«ãƒãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«" - IDS_ALLFILES "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)@*.*" + IDS_ALLFILES "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ« (*.*)" IDS_VIDEO "ビデオ" IDS_AUDIO "音声" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Ko.rc b/dlls/avifil32/avifile_Ko.rc index 6b548e6a49f..e31ecdf1c32 100644 --- a/dlls/avifil32/avifile_Ko.rc +++ b/dlls/avifil32/avifile_Ko.rc @@ -46,7 +46,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "파형: %s" IDS_WAVEFILETYPE "파형" IDS_ALLMULTIMEDIA "모든 멀티미디어 파ì¼" - IDS_ALLFILES "모든 íŒŒì¼ (*.*)@*.*" + IDS_ALLFILES "모든 íŒŒì¼ (*.*)" IDS_VIDEO "비디오" IDS_AUDIO "오디오" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Lt.rc b/dlls/avifil32/avifile_Lt.rc index 353d830aac5..db4da1a3435 100644 --- a/dlls/avifil32/avifile_Lt.rc +++ b/dlls/avifil32/avifile_Lt.rc @@ -46,7 +46,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Bangos forma: %s" IDS_WAVEFILETYPE "Bangos forma" IDS_ALLMULTIMEDIA "Visi multimedijos failai" - IDS_ALLFILES "Visi failai (*.*)@*.*" + IDS_ALLFILES "Visi failai (*.*)" IDS_VIDEO "vaizdas" IDS_AUDIO "garsas" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Nl.rc b/dlls/avifil32/avifile_Nl.rc index d3ad0120e7d..08663449c6b 100644 --- a/dlls/avifil32/avifile_Nl.rc +++ b/dlls/avifil32/avifile_Nl.rc @@ -45,7 +45,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "Alle multimediabestanden" - IDS_ALLFILES "Alle bestanden (*.*)@*.*" + IDS_ALLFILES "Alle bestanden (*.*)" IDS_VIDEO "video" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_No.rc b/dlls/avifil32/avifile_No.rc index 193ee156847..7dcce8289d2 100644 --- a/dlls/avifil32/avifile_No.rc +++ b/dlls/avifil32/avifile_No.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Lydformat: %s" IDS_WAVEFILETYPE "Lydformat" IDS_ALLMULTIMEDIA "Alle multimedia-filer" - IDS_ALLFILES "Alle filer (*.*)@*.*" + IDS_ALLFILES "Alle filer (*.*)" IDS_VIDEO "video" IDS_AUDIO "lyd" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Pl.rc b/dlls/avifil32/avifile_Pl.rc index 50d074c2ae2..9087d86bb7b 100644 --- a/dlls/avifil32/avifile_Pl.rc +++ b/dlls/avifil32/avifile_Pl.rc @@ -44,7 +44,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Kszta³t fali: %s" IDS_WAVEFILETYPE "Kszta³t fali" IDS_ALLMULTIMEDIA "Wszystkie pliki multimedialne" - IDS_ALLFILES "Wszystkie pliki (*.*)@*.*" + IDS_ALLFILES "Wszystkie pliki (*.*)" IDS_VIDEO "obraz" IDS_AUDIO "dŸwiêk" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Pt.rc b/dlls/avifil32/avifile_Pt.rc index 5c1d3d3a111..3dfd04208a0 100644 --- a/dlls/avifil32/avifile_Pt.rc +++ b/dlls/avifil32/avifile_Pt.rc @@ -70,7 +70,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Formato wave: %s" IDS_WAVEFILETYPE "Formato wave" IDS_ALLMULTIMEDIA "Todos arquivos multimídia" - IDS_ALLFILES "Todos os arquivos (*.*)@*.*" + IDS_ALLFILES "Todos os arquivos (*.*)" IDS_VIDEO "vídeo" IDS_AUDIO "áudio" IDS_AVISTREAMFORMAT "%s %s #%d" @@ -85,7 +85,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Formato wave: %s" IDS_WAVEFILETYPE "Formato wave" IDS_ALLMULTIMEDIA "Todos os ficheiros multimédia" - IDS_ALLFILES "Todos os ficheiros (*.*)@*.*" + IDS_ALLFILES "Todos os ficheiros (*.*)" IDS_VIDEO "vídeo" IDS_AUDIO "áudio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Ro.rc b/dlls/avifil32/avifile_Ro.rc index d7af7da00e3..483c57e1085 100644 --- a/dlls/avifil32/avifile_Ro.rc +++ b/dlls/avifil32/avifile_Ro.rc @@ -48,7 +48,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Forma de undă: %s" IDS_WAVEFILETYPE "Formă de undă" IDS_ALLMULTIMEDIA "Toate fiÈ™ierele multimedia" - IDS_ALLFILES "Toate fiÈ™ierele (*.*)@*.*" + IDS_ALLFILES "Toate fiÈ™ierele (*.*)" IDS_VIDEO "video" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Ru.rc b/dlls/avifil32/avifile_Ru.rc index b2a61b2c5ca..a5e223309ea 100644 --- a/dlls/avifil32/avifile_Ru.rc +++ b/dlls/avifil32/avifile_Ru.rc @@ -48,7 +48,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Звуковой поток: %s" IDS_WAVEFILETYPE "Звуковой поток" IDS_ALLMULTIMEDIA "Ð’Ñе файлы мультимедиа" - IDS_ALLFILES "Ð’Ñе файлы (*.*)@*.*" + IDS_ALLFILES "Ð’Ñе файлы (*.*)" IDS_VIDEO "видео" IDS_AUDIO "аудио" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Si.rc b/dlls/avifil32/avifile_Si.rc index 160999fa19d..46e281b5058 100644 --- a/dlls/avifil32/avifile_Si.rc +++ b/dlls/avifil32/avifile_Si.rc @@ -45,7 +45,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "Vse veÄpredstavnostne datoteke" - IDS_ALLFILES "Vse datoteke (*.*)@*.*" + IDS_ALLFILES "Vse datoteke (*.*)" IDS_VIDEO "video" IDS_AUDIO "avdio" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Sr.rc b/dlls/avifil32/avifile_Sr.rc index ab9bf4b2294..254dbc3f392 100644 --- a/dlls/avifil32/avifile_Sr.rc +++ b/dlls/avifil32/avifile_Sr.rc @@ -46,7 +46,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "ТалаÑни облик: %s" IDS_WAVEFILETYPE "ТалаÑни облик" IDS_ALLMULTIMEDIA "Све мултимедијалне датотеке" - IDS_ALLFILES "Све датотеке (*.*)@*.*" + IDS_ALLFILES "Све датотеке (*.*)" IDS_VIDEO "видео запиÑ" IDS_AUDIO "аудио запиÑ" IDS_AVISTREAMFORMAT "%s %s #%d" @@ -79,7 +79,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Talasni oblik: %s" IDS_WAVEFILETYPE "Talasni oblik" IDS_ALLMULTIMEDIA "Sve multimedijalne datoteke" - IDS_ALLFILES "Sve datoteke (*.*)@*.*" + IDS_ALLFILES "Sve datoteke (*.*)" IDS_VIDEO "video zapis" IDS_AUDIO "audio zapis" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Sv.rc b/dlls/avifil32/avifile_Sv.rc index 2fba9211fba..c259ea84af9 100644 --- a/dlls/avifil32/avifile_Sv.rc +++ b/dlls/avifil32/avifile_Sv.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Vågform: %s" IDS_WAVEFILETYPE "Vågform" IDS_ALLMULTIMEDIA "Alla multimediafiler" - IDS_ALLFILES "Alla filer (*.*)@*.*" + IDS_ALLFILES "Alla filer (*.*)" IDS_VIDEO "video" IDS_AUDIO "ljud" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Tr.rc b/dlls/avifil32/avifile_Tr.rc index 37cdf950624..d70dd400182 100644 --- a/dlls/avifil32/avifile_Tr.rc +++ b/dlls/avifil32/avifile_Tr.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Waveform: %s" IDS_WAVEFILETYPE "Waveform" IDS_ALLMULTIMEDIA "Tüm çokluortam dosyalarý" - IDS_ALLFILES "Tüm dosyalar (*.*)@*.*" + IDS_ALLFILES "Tüm dosyalar (*.*)" IDS_VIDEO "vidyo" IDS_AUDIO "ses" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Uk.rc b/dlls/avifil32/avifile_Uk.rc index f70335e5a19..32809868c3d 100644 --- a/dlls/avifil32/avifile_Uk.rc +++ b/dlls/avifil32/avifile_Uk.rc @@ -43,7 +43,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "Çâóêîâèé ïîò³ê: %s" IDS_WAVEFILETYPE "Çâóêîâèé ïîò³ê" IDS_ALLMULTIMEDIA "Óñ³ ìóëüòèìåä³éí³ ôàéëè" - IDS_ALLFILES "Óñ³ ôàéëè (*.*)@*.*" + IDS_ALLFILES "Óñ³ ôàéëè (*.*)" IDS_VIDEO "â³äåî" IDS_AUDIO "àóä³î" IDS_AVISTREAMFORMAT "%s %s #%d" diff --git a/dlls/avifil32/avifile_Zh.rc b/dlls/avifil32/avifile_Zh.rc index 3d1553e97ee..f401498782a 100644 --- a/dlls/avifil32/avifile_Zh.rc +++ b/dlls/avifil32/avifile_Zh.rc @@ -48,7 +48,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "波形: %s" IDS_WAVEFILETYPE "波形" IDS_ALLMULTIMEDIA "所有多媒体文件" - IDS_ALLFILES "所有文件 (*.*)@*.*" + IDS_ALLFILES "所有文件 (*.*)" IDS_VIDEO "视频" IDS_AUDIO "音频" IDS_AVISTREAMFORMAT "%s %s #%d" @@ -81,7 +81,7 @@ STRINGTABLE IDS_WAVESTREAMFORMAT "波形: %s" IDS_WAVEFILETYPE "波形" IDS_ALLMULTIMEDIA "所有多媒體檔案" - IDS_ALLFILES "所有檔案 (*.*)@*.*" + IDS_ALLFILES "所有檔案 (*.*)" IDS_VIDEO "視頻" IDS_AUDIO "音頻" IDS_AVISTREAMFORMAT "%s %s #%d"