July 2018 - Wine-devel - list.winehq.org

[PATCH v2] windowscodecs: Fix an MSVC warning about pNumericRepresentation.
by Serge Gautherie 28 Jul '18

28 Jul '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\info.c(1461) : error C4133: 'function' : incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *'" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/windowscodecs/info.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107..7dcfd22 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1450,11 +1450,18 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, WICPixelFormatNumericRepresentation *pNumericRepresentation) { + HRESULT hr; + DWORD numrep; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); TRACE("(%p,%p)\n", iface, pNumericRepresentation); - return ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, pNumericRepresentation); + numrep = *pNumericRepresentation; + hr = ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, &numrep); + if (hr == S_OK) + *pNumericRepresentation = numrep; + return hr; } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { -- 2.10.0.windows.1

2 1

[PATCH] windowscodecs: Fix an MSVC warning about pNumericRepresentation.
by Serge Gautherie 28 Jul '18

28 Jul '18

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\info.c(1461) : error C4133: 'function' : incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *'" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/windowscodecs/info.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107..21b9c5d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1450,11 +1450,16 @@ static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, WICPixelFormatNumericRepresentation *pNumericRepresentation) { + HRESULT hr; + DWORD numrep; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); TRACE("(%p,%p)\n", iface, pNumericRepresentation); - return ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, pNumericRepresentation); + hr = ComponentInfo_GetDWORDValue(This->classkey, numericrepresentation_valuename, &numrep); + *pNumericRepresentation = numrep; + return hr; } static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { -- 2.10.0.windows.1

2 5

[PATCH] ntoskrnl: Emulate sti/cli instructions on x86_64
by Fabian Maurer 28 Jul '18

28 Jul '18

Fixes bug 45521. Thanks to Anastasius Focht for the clear bug report. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntoskrnl.exe/instr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index b2dac58fc4..67cdd327ee 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -815,6 +815,11 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } break; /* Unable to emulate it */ } + + case 0xfa: /* cli */ + case 0xfb: /* sti */ + context->Rip += prefixlen + 1; + return ExceptionContinueExecution; } return ExceptionContinueSearch; /* Unable to emulate it */ } -- 2.18.0

1 0

[PATCH v3] sfnt2fon: Prevent reading past allocated buffer
by janisozaur＠gmail.com 28 Jul '18

28 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Some fonts (e.g. Courier) may cause sfnt2fon try reading past end of heap-allocated buffer. Rather than reading from uninitialised memory, return 0 in such case. Visual tests on .fon render of this font (using FontForge) shown no artifacts. This should fix Bug 45422 v2: - Improve C89 compatibility - Use cached index for both left and right bytes v3: - Sign-off Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> --- tools/sfnt2fon/sfnt2fon.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763872..0f788da7e1 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -554,6 +554,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, for(x = 0; x < ((info->dfCharTable[i].width + 7) / 8); x++) { for(y = 0; y < ppem; y++) { + int idx, x_limit; if(y < ascent - face->glyph->bitmap_top || y >= face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { info->data[data_pos++] = 0; @@ -565,16 +566,19 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, info->data[data_pos++] = 0; continue; } + idx = (y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off; if(x == x_off) left_byte = 0; else - left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; + left_byte = face->glyph->bitmap.buffer[idx - 1]; + /* FreeType allocates that many bytes for bitmap, but some fonts (e.g. Courier) might try reading past the buffer */ + x_limit = face->glyph->bitmap.rows * face->glyph->bitmap.pitch; /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ - if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) + if((idx >= x_limit) || (x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8)))) right_byte = 0; else - right_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off]; + right_byte = face->glyph->bitmap.buffer[idx]; byte = (left_byte << (8 - (face->glyph->bitmap_left & 7))) & 0xff; byte |= ((right_byte >> (face->glyph->bitmap_left & 7)) & 0xff); -- 2.18.0

2 1

[PATCH] msvfw32: Reimplement ICGetDisplayFormat().
by Zebediah Figura 27 Jul '18

27 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44490 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msvfw32/msvideo_main.c | 136 ++++++++++++++++-------- dlls/msvfw32/tests/msvfw.c | 246 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 339 insertions(+), 43 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5dc99a4..e3bedd9 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -223,6 +223,15 @@ static int compare_fourcc(DWORD fcc1, DWORD fcc2) return strncasecmp(fcc_str1, fcc_str2, 4); } +static DWORD get_size_image(LONG width, LONG height, WORD depth) +{ + DWORD ret = width * depth; + ret = (ret + 7) / 8; /* divide by byte size, rounding up */ + ret = (ret + 3) & ~3; /* align to 4 bytes */ + ret *= abs(height); + return ret; +} + typedef BOOL (*enum_handler_t)(const char *name, const char *driver, unsigned int index, void *param); static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) @@ -715,57 +724,98 @@ HIC VFWAPI ICLocate(DWORD fccType, DWORD fccHandler, LPBITMAPINFOHEADER lpbiIn, /*********************************************************************** * ICGetDisplayFormat [MSVFW32.@] */ -HIC VFWAPI ICGetDisplayFormat( - HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut, - INT depth,INT dx,INT dy) +HIC VFWAPI ICGetDisplayFormat(HIC hic, BITMAPINFOHEADER *in, BITMAPINFOHEADER *out, + int depth, int width, int height) { - HIC tmphic = hic; + HIC tmphic = hic; - TRACE("(%p,%p,%p,%d,%d,%d)!\n",hic,lpbiIn,lpbiOut,depth,dx,dy); + TRACE("(%p, %p, %p, %d, %d, %d)\n", hic, in, out, depth, width, height); - if (!tmphic) { - tmphic=ICLocate(ICTYPE_VIDEO,0,lpbiIn,NULL,ICMODE_DECOMPRESS); - if (!tmphic) - return tmphic; - } - if ((dy == lpbiIn->biHeight) && (dx == lpbiIn->biWidth)) - dy = dx = 0; /* no resize needed */ + if (!tmphic) + { + tmphic = ICLocate(ICTYPE_VIDEO, 0, in, NULL, ICMODE_DECOMPRESS); + if (!tmphic) + return NULL; + } - /* Can we decompress it ? */ - if (ICDecompressQuery(tmphic,lpbiIn,NULL) != 0) - goto errout; /* no, sorry */ + if (ICDecompressQuery(tmphic, in, NULL)) + goto err; - ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)lpbiIn, (DWORD_PTR)lpbiOut); + if (width <= 0 || height <= 0) + { + width = in->biWidth; + height = in->biHeight; + } - if (lpbiOut->biCompression != 0) { - FIXME("Ooch, how come decompressor outputs compressed data (%d)??\n", - lpbiOut->biCompression); - } - if (lpbiOut->biSize < sizeof(*lpbiOut)) { - FIXME("Ooch, size of output BIH is too small (%d)\n", - lpbiOut->biSize); - lpbiOut->biSize = sizeof(*lpbiOut); - } - if (!depth) { - HDC hdc; + if (!depth) + depth = 32; - hdc = GetDC(0); - depth = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES); - ReleaseDC(0,hdc); - if (depth==15) depth = 16; - if (depth<8) depth = 8; - } - if (lpbiIn->biBitCount == 8) - depth = 8; + *out = *in; + out->biSize = sizeof(*out); + out->biWidth = width; + out->biHeight = height; + out->biCompression = BI_RGB; + out->biSizeImage = get_size_image(width, height, depth); - TRACE("=> %p\n", tmphic); - return tmphic; -errout: - if (hic!=tmphic) - ICClose(tmphic); + /* first try the given depth */ + out->biBitCount = depth; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + { + if (depth == 8) + ICDecompressGetPalette(tmphic, in, out); + return tmphic; + } - TRACE("=> 0\n"); - return 0; + /* then try 16, both with BI_RGB and BI_BITFIELDS */ + if (depth <= 16) + { + out->biBitCount = 16; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + + out->biCompression = BI_BITFIELDS; + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + out->biCompression = BI_RGB; + } + + /* then try 24 */ + if (depth <= 24) + { + out->biBitCount = 24; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + } + + /* then try 32 */ + if (depth <= 32) + { + out->biBitCount = 32; + out->biSizeImage = get_size_image(width, height, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + } + + /* as a last resort, try 32 bpp with the original width and height */ + out->biWidth = in->biWidth; + out->biHeight = in->biHeight; + out->biBitCount = 32; + out->biSizeImage = get_size_image(out->biWidth, out->biHeight, out->biBitCount); + if (!ICDecompressQuery(tmphic, in, out)) + return tmphic; + + /* finally, ask the compressor for its default output format */ + if (!ICSendMessage(tmphic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)in, (DWORD_PTR)out)) + return tmphic; + +err: + if (hic != tmphic) + ICClose(tmphic); + + return NULL; } /*********************************************************************** @@ -1358,7 +1408,7 @@ HANDLE VFWAPI ICImageDecompress( biSizeImage = lpbiOut->bmiHeader.biSizeImage; if ( biSizeImage == 0 ) - biSizeImage = ((((lpbiOut->bmiHeader.biWidth * lpbiOut->bmiHeader.biBitCount + 7) >> 3) + 3) & (~3)) * abs(lpbiOut->bmiHeader.biHeight); + biSizeImage = get_size_image(lpbiOut->bmiHeader.biWidth, lpbiOut->bmiHeader.biHeight, lpbiOut->bmiHeader.biBitCount); TRACE( "call ICDecompressBegin\n" ); diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index beeca9f..5bff6d1 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -316,10 +316,256 @@ static void test_ICInfo(void) ok(info.fccHandler == mmioFOURCC('f','a','k','e'), "got 0x%08x\n", info.fccHandler); } +static int get_display_format_test; + +static DWORD get_size_image(LONG width, LONG height, WORD depth) +{ + DWORD ret = width * depth; + ret = (ret + 7) / 8; /* divide by byte size, rounding up */ + ret = (ret + 3) & ~3; /* align to 4 bytes */ + ret *= abs(height); + return ret; +} + +static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; + +static BITMAPINFOHEADER gdf_in, *gdf_out; + +LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, + LPARAM lparam1, LPARAM lparam2) +{ + LRESULT ret = 0; + + if (winetest_debug > 1) + trace("(%#lx, %p, %#x, %#lx, %#lx)\n", id, driver, msg, lparam1, lparam2); + + switch(msg) + { + case DRV_LOAD: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_FREE: + return 1; + case ICM_DECOMPRESS_QUERY: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; + DWORD expected_size; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + + if (!out) + return ICERR_OK; + + ok(out == gdf_out, "got output %p\n", out); + + ok(out->biSize == sizeof(*out), "got size %d\n", out->biSize); + expected_size = get_size_image(out->biWidth, out->biHeight, out->biBitCount); + ok(out->biSizeImage == expected_size, "expected image size %d, got %d\n", + expected_size, out->biSizeImage); + + ok(out->biPlanes == 0xcccc, "got planes %d\n", out->biPlanes); + ok(out->biXPelsPerMeter == 0xcccccccc && out->biYPelsPerMeter == 0xcccccccc, + "got resolution %dx%d\n", out->biXPelsPerMeter, out->biYPelsPerMeter); + ok(out->biClrUsed == 0xcccccccc, "got biClrUsed %u\n", out->biClrUsed); + ok(out->biClrImportant == 0xcccccccc, "got biClrImportant %u\n", out->biClrImportant); + + switch (get_display_format_test) + { + case 0: + return ICERR_OK; + case 1: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 16) + return ICERR_OK; + break; + case 2: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_BITFIELDS && out->biBitCount == 16) + return ICERR_OK; + break; + case 3: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 24) + return ICERR_OK; + break; + case 4: + if (out->biWidth == 30 && out->biHeight == 40 && out->biCompression == BI_RGB && out->biBitCount == 32) + return ICERR_OK; + break; + case 5: + if (out->biWidth == 10 && out->biHeight == 20 && out->biCompression == BI_RGB && out->biBitCount == 32) + return ICERR_OK; + break; + case 6: + break; + } + + return ICERR_BADFORMAT; + } + case ICM_DECOMPRESS_GET_FORMAT: + { + BITMAPINFOHEADER *out = (BITMAPINFOHEADER *)lparam2; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + if (out) + { + ok(out == gdf_out, "got output %p\n", out); + + memset(out, 0x55, sizeof(*out)); + out->biWidth = 50; + out->biHeight = 60; + out->biBitCount = 0xdead; + out->biCompression = 0xbeef; + out->biSizeImage = 0; + + return ICERR_OK; + } + } + case ICM_DECOMPRESS_GET_PALETTE: + { + BITMAPINFO *out = (BITMAPINFO *)lparam2; + + ok(lparam1 == (LPARAM)&gdf_in, "got input %#lx\n", lparam1); + if (out) + { + ok(out == (BITMAPINFO *)gdf_out, "got output %p\n", out); + + out->bmiHeader.biClrUsed = 1; + out->bmiColors[0] = color_yellow; + + return 0xdeadbeef; + } + } + } + + return ret; +} + +static void check_bitmap_header_(int line, BITMAPINFOHEADER *header, LONG width, LONG height, WORD depth, DWORD compression) +{ + ok_(__FILE__, line)(header->biWidth == width, "expected %d, got %d\n", width, header->biWidth); + ok_(__FILE__, line)(header->biHeight == height, "expected %d, got %d\n", height, header->biHeight); + ok_(__FILE__, line)(header->biBitCount == depth, "expected %d, got %d\n", depth, header->biBitCount); + ok_(__FILE__, line)(header->biCompression == compression, "expected %#x, got %#x\n", compression, header->biCompression); +} +#define check_bitmap_header(a,b,c,d,e) check_bitmap_header_(__LINE__,a,b,c,d,e) + +static void test_ICGetDisplayFormat(void) +{ + static const DWORD testcc = mmioFOURCC('t','e','s','t'); + char outbuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *out_bmi; + LRESULT lres; + BOOL ret; + HIC hic; + + memset(&gdf_in, 0xcc, sizeof(gdf_in)); + gdf_in.biSize = sizeof(gdf_in); + gdf_in.biWidth = 10; + gdf_in.biHeight = 20; + gdf_in.biBitCount = 1; + gdf_in.biCompression = testcc; + + ret = ICInstall(ICTYPE_VIDEO, testcc, (LPARAM)gdf_driver_proc, NULL, ICINSTALL_FUNCTION); + ok(ret, "ICInstall failed\n"); + + hic = ICOpen(ICTYPE_VIDEO, testcc, ICMODE_DECOMPRESS); + ok(ret, "ICOpen failed\n"); + + memset(outbuf, 0, sizeof(outbuf)); + gdf_out = (BITMAPINFOHEADER *)outbuf; + + /* ICGetDisplayFormat tries several default formats; make sure those work */ + get_display_format_test = 0; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 1, BI_RGB); + + get_display_format_test = 1; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 16, BI_RGB); + + get_display_format_test = 2; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 16, BI_BITFIELDS); + + get_display_format_test = 3; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 24, BI_RGB); + + get_display_format_test = 4; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 32, BI_RGB); + + get_display_format_test = 5; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 32, BI_RGB); + + /* if every default format is rejected, the output of + * ICM_DECOMPRESS_GET_FORMAT is returned */ + get_display_format_test = 6; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 50, 60, 0xdead, 0xbeef); + + /* given bpp is treated as a lower bound */ + get_display_format_test = 1; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 24, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 50, 60, 0xdead, 0xbeef); + + get_display_format_test = 3; + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 24, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 24, BI_RGB); + + get_display_format_test = 0; + + /* width or height <= 0 causes the input width and height to be supplied */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 0, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, 0); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, -10, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 1, 30, -10); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 10, 20, 1, BI_RGB); + + /* zero bpp causes 32 bpp to be supplied */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 0, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 32, BI_RGB); + + /* specifying 8 bpp yields a request for palette colours */ + hic = ICGetDisplayFormat(hic, &gdf_in, gdf_out, 8, 30, 40); + ok(hic != NULL, "ICGetDisplayFormat failed\n"); + check_bitmap_header(gdf_out, 30, 40, 8, BI_RGB); + ok(gdf_out->biClrUsed == 1, "got biClrUsed %u\n", gdf_out->biClrUsed); + out_bmi = (BITMAPINFO *)gdf_out; + ok(!memcmp(&out_bmi->bmiColors[0], &color_yellow, sizeof(color_yellow)), + "got wrong colour\n"); + + lres = ICClose(hic); + ok(lres == ICERR_OK, "got %ld\n", lres); + + ret = ICRemove(ICTYPE_VIDEO, testcc, 0); + ok(ret, "ICRemove failed\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); test_ICInfo(); + test_ICGetDisplayFormat(); } -- 2.7.4

2 1

Wine-staging patch request.
by Alistair Leslie-Hughes 27 Jul '18

27 Jul '18

Hi, Since this wine release cycle has been extended. I was looking a do a release of staging next Friday. Do you have any patches not yet sent that could do with some extra testing? Let us know, so we can consider them for the next release. Regards Alistair

1 0

[PATCH] dxdiagn: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/provider.c | 92 +++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1fdab5e2db..ec30574b84 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -494,7 +494,7 @@ static BOOL is_netmeeting_running(void) for (i = 0; i < list_count; i++) { - if (get_process_name_from_pid(pid_list[i], process_name, sizeof(process_name)/sizeof(WCHAR)) && + if (get_process_name_from_pid(pid_list[i], process_name, ARRAY_SIZE(process_name)) && !lstrcmpW(conf_exe, process_name)) { HeapFree(GetProcessHeap(), 0, pid_list); @@ -518,21 +518,23 @@ static HRESULT fill_language_information(IDxDiagContainerImpl_Container *node) HRESULT hr; /* szLanguagesLocalized */ - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SNATIVELANGNAME, system_lang, sizeof(system_lang)/sizeof(WCHAR)); - LoadStringW(dxdiagn_instance, IDS_REGIONAL_SETTING, regional_setting, sizeof(regional_setting)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SNATIVELANGNAME, user_lang, sizeof(user_lang)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SNATIVELANGNAME, system_lang, ARRAY_SIZE(system_lang)); + LoadStringW(dxdiagn_instance, IDS_REGIONAL_SETTING, regional_setting, ARRAY_SIZE(regional_setting)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SNATIVELANGNAME, user_lang, ARRAY_SIZE(user_lang)); - snprintfW(language_str, sizeof(language_str)/sizeof(WCHAR), languages_fmtW, system_lang, regional_setting, user_lang); + snprintfW(language_str, ARRAY_SIZE(language_str), languages_fmtW, system_lang, regional_setting, + user_lang); hr = add_bstr_property(node, szLanguagesLocalized, language_str); if (FAILED(hr)) return hr; /* szLanguagesEnglish */ - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE, system_lang, sizeof(system_lang)/sizeof(WCHAR)); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SENGLANGUAGE, user_lang, sizeof(user_lang)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SENGLANGUAGE, system_lang, ARRAY_SIZE(system_lang)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SENGLANGUAGE, user_lang, ARRAY_SIZE(user_lang)); - snprintfW(language_str, sizeof(language_str)/sizeof(WCHAR), languages_fmtW, system_lang, regional_setting_engW, user_lang); + snprintfW(language_str, ARRAY_SIZE(language_str), languages_fmtW, system_lang, + regional_setting_engW, user_lang); hr = add_bstr_property(node, szLanguagesEnglish, language_str); if (FAILED(hr)) @@ -555,21 +557,21 @@ static HRESULT fill_datetime_information(IDxDiagContainerImpl_Container *node) GetLocalTime(&curtime); - GetTimeFormatW(LOCALE_NEUTRAL, 0, &curtime, time_fmtW, time_str, sizeof(time_str)/sizeof(WCHAR)); + GetTimeFormatW(LOCALE_NEUTRAL, 0, &curtime, time_fmtW, time_str, ARRAY_SIZE(time_str)); /* szTimeLocalized */ - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &curtime, NULL, date_str, sizeof(date_str)/sizeof(WCHAR)); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, &curtime, NULL, date_str, ARRAY_SIZE(date_str)); - snprintfW(datetime_str, sizeof(datetime_str)/sizeof(WCHAR), datetime_fmtW, date_str, time_str); + snprintfW(datetime_str, ARRAY_SIZE(datetime_str), datetime_fmtW, date_str, time_str); hr = add_bstr_property(node, szTimeLocalized, datetime_str); if (FAILED(hr)) return hr; /* szTimeEnglish */ - GetDateFormatW(LOCALE_NEUTRAL, 0, &curtime, date_fmtW, date_str, sizeof(date_str)/sizeof(WCHAR)); + GetDateFormatW(LOCALE_NEUTRAL, 0, &curtime, date_fmtW, date_str, ARRAY_SIZE(date_str)); - snprintfW(datetime_str, sizeof(datetime_str)/sizeof(WCHAR), datetime_fmtW, date_str, time_str); + snprintfW(datetime_str, ARRAY_SIZE(datetime_str), datetime_fmtW, date_str, time_str); hr = add_bstr_property(node, szTimeEnglish, datetime_str); if (FAILED(hr)) @@ -596,7 +598,7 @@ static HRESULT fill_os_string_information(IDxDiagContainerImpl_Container *node, /* FIXME: OS detection should be performed, and localized OS strings * should contain translated versions of the "build" phrase. */ - for (i = 0; i < sizeof(prop_list)/sizeof(prop_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(prop_list); i++) { hr = add_bstr_property(node, prop_list[i], winxpW); if (FAILED(hr)) @@ -798,25 +800,26 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) return hr; /* FIXME: Roundoff should not be done with truncated division. */ - snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), physmem_fmtW, (DWORD)(msex.ullTotalPhys / (1024 * 1024))); + snprintfW(print_buf, ARRAY_SIZE(print_buf), physmem_fmtW, + (DWORD)(msex.ullTotalPhys / (1024 * 1024))); hr = add_bstr_property(node, szPhysicalMemoryEnglish, print_buf); if (FAILED(hr)) return hr; usedpage_mb = (DWORD)((msex.ullTotalPageFile - msex.ullAvailPageFile) / (1024 * 1024)); availpage_mb = (DWORD)(msex.ullAvailPageFile / (1024 * 1024)); - LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, sizeof(localized_pagefile_fmt)/sizeof(WCHAR)); + LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, + ARRAY_SIZE(localized_pagefile_fmt)); args[0] = usedpage_mb; args[1] = availpage_mb; - FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - localized_pagefile_fmt, 0, 0, print_buf, - sizeof(print_buf)/sizeof(*print_buf), (__ms_va_list*)args); + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, localized_pagefile_fmt, + 0, 0, print_buf, ARRAY_SIZE(print_buf), (__ms_va_list*)args); hr = add_bstr_property(node, szPageFileLocalized, print_buf); if (FAILED(hr)) return hr; - snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), pagefile_fmtW, usedpage_mb, availpage_mb); + snprintfW(print_buf, ARRAY_SIZE(print_buf), pagefile_fmtW, usedpage_mb, availpage_mb); hr = add_bstr_property(node, szPageFileEnglish, print_buf); if (FAILED(hr)) @@ -828,7 +831,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; - count = sizeof(computer_name)/sizeof(WCHAR); + count = ARRAY_SIZE(computer_name); if (!GetComputerNameW(computer_name, &count)) return E_FAIL; @@ -984,7 +987,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node DWORD available_mem = 0; BOOL hardware_accel; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index); + snprintfW(buffer, ARRAY_SIZE(buffer), adapterid_fmtW, index); display_adapter = allocate_information_node(buffer); if (!display_adapter) { @@ -1001,9 +1004,11 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node WCHAR descriptionW[sizeof(adapter_info.Description)]; WCHAR devicenameW[sizeof(adapter_info.DeviceName)]; - MultiByteToWideChar(CP_ACP, 0, adapter_info.Driver, -1, driverW, sizeof(driverW)/sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, adapter_info.Description, -1, descriptionW, sizeof(descriptionW)/sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, adapter_info.DeviceName, -1, devicenameW, sizeof(devicenameW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.Driver, -1, driverW, ARRAY_SIZE(driverW)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.Description, -1, descriptionW, + ARRAY_SIZE(descriptionW)); + MultiByteToWideChar(CP_ACP, 0, adapter_info.DeviceName, -1, devicenameW, + ARRAY_SIZE(devicenameW)); hr = add_bstr_property(display_adapter, szDriverName, driverW); if (FAILED(hr)) @@ -1017,7 +1022,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), driverversion_fmtW, + snprintfW(buffer, ARRAY_SIZE(buffer), driverversion_fmtW, HIWORD(adapter_info.DriverVersion.u.HighPart), LOWORD(adapter_info.DriverVersion.u.HighPart), HIWORD(adapter_info.DriverVersion.u.LowPart), LOWORD(adapter_info.DriverVersion.u.LowPart)); @@ -1025,22 +1030,22 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.VendorId); + snprintfW(buffer, ARRAY_SIZE(buffer), id_fmtW, adapter_info.VendorId); hr = add_bstr_property(display_adapter, szVendorId, buffer); if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.DeviceId); + snprintfW(buffer, ARRAY_SIZE(buffer), id_fmtW, adapter_info.DeviceId); hr = add_bstr_property(display_adapter, szDeviceId, buffer); if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), subsysid_fmtW, adapter_info.SubSysId); + snprintfW(buffer, ARRAY_SIZE(buffer), subsysid_fmtW, adapter_info.SubSysId); hr = add_bstr_property(display_adapter, szSubSysId, buffer); if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), id_fmtW, adapter_info.Revision); + snprintfW(buffer, ARRAY_SIZE(buffer), id_fmtW, adapter_info.Revision); hr = add_bstr_property(display_adapter, szRevisionId, buffer); if (FAILED(hr)) goto cleanup; @@ -1074,7 +1079,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (FAILED(hr)) goto cleanup; - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), mode_fmtW, adapter_mode.Width, adapter_mode.Height, + snprintfW(buffer, ARRAY_SIZE(buffer), mode_fmtW, adapter_mode.Width, adapter_mode.Height, depth_for_pixelformat(adapter_mode.Format), adapter_mode.RefreshRate); hr = add_bstr_property(display_adapter, szDisplayModeLocalized, buffer); @@ -1109,7 +1114,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem)) WARN("get_texture_memory helper failed\n"); - snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, available_mem / 1000000.0f); + snprintfW(buffer, ARRAY_SIZE(buffer), mem_fmt, available_mem / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1288,7 +1293,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container { static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; - snprintfW(buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, tmp / 1000000.0f); + snprintfW(buffer, ARRAY_SIZE(buffer), mem_fmt, tmp / 1000000.0f); hr = add_bstr_property(display_adapter, szDisplayMemoryLocalized, buffer); if (FAILED(hr)) @@ -1329,7 +1334,7 @@ static HRESULT fill_display_information_fallback(IDxDiagContainerImpl_Container if (FAILED(hr)) goto cleanup; - for (tmp = 0; tmp < sizeof(empty_properties)/sizeof(empty_properties[0]); tmp++) + for (tmp = 0; tmp < ARRAY_SIZE(empty_properties); tmp++) { hr = add_bstr_property(display_adapter, empty_properties[tmp], szEmpty); if (FAILED(hr)) @@ -1465,12 +1470,9 @@ static HRESULT fill_file_description(IDxDiagContainerImpl_Container *node, const if (boolret) { - snprintfW(szVersion_v, sizeof(szVersion_v)/sizeof(szVersion_v[0]), - szVersionFormat, - HIWORD(pFileInfo->dwFileVersionMS), - LOWORD(pFileInfo->dwFileVersionMS), - HIWORD(pFileInfo->dwFileVersionLS), - LOWORD(pFileInfo->dwFileVersionLS)); + snprintfW(szVersion_v, ARRAY_SIZE(szVersion_v), szVersionFormat, + HIWORD(pFileInfo->dwFileVersionMS), LOWORD(pFileInfo->dwFileVersionMS), + HIWORD(pFileInfo->dwFileVersionLS), LOWORD(pFileInfo->dwFileVersionLS)); TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); @@ -1542,14 +1544,14 @@ static HRESULT build_directxfiles_tree(IDxDiagContainerImpl_Container *node) GetSystemDirectoryW(szFilePath, MAX_PATH); - for (i = 0; i < sizeof(dlls) / sizeof(dlls[0]); i++) + for (i = 0; i < ARRAY_SIZE(dlls); i++) { static const WCHAR szFormat[] = {'%','d',0}; WCHAR szFileID[5]; IDxDiagContainerImpl_Container *file_container; - snprintfW(szFileID, sizeof(szFileID)/sizeof(szFileID[0]), szFormat, i); + snprintfW(szFileID, ARRAY_SIZE(szFileID), szFormat, i); file_container = allocate_information_node(szFileID); if (!file_container) @@ -1624,7 +1626,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc goto cleanup; pRF = ((REGFILTER2**)ppRF)[0]; - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); + snprintfW(bufferW, ARRAY_SIZE(bufferW), szVersionFormat, pRF->dwVersion); hr = add_bstr_property(subcont, szVersionW, bufferW); if (FAILED(hr)) goto cleanup; @@ -1796,7 +1798,7 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node WCHAR bufferW[10]; IDxDiagContainerImpl_Container *subcont; - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); + snprintfW(bufferW, ARRAY_SIZE(bufferW), szIdFormat, i); subcont = allocate_information_node(bufferW); if (!subcont) { @@ -1893,7 +1895,7 @@ static HRESULT build_information_tree(IDxDiagContainerImpl_Container **pinfo_roo if (!info_root) return E_OUTOFMEMORY; - for (index = 0; index < sizeof(root_children)/sizeof(root_children[0]); index++) + for (index = 0; index < ARRAY_SIZE(root_children); index++) { IDxDiagContainerImpl_Container *node; HRESULT hr; -- 2.14.4

1 0

[PATCH] d3d8: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c967a33d8c..364798f79b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2126,7 +2126,7 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); - if (Type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (Type >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid Type %#x passed.\n", Type); return D3D_OK; @@ -2152,7 +2152,7 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, type, value); - if (type >= sizeof(tss_lookup) / sizeof(*tss_lookup)) + if (type >= ARRAY_SIZE(tss_lookup)) { WARN("Invalid type %#x passed.\n", type); return D3D_OK; -- 2.14.4

2 1

[PATCH] d3d10: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 10d8404559..cd6f4a3e1d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1139,7 +1139,7 @@ static const struct d3d10_effect_state_property_info *get_property_info(UINT id) { unsigned int i; - for (i = 0; i < sizeof(property_info) / sizeof(*property_info); ++i) + for (i = 0; i < ARRAY_SIZE(property_info); ++i) { if (property_info[i].id == id) return &property_info[i]; @@ -1152,7 +1152,7 @@ static const struct d3d10_effect_state_storage_info *get_storage_info(D3D_SHADER { unsigned int i; - for (i = 0; i < sizeof(d3d10_effect_state_storage_info) / sizeof(*d3d10_effect_state_storage_info); ++i) + for (i = 0; i < ARRAY_SIZE(d3d10_effect_state_storage_info); ++i) { if (d3d10_effect_state_storage_info[i].id == id) return &d3d10_effect_state_storage_info[i]; -- 2.14.4

2 1

[PATCH] dx8vb: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 27 Jul '18

27 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dx8vb/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index aa6b9436ce..a1ee7c918e 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -157,13 +157,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) && !IsEqualGUID( &IID_IUnknown, riid)) return E_NOINTERFACE; - for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

2 1