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
16873ae0
Commit
16873ae0
authored
Feb 15, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msvidc32: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4d9519f5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
Makefile.in
dlls/msvidc32/Makefile.in
+0
-1
msvideo1.c
dlls/msvidc32/msvideo1.c
+11
-11
No files found.
dlls/msvidc32/Makefile.in
View file @
16873ae0
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
msvidc32.dll
MODULE
=
msvidc32.dll
IMPORTS
=
user32
IMPORTS
=
user32
...
...
dlls/msvidc32/msvideo1.c
View file @
16873ae0
...
@@ -306,15 +306,15 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
...
@@ -306,15 +306,15 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
TRACE
(
"in->planes = %d
\n
"
,
in
->
bmiHeader
.
biPlanes
);
TRACE
(
"in->planes = %d
\n
"
,
in
->
bmiHeader
.
biPlanes
);
TRACE
(
"in->bpp = %d
\n
"
,
in
->
bmiHeader
.
biBitCount
);
TRACE
(
"in->bpp = %d
\n
"
,
in
->
bmiHeader
.
biBitCount
);
TRACE
(
"in->height = %d
\n
"
,
in
->
bmiHeader
.
biHeight
);
TRACE
(
"in->height = %
l
d
\n
"
,
in
->
bmiHeader
.
biHeight
);
TRACE
(
"in->width = %d
\n
"
,
in
->
bmiHeader
.
biWidth
);
TRACE
(
"in->width = %
l
d
\n
"
,
in
->
bmiHeader
.
biWidth
);
TRACE
(
"in->compr = 0x%x
\n
"
,
in
->
bmiHeader
.
biCompression
);
TRACE
(
"in->compr = 0x%
l
x
\n
"
,
in
->
bmiHeader
.
biCompression
);
if
(
(
in
->
bmiHeader
.
biCompression
!=
CRAM_MAGIC
)
&&
if
(
(
in
->
bmiHeader
.
biCompression
!=
CRAM_MAGIC
)
&&
(
in
->
bmiHeader
.
biCompression
!=
MSVC_MAGIC
)
&&
(
in
->
bmiHeader
.
biCompression
!=
MSVC_MAGIC
)
&&
(
in
->
bmiHeader
.
biCompression
!=
WHAM_MAGIC
)
)
(
in
->
bmiHeader
.
biCompression
!=
WHAM_MAGIC
)
)
{
{
TRACE
(
"can't do 0x%x compression
\n
"
,
in
->
bmiHeader
.
biCompression
);
TRACE
(
"can't do 0x%
l
x compression
\n
"
,
in
->
bmiHeader
.
biCompression
);
return
ICERR_BADFORMAT
;
return
ICERR_BADFORMAT
;
}
}
...
@@ -330,8 +330,8 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
...
@@ -330,8 +330,8 @@ CRAM_DecompressQuery( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO out )
{
{
TRACE
(
"out->planes = %d
\n
"
,
out
->
bmiHeader
.
biPlanes
);
TRACE
(
"out->planes = %d
\n
"
,
out
->
bmiHeader
.
biPlanes
);
TRACE
(
"out->bpp = %d
\n
"
,
out
->
bmiHeader
.
biBitCount
);
TRACE
(
"out->bpp = %d
\n
"
,
out
->
bmiHeader
.
biBitCount
);
TRACE
(
"out->height = %d
\n
"
,
out
->
bmiHeader
.
biHeight
);
TRACE
(
"out->height = %
l
d
\n
"
,
out
->
bmiHeader
.
biHeight
);
TRACE
(
"out->width = %d
\n
"
,
out
->
bmiHeader
.
biWidth
);
TRACE
(
"out->width = %
l
d
\n
"
,
out
->
bmiHeader
.
biWidth
);
if
((
in
->
bmiHeader
.
biBitCount
!=
out
->
bmiHeader
.
biBitCount
)
&&
if
((
in
->
bmiHeader
.
biBitCount
!=
out
->
bmiHeader
.
biBitCount
)
&&
(
in
->
bmiHeader
.
biBitCount
!=
16
||
out
->
bmiHeader
.
biBitCount
!=
24
))
(
in
->
bmiHeader
.
biBitCount
!=
16
||
out
->
bmiHeader
.
biBitCount
!=
24
))
...
@@ -444,7 +444,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD
...
@@ -444,7 +444,7 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD
LONG
width
,
height
,
stride
,
sz
;
LONG
width
,
height
,
stride
,
sz
;
void
*
output
;
void
*
output
;
TRACE
(
"ICM_DECOMPRESS %p %p %d
\n
"
,
info
,
icd
,
size
);
TRACE
(
"ICM_DECOMPRESS %p %p %
l
d
\n
"
,
info
,
icd
,
size
);
if
(
(
info
==
NULL
)
||
(
info
->
dwMagic
!=
CRAM_MAGIC
)
)
if
(
(
info
==
NULL
)
||
(
info
->
dwMagic
!=
CRAM_MAGIC
)
)
return
ICERR_BADPARAM
;
return
ICERR_BADPARAM
;
...
@@ -490,7 +490,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW
...
@@ -490,7 +490,7 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW
LONG
width
,
height
,
stride
,
sz
;
LONG
width
,
height
,
stride
,
sz
;
void
*
output
;
void
*
output
;
TRACE
(
"ICM_DECOMPRESSEX %p %p %d
\n
"
,
info
,
icd
,
size
);
TRACE
(
"ICM_DECOMPRESSEX %p %p %
l
d
\n
"
,
info
,
icd
,
size
);
if
(
(
info
==
NULL
)
||
(
info
->
dwMagic
!=
CRAM_MAGIC
)
)
if
(
(
info
==
NULL
)
||
(
info
->
dwMagic
!=
CRAM_MAGIC
)
)
return
ICERR_BADPARAM
;
return
ICERR_BADPARAM
;
...
@@ -559,7 +559,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
...
@@ -559,7 +559,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
Msvideo1Context
*
info
=
(
Msvideo1Context
*
)
dwDriverId
;
Msvideo1Context
*
info
=
(
Msvideo1Context
*
)
dwDriverId
;
LRESULT
r
=
ICERR_UNSUPPORTED
;
LRESULT
r
=
ICERR_UNSUPPORTED
;
TRACE
(
"%
ld %p %04x %08lx %08l
x
\n
"
,
dwDriverId
,
hdrvr
,
msg
,
lParam1
,
lParam2
);
TRACE
(
"%
Id %p %04x %08Ix %08I
x
\n
"
,
dwDriverId
,
hdrvr
,
msg
,
lParam1
,
lParam2
);
switch
(
msg
)
switch
(
msg
)
{
{
...
@@ -653,7 +653,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
...
@@ -653,7 +653,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
break
;
break
;
default:
default:
FIXME
(
"Unknown message: %04x %
ld %l
d
\n
"
,
msg
,
lParam1
,
lParam2
);
FIXME
(
"Unknown message: %04x %
Id %I
d
\n
"
,
msg
,
lParam1
,
lParam2
);
}
}
return
r
;
return
r
;
...
@@ -664,7 +664,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
...
@@ -664,7 +664,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
*/
*/
BOOL
WINAPI
DllMain
(
HINSTANCE
hModule
,
DWORD
dwReason
,
LPVOID
lpReserved
)
BOOL
WINAPI
DllMain
(
HINSTANCE
hModule
,
DWORD
dwReason
,
LPVOID
lpReserved
)
{
{
TRACE
(
"(%p,%d,%p)
\n
"
,
hModule
,
dwReason
,
lpReserved
);
TRACE
(
"(%p,%
l
d,%p)
\n
"
,
hModule
,
dwReason
,
lpReserved
);
switch
(
dwReason
)
switch
(
dwReason
)
{
{
...
...
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