ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineqtdecoder: Avoid CFSTR in global initializer.

This commit is contained in:
Per Johansson 2012-08-01 22:35:57 +03:00 committed by Alexandre Julliard
parent 842525f423
commit 96d7fac296
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/wineqtdecoder/qtdatahandler.c
View File

@ -324,19 +324,19 @@ static pascal ComponentResult myDataHGetFileTypeOrdering ( DataHandler dh,
}
typedef struct {
const CFStringRef fname;
const char *const fname;
const int sig_length;
const BYTE sig[10];
} signature;
static const signature stream_sigs[] = {
{CFSTR("video.asf"),4,{0x30,0x26,0xb2,0x75}},
{CFSTR("video.mov"),8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}},
{CFSTR("video.mp4"),8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}},
{CFSTR("video.m4v"),8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}},
{CFSTR("video.flv"),4,{0x46,0x4C,0x56,0x01}},
{CFSTR("video.mpg"),3,{0x00,0x00,0x01}},
{CFSTR("avideo.rm"),4,{0x2E,0x52,0x4D,0x46}}
{"video.asf",4,{0x30,0x26,0xb2,0x75}},
{"video.mov",8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}},
{"video.mp4",8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}},
{"video.m4v",8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}},
{"video.flv",4,{0x46,0x4C,0x56,0x01}},
{"video.mpg",3,{0x00,0x00,0x01}},
{"avideo.rm",4,{0x2E,0x52,0x4D,0x46}}
};
static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str)
@ -364,7 +364,8 @@ static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str)
for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++)
if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0)
{
CFStringGetPascalString(stream_sigs[i].fname,str,256,kCFStringEncodingMacRoman);
str[0] = strlen(stream_sigs[i].fname);
memcpy(str + 1, stream_sigs[i].fname, str[0]);
return noErr;
}