Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e7c06ea6
Commit
e7c06ea6
authored
Apr 01, 2009
by
Jörg Höhle
Committed by
Alexandre Julliard
Apr 08, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Perform case-insensitive FOURCC comparison of built-in video codecs.
parent
513a493f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
iccvid.c
dlls/iccvid/iccvid.c
+2
-1
msrle32.c
dlls/msrle32/msrle32.c
+3
-1
msvfw.c
dlls/msvfw32/tests/msvfw.c
+2
-2
msvideo1.c
dlls/msvidc32/msvideo1.c
+3
-2
No files found.
dlls/iccvid/iccvid.c
View file @
e7c06ea6
...
...
@@ -57,6 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iccvid);
static
HINSTANCE
ICCVID_hModule
;
#define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd')
#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020)
#define DBUG 0
#define MAX_STRIPS 32
...
...
@@ -975,7 +976,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
TRACE
(
"Opened
\n
"
);
if
(
icinfo
&&
icinfo
->
fccType
!=
ICTYPE_VIDEO
)
return
0
;
if
(
icinfo
&&
compare_fourcc
(
icinfo
->
fccType
,
ICTYPE_VIDEO
)
)
return
0
;
info
=
heap_alloc
(
sizeof
(
ICCVID_Info
)
);
if
(
info
)
...
...
dlls/msrle32/msrle32.c
View file @
e7c06ea6
...
...
@@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msrle32);
static
HINSTANCE
MSRLE32_hModule
=
0
;
#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020)
#define ABS(a) ((a) < 0 ? -(a) : (a))
#define SQR(a) ((a) * (a))
...
...
@@ -1114,7 +1116,7 @@ static CodecInfo* Open(LPICOPEN icinfo)
return
(
LPVOID
)
0xFFFF0000
;
}
if
(
icinfo
->
fccType
!=
ICTYPE_VIDEO
)
return
NULL
;
if
(
compare_fourcc
(
icinfo
->
fccType
,
ICTYPE_VIDEO
)
)
return
NULL
;
TRACE
(
"(%p = {%u,0x%08X(%4.4s),0x%08X(%4.4s),0x%X,0x%X,...})
\n
"
,
icinfo
,
icinfo
->
dwSize
,
icinfo
->
fccType
,
(
char
*
)
&
icinfo
->
fccType
,
...
...
dlls/msvfw32/tests/msvfw.c
View file @
e7c06ea6
...
...
@@ -42,12 +42,12 @@ static void test_OpenCase(void)
ok
(
ICClose
(
h
)
==
ICERR_OK
,
"ICClose failed
\n
"
);
}
h
=
ICOpen
(
mmioFOURCC
(
'V'
,
'I'
,
'D'
,
'C'
),
mmioFOURCC
(
'm'
,
's'
,
'v'
,
'c'
),
ICMODE_DECOMPRESS
);
todo_wine
ok
(
0
!=
h
,
"ICOpen(VIDC.msvc) failed
\n
"
);
ok
(
0
!=
h
,
"ICOpen(VIDC.msvc) failed
\n
"
);
if
(
h
)
{
ok
(
ICClose
(
h
)
==
ICERR_OK
,
"ICClose failed
\n
"
);
}
h
=
ICOpen
(
mmioFOURCC
(
'V'
,
'I'
,
'D'
,
'C'
),
mmioFOURCC
(
'M'
,
'S'
,
'V'
,
'C'
),
ICMODE_DECOMPRESS
);
todo_wine
ok
(
0
!=
h
,
"ICOpen(VIDC.MSVC) failed
\n
"
);
ok
(
0
!=
h
,
"ICOpen(VIDC.MSVC) failed
\n
"
);
if
(
h
)
{
ok
(
ICClose
(
h
)
==
ICERR_OK
,
"ICClose failed
\n
"
);
}
...
...
dlls/msvidc32/msvideo1.c
View file @
e7c06ea6
...
...
@@ -7,7 +7,7 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
* version 2
.1
of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
...
...
@@ -50,6 +50,7 @@ static HINSTANCE MSVIDC32_hModule;
#define CRAM_MAGIC mmioFOURCC('C', 'R', 'A', 'M')
#define MSVC_MAGIC mmioFOURCC('M', 'S', 'V', 'C')
#define WHAM_MAGIC mmioFOURCC('W', 'H', 'A', 'M')
#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020)
#define PALETTE_COUNT 256
#define LE_16(x) ((((const uint8_t *)(x))[1] << 8) | ((const uint8_t *)(x))[0])
...
...
@@ -502,7 +503,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
TRACE
(
"Opened
\n
"
);
if
(
icinfo
&&
icinfo
->
fccType
!=
ICTYPE_VIDEO
)
return
0
;
if
(
icinfo
&&
compare_fourcc
(
icinfo
->
fccType
,
ICTYPE_VIDEO
)
)
return
0
;
info
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
Msvideo1Context
)
);
if
(
info
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment