avifil32: The stream format string cannot really be translated so remove it from the resources.
Francois Gouget
fgouget at free.fr
Fri Aug 26 08:34:03 CDT 2011
---
dlls/avifil32/avifil32.rc | 1 -
dlls/avifil32/avifile.c | 4 +---
dlls/avifil32/avifile_private.h | 1 -
3 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/dlls/avifil32/avifil32.rc b/dlls/avifil32/avifil32.rc
index 3c17a23..2ec7ef1 100644
--- a/dlls/avifil32/avifil32.rc
+++ b/dlls/avifil32/avifil32.rc
@@ -30,7 +30,6 @@ STRINGTABLE
IDS_ALLFILES "All files (*.*)"
IDS_VIDEO "video"
IDS_AUDIO "audio"
- IDS_AVISTREAMFORMAT "%s %s #%d"
IDS_AVIFILETYPE "Wine AVI-default-filehandler"
IDS_UNCOMPRESSED "uncompressed"
}
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 702ba1c..f37395f 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -1746,10 +1746,10 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
case ckidSTREAMHEADER:
{
static const WCHAR streamTypeFmt[] = {'%','4','.','4','h','s',0};
+ static const WCHAR streamNameFmt[] = {'%','s',' ','%','s',' ','#','%','d',0};
AVIStreamHeader streamHdr;
WCHAR szType[25];
- WCHAR streamNameFmt[25];
UINT count;
LONG n = ck.cksize;
@@ -1796,8 +1796,6 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This)
memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName));
- LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)/sizeof(streamNameFmt[0]));
-
/* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */
wsprintfW(pStream->sInfo.szName, streamNameFmt,
AVIFILE_BasenameW(This->szFileName), szType, count);
diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h
index d35aa0f..b9390c6 100644
--- a/dlls/avifil32/avifile_private.h
+++ b/dlls/avifil32/avifile_private.h
@@ -49,7 +49,6 @@
#define IDS_ALLFILES 0x0185
#define IDS_VIDEO 0x0189
#define IDS_AUDIO 0x0190
-#define IDS_AVISTREAMFORMAT 0x0191
#define IDS_AVIFILETYPE 0x0192
#define IDS_UNCOMPRESSED 0x0193
--
1.7.5.4
More information about the wine-patches
mailing list