Skip to content

W
wine-cw
Commit 96d7fac2 authored by Per Johansson's avatar Per Johansson Committed by Alexandre Julliard
Browse files
Options

wineqtdecoder: Avoid CFSTR in global initializer.

parent 842525f4
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
dlls/wineqtdecoder/qtdatahandler.c
View file @ 96d7fac2
...@@ -324,19 +324,19 @@ static pascal ComponentResult myDataHGetFileTypeOrdering ( DataHandler dh, ...@@ -324,19 +324,19 @@ static pascal ComponentResult myDataHGetFileTypeOrdering ( DataHandler dh,
} }
typedef struct { typedef struct {
const CFStringRef fname; const char *const fname;
const int sig_length; const int sig_length;
const BYTE sig[10]; const BYTE sig[10];
} signature; } signature;
static const signature stream_sigs[] = { static const signature stream_sigs[] = {
{CFSTR("video.asf"),4,{0x30,0x26,0xb2,0x75}}, {"video.asf",4,{0x30,0x26,0xb2,0x75}},
{CFSTR("video.mov"),8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}}, {"video.mov",8,{0x00,0x00,0x00,0x14,0x66,0x74,0x79,0x70}},
{CFSTR("video.mp4"),8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}}, {"video.mp4",8,{0x00,0x00,0x00,0x18,0x66,0x74,0x79,0x70}},
{CFSTR("video.m4v"),8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}}, {"video.m4v",8,{0x00,0x00,0x00,0x1c,0x66,0x74,0x79,0x70}},
{CFSTR("video.flv"),4,{0x46,0x4C,0x56,0x01}}, {"video.flv",4,{0x46,0x4C,0x56,0x01}},
{CFSTR("video.mpg"),3,{0x00,0x00,0x01}}, {"video.mpg",3,{0x00,0x00,0x01}},
{CFSTR("avideo.rm"),4,{0x2E,0x52,0x4D,0x46}} {"avideo.rm",4,{0x2E,0x52,0x4D,0x46}}
}; };
static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str) static pascal ComponentResult myDataHGetFileName ( DataHandler dh, Str255 str)
...@@ -364,7 +364,8 @@ 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++) for (i=0; i < sizeof(stream_sigs)/sizeof(signature); i++)
if (memcmp(header, stream_sigs[i].sig, stream_sigs[i].sig_length)==0) 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; return noErr;
} }
......
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