Module: wine Branch: stable Commit: 7e18c69962862094542c822b7415b90fce921311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e18c69962862094542c822b7...
Author: Michael Müller michael@fds-team.de Date: Wed Mar 6 08:57:40 2019 +0100
msvidc32: Fix calculation of stride and size.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25180 Signed-off-by: Vijay Kiran Kamuju infyquest@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit fb7f937305f9242c675d4ff9a7976cf121710159) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/msvfw32/tests/msvfw.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvidc32/msvideo1.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 710959a27d..80d6f35805 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -252,6 +252,45 @@ static void test_Locate(void) ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); bo.biBitCount = 16;
+ bi.biWidth = 553; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + get_stride(552, 8) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + get_stride(552, 16) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biHeight = 17; + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + bi.biHeight = 8; + + bi.biWidth = 32; + bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 9c1323b707..7b866d04ca 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -70,6 +70,11 @@ typedef struct Msvideo1Context { int depth; } Msvideo1Context;
+static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_size, unsigned char *pixels, int stride) @@ -362,12 +367,17 @@ CRAM_DecompressGetFormat( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO o if (in->bmiHeader.biBitCount <= 8) size += in->bmiHeader.biClrUsed * sizeof(RGBQUAD);
+ if (in->bmiHeader.biBitCount != 8 && in->bmiHeader.biBitCount != 16) + return ICERR_BADFORMAT; + if( out ) { memcpy( out, in, size ); + out->bmiHeader.biWidth = in->bmiHeader.biWidth & ~1; + out->bmiHeader.biHeight = in->bmiHeader.biHeight & ~1; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = in->bmiHeader.biHeight - * in->bmiHeader.biWidth *4; + out->bmiHeader.biSizeImage = in->bmiHeader.biHeight * + get_stride(out->bmiHeader.biWidth, out->bmiHeader.biBitCount); return ICERR_OK; }
@@ -398,6 +408,8 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEADER *out_hdr) { int x, y; + int stride_in = get_stride(out_hdr->biWidth, depth_in); + int stride_out = get_stride(out_hdr->biWidth, out_hdr->biBitCount);
if (depth_in == 16 && out_hdr->biBitCount == 24) { @@ -409,15 +421,17 @@ static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEA 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, };
- WORD *src = (WORD *)input; for (y = 0; y < out_hdr->biHeight; y++) { + WORD *src_row = (WORD *)(input + y * stride_in); + char *out_row = output + y * stride_out; + for (x = 0; x < out_hdr->biWidth; x++) { - WORD pixel = *src++; - *output++ = convert_5to8[(pixel & 0x7c00u) >> 10]; - *output++ = convert_5to8[(pixel & 0x03e0u) >> 5]; - *output++ = convert_5to8[(pixel & 0x001fu)]; + WORD pixel = *src_row++; + *out_row++ = convert_5to8[(pixel & 0x7c00u) >> 10]; + *out_row++ = convert_5to8[(pixel & 0x03e0u) >> 5]; + *out_row++ = convert_5to8[(pixel & 0x001fu)]; } } } @@ -439,7 +453,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD
width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage;
output = icd->lpOutput; @@ -452,11 +465,13 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD
if (info->depth == 8) { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpInput, sz, output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpInput, sz, output, stride ); } @@ -484,7 +499,6 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW
width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - stride = width; sz = icd->lpbiSrc->biSizeImage;
output = icd->lpDst; @@ -497,11 +511,13 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW
if (info->depth == 8) { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpSrc, sz, output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpSrc, sz, output, stride ); }