July 2009 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Fix hittest flag calculation for negative Y values on report mode.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 2f989163bdebb4cf19389ac3e44db8de0d01379c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f989163bdebb4cf19389ac3e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 7 03:44:30 2009 +0400 comctl32/listview: Fix hittest flag calculation for negative Y values on report mode. --- dlls/comctl32/listview.c | 4 +--- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 24da77d..cd1d0d5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6820,9 +6820,7 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, else opt.y = lpht->pt.y; - if (infoPtr->rcList.top > opt.y) - lpht->flags |= LVHT_ABOVE; - else if (infoPtr->rcList.bottom < opt.y) + if (infoPtr->rcList.bottom < opt.y) lpht->flags |= LVHT_BELOW; } else diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index fd0e55c..c0b272b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2675,7 +2675,7 @@ static void test_hittest(void) /* subitem returned with -1 item too */ x = pos.x + 150; y = -10; - test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, TRUE, __LINE__); + test_lvm_subitemhittest(hwnd, x, y, -1, 1, LVHT_NOWHERE, FALSE, FALSE, FALSE, __LINE__); /* parent client area is 100x100 by default */ MoveWindow(hwnd, 0, 0, 300, 100, FALSE); x = pos.x + 150; /* outside column */

1 0

Francois Gouget : ole32: Reorder some compobj functions to avoid forward declarations.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: f8afcdbb7c1e92b9e0f93f363a814a8766974b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8afcdbb7c1e92b9e0f93f363… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 6 08:08:27 2009 +0200 ole32: Reorder some compobj functions to avoid forward declarations. --- dlls/ole32/compobj.c | 794 ++++++++++++++++++++++++------------------------- 1 files changed, 389 insertions(+), 405 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f8afcdbb7c1e92b9e0f93…

1 0

Vincent Povirk : windowscodecs: Implement CopyPalette for BMP decoder.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 3899c3e2472b22156ab2a2e7aeff65ef0212cfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3899c3e2472b22156ab2a2e7a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 11:39:29 2009 -0500 windowscodecs: Implement CopyPalette for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 102 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bmpformat.c | 24 ++++++++ include/wincodec.idl | 1 + 3 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index b81987c..61d68c1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -189,8 +189,101 @@ static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + HRESULT hr; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p)\n", iface, pIPalette); + + if (This->bih.bV5Size == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)&This->bih; + if (bch->bcBitCount <= 8) + { + /* 2**n colors in BGR format after the header */ + int count = 1 << bch->bcBitCount; + WICColor *wiccolors; + ULONG tablesize, bytesread; + RGBTRIPLE *bgrcolors; + LARGE_INTEGER offset; + int i; + + wiccolors = HeapAlloc(GetProcessHeap(), 0, sizeof(WICColor) * count); + tablesize = sizeof(RGBTRIPLE) * count; + bgrcolors = HeapAlloc(GetProcessHeap(), 0, tablesize); + if (!wiccolors || !bgrcolors) + { + HeapFree(GetProcessHeap(), 0, wiccolors); + HeapFree(GetProcessHeap(), 0, bgrcolors); + return E_OUTOFMEMORY; + } + + offset.QuadPart = sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER); + hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + hr = IStream_Read(This->stream, bgrcolors, tablesize, &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != tablesize) return E_FAIL; + + for (i=0; i<count; i++) + { + wiccolors[i] = 0xff000000| + (bgrcolors[i].rgbtRed<<16)| + (bgrcolors[i].rgbtGreen<<8)| + bgrcolors[i].rgbtBlue; + } + + hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); + + HeapFree(GetProcessHeap(), 0, wiccolors); + HeapFree(GetProcessHeap(), 0, bgrcolors); + return hr; + } + else + { + return WINCODEC_ERR_PALETTEUNAVAILABLE; + } + } + else + { + if (This->bih.bV5BitCount <= 8) + { + int count; + WICColor *wiccolors; + ULONG tablesize, bytesread; + LARGE_INTEGER offset; + int i; + + if (This->bih.bV5ClrUsed == 0) + count = 1 << This->bih.bV5BitCount; + else + count = This->bih.bV5ClrUsed; + + tablesize = sizeof(WICColor) * count; + wiccolors = HeapAlloc(GetProcessHeap(), 0, tablesize); + if (!wiccolors) return E_OUTOFMEMORY; + + offset.QuadPart = sizeof(BITMAPFILEHEADER) + This->bih.bV5Size; + hr = IStream_Seek(This->stream, offset, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + hr = IStream_Read(This->stream, wiccolors, tablesize, &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != tablesize) return E_FAIL; + + /* convert from BGR to BGRA by setting alpha to 100% */ + for (i=0; i<count; i++) + wiccolors[i] |= 0xff000000; + + hr = IWICPalette_InitializeCustom(pIPalette, wiccolors, count); + + HeapFree(GetProcessHeap(), 0, wiccolors); + return hr; + } + else + { + return WINCODEC_ERR_PALETTEUNAVAILABLE; + } + } } static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, @@ -536,8 +629,9 @@ static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index fb6f491..d312e80 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -98,6 +98,9 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); if (SUCCEEDED(hr)) { + IWICImagingFactory *factory; + IWICPalette *palette; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); ok(width == 2, "expected width=2, got %u\n", width); @@ -112,6 +115,27 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + rc.X = 0; rc.Y = 0; rc.Width = 3; diff --git a/include/wincodec.idl b/include/wincodec.idl index e5f22e3..d8712b8 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -95,6 +95,7 @@ typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") +cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") interface IWICBitmap; interface IWICComponentInfo;

1 0

Vincent Povirk : windowscodecs: Add test for 1-bit indexed color BMP.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: aec0ccbd77eaaeb1dd1f9952813140b04a45ed0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec0ccbd77eaaeb1dd1f99528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 12:22:21 2009 -0500 windowscodecs: Add test for 1-bit indexed color BMP. --- dlls/windowscodecs/tests/bmpformat.c | 149 ++++++++++++++++++++++++++++++++++ 1 files changed, 149 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index d312e80..6538e66 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -211,11 +211,160 @@ static void test_decode_24bpp(void) IWICBitmapDecoder_Release(decoder); } +static const char testbmp_1bpp[] = { + /* BITMAPFILEHEADER */ + 66,77, /* "BM" */ + 40,0,0,0, /* file size */ + 0,0,0,0, /* reserved */ + 32,0,0,0, /* offset to bits */ + /* BITMAPCOREHEADER */ + 12,0,0,0, /* header size */ + 2,0, /* width */ + 2,0, /* height */ + 1,0, /* planes */ + 1,0, /* bit count */ + /* color table */ + 255,0,0, + 0,255,0, + /* bits */ + 0xc0,0,0,0, + 0x80,0,0,0 +}; + +static void test_decode_1bpp(void) +{ + IWICBitmapDecoder *decoder, *decoder2; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + DWORD capability=0; + GUID guidresult; + UINT count=0, width=0, height=0; + double dpiX, dpiY; + BYTE imagedata[2] = {1}; + const BYTE expected_imagedata[2] = {0x80,0xc0}; + WICColor palettedata[2] = {1}; + const WICColor expected_palettedata[2] = {0xff0000ff,0xff00ff00}; + WICRect rc; + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (!SUCCEEDED(hr)) return; + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_1bpp, sizeof(testbmp_1bpp)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + IWICImagingFactory *factory; + IWICPalette *palette; + + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 2, "expected width=2, got %u\n", width); + ok(height == 2, "expected height=2, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(dpiX == 96.0, "expected dpiX=96.0, got %f\n", dpiX); + ok(dpiY == 96.0, "expected dpiY=96.0, got %f\n", dpiY); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat1bppIndexed), "unexpected pixel format\n"); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(SUCCEEDED(hr), "CopyPalette failed, hr=%x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 2, "expected count=2, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 2, palettedata, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 2, "expected count=2, got %u\n", count); + ok(!memcmp(palettedata, expected_palettedata, sizeof(palettedata)), "unexpected palette data\n"); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, &rc, 1, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + + IWICBitmapFrameDecode_Release(framedecode); + } + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder2); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); + ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); + ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), + "unexpected capabilities: %x\n", capability); + } + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_decode_24bpp(); + test_decode_1bpp(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Add test for 4-bit indexed color BMP.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 6caca236788cfd647246e5e2eed982e85aeb9617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6caca236788cfd647246e5e2e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 12:44:38 2009 -0500 windowscodecs: Add test for 4-bit indexed color BMP. --- dlls/windowscodecs/tests/bmpformat.c | 160 ++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 6538e66..2456245 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -359,12 +360,171 @@ static void test_decode_1bpp(void) IWICBitmapDecoder_Release(decoder); } +static const char testbmp_4bpp[] = { + /* BITMAPFILEHEADER */ + 66,77, /* "BM" */ + 82,0,0,0, /* file size */ + 0,0,0,0, /* reserved */ + 74,0,0,0, /* offset to bits */ + /* BITMAPINFOHEADER */ + 40,0,0,0, /* header size */ + 2,0,0,0, /* width */ + 254,255,255,255, /* height = -2 */ + 1,0, /* planes */ + 4,0, /* bit count */ + 0,0,0,0, /* compression = BI_RGB */ + 0,0,0,0, /* image size = 0 */ + 16,39,0,0, /* X pixels per meter = 10000 */ + 32,78,0,0, /* Y pixels per meter = 20000 */ + 5,0,0,0, /* colors used */ + 5,0,0,0, /* colors important */ + /* color table */ + 255,0,0,0, + 0,255,0,255, + 0,0,255,23, + 128,0,128,1, + 255,255,255,0, + /* bits */ + 0x01,0,0,0, + 0x23,0,0,0, +}; + +static void test_decode_4bpp(void) +{ + IWICBitmapDecoder *decoder, *decoder2; + IWICBitmapFrameDecode *framedecode; + HRESULT hr; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + DWORD capability=0; + GUID guidresult; + UINT count=0, width=0, height=0; + double dpiX, dpiY; + BYTE imagedata[2] = {1}; + const BYTE expected_imagedata[2] = {0x01,0x23}; + WICColor palettedata[5] = {1}; + const WICColor expected_palettedata[5] = + {0xff0000ff,0xff00ff00,0xffff0000,0xff800080,0xffffffff}; + WICRect rc; + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (!SUCCEEDED(hr)) return; + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_4bpp)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_4bpp, sizeof(testbmp_4bpp)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, bmpstream, WICDecodeMetadataCacheOnLoad); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); + ok(count == 1, "unexpected count %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + IWICImagingFactory *factory; + IWICPalette *palette; + + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(SUCCEEDED(hr), "GetSize failed, hr=%x\n", hr); + ok(width == 2, "expected width=2, got %u\n", width); + ok(height == 2, "expected height=2, got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &dpiX, &dpiY); + ok(SUCCEEDED(hr), "GetResolution failed, hr=%x\n", hr); + ok(fabs(dpiX - 254.0) < 0.01, "expected dpiX=96.0, got %f\n", dpiX); + ok(fabs(dpiY - 508.0) < 0.01, "expected dpiY=96.0, got %f\n", dpiY); + + hr = IWICBitmapFrameDecode_GetPixelFormat(framedecode, &guidresult); + ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat4bppIndexed), "unexpected pixel format\n"); + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_CopyPalette(decoder, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(framedecode, palette); + ok(SUCCEEDED(hr), "CopyPalette failed, hr=%x\n", hr); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 5, "expected count=5, got %u\n", count); + + hr = IWICPalette_GetColors(palette, 5, palettedata, &count); + ok(SUCCEEDED(hr), "GetColorCount failed, hr=%x\n", hr); + ok(count == 5, "expected count=5, got %u\n", count); + ok(!memcmp(palettedata, expected_palettedata, sizeof(palettedata)), "unexpected palette data\n"); + + IWICPalette_Release(palette); + } + + IWICImagingFactory_Release(factory); + } + + rc.X = 0; + rc.Y = 0; + rc.Width = 2; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(framedecode, &rc, 1, sizeof(imagedata), imagedata); + ok(SUCCEEDED(hr), "CopyPixels failed, hr=%x\n", hr); + ok(!memcmp(imagedata, expected_imagedata, sizeof(imagedata)), "unexpected image data\n"); + + IWICBitmapFrameDecode_Release(framedecode); + } + + hr = CoCreateInstance(&CLSID_WICBmpDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder2); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_QueryCapability(decoder2, bmpstream, &capability); + ok(hr == S_OK, "QueryCapability failed, hr=%x\n", hr); + ok(capability == (WICBitmapDecoderCapabilityCanDecodeAllImages), + "unexpected capabilities: %x\n", capability); + } + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); test_decode_24bpp(); test_decode_1bpp(); + test_decode_4bpp(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Return proper error codes in unneeded BMP decoder methods.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 387b842707e276a4ca0365370da24fb99db95baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=387b842707e276a4ca0365370… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 13:10:46 2009 -0500 windowscodecs: Return proper error codes in unneeded BMP decoder methods. --- dlls/windowscodecs/bmpdecode.c | 28 ++++++++++++++-------------- dlls/windowscodecs/tests/bmpformat.c | 24 ++++++++++++++++++++++++ include/wincodec.idl | 1 + 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 61d68c1..70923a1 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -311,22 +311,22 @@ static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, static HRESULT WINAPI BmpFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static HRESULT BmpFrameDecode_ReadUncompressed(BmpFrameDecode* This) @@ -637,29 +637,29 @@ static HRESULT WINAPI BmpDecoder_CopyPalette(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpDecoder_GetPreview(IWICBitmapDecoder *iface, IWICBitmapSource **ppIBitmapSource) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapSource); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p): stub\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; } static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 2456245..1ed77e2 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -49,6 +49,9 @@ static void test_decode_24bpp(void) { IWICBitmapDecoder *decoder, *decoder2; IWICBitmapFrameDecode *framedecode; + IWICMetadataQueryReader *queryreader; + IWICColorContext *colorcontext; + IWICBitmapSource *thumbnail; HRESULT hr; HGLOBAL hbmpdata; char *bmpdata; @@ -88,6 +91,18 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &queryreader); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetColorContexts(decoder, 1, &colorcontext, &count); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapDecoder_GetThumbnail(decoder, &thumbnail); + ok(hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "expected WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + + hr = IWICBitmapDecoder_GetPreview(decoder, &thumbnail); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); ok(SUCCEEDED(hr), "GetFrameCount failed, hr=%x\n", hr); ok(count == 1, "unexpected count %u\n", count); @@ -116,6 +131,15 @@ static void test_decode_24bpp(void) ok(SUCCEEDED(hr), "GetPixelFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_WICPixelFormat24bppBGR), "unexpected pixel format\n"); + hr = IWICBitmapFrameDecode_GetMetadataQueryReader(framedecode, &queryreader); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapFrameDecode_GetColorContexts(framedecode, 1, &colorcontext, &count); + ok(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION, "expected WINCODEC_ERR_UNSUPPORTEDOPERATION, got %x\n", hr); + + hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); + ok(hr == WINCODEC_ERR_CODECNOTHUMBNAIL, "expected WINCODEC_ERR_CODECNOTHUMBNAIL, got %x\n", hr); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); diff --git a/include/wincodec.idl b/include/wincodec.idl index d8712b8..691a4fd 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -96,6 +96,7 @@ typedef UINT32 WICColor; cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") +cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") interface IWICBitmap; interface IWICComponentInfo;

1 0

Vincent Povirk : windowscodecs: Add support for decoding RLE8-encoded BMP files.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 07a6b89f87c998a16aa45994bd56286a4533027a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a6b89f87c998a16aa45994b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 15:20:03 2009 -0500 windowscodecs: Add support for decoding RLE8-encoded BMP files. --- dlls/windowscodecs/bmpdecode.c | 111 +++++++++++++++++++++ dlls/windowscodecs/tests/bmpformat.c | 180 ++++++++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07a6b89f87c998a16aa45…

1 0

Vincent Povirk : windowscodecs: Add support for decoding RLE4-encoded BMP files.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 48d58cef5958e6a6a2912a5b8e82eb805ac53fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d58cef5958e6a6a2912a5b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 15:51:44 2009 -0500 windowscodecs: Add support for decoding RLE4-encoded BMP files. --- dlls/windowscodecs/bmpdecode.c | 126 +++++++++++++++++++++++++ dlls/windowscodecs/tests/bmpformat.c | 167 ++++++++++++++++++++++++++++++++++ 2 files changed, 293 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48d58cef5958e6a6a2912…

1 0

Francois Gouget : ole32: Make apartment_addref() static.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: 3cbeae820dbb77bddaea3d65335ddc47cd04b798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cbeae820dbb77bddaea3d653… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 6 08:09:06 2009 +0200 ole32: Make apartment_addref() static. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/compobj_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 801caf0..b2013cf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -312,7 +312,7 @@ static void COMPOBJ_DllList_Free(void) * Manage apartments. */ -DWORD apartment_addref(struct apartment *apt) +static DWORD apartment_addref(struct apartment *apt) { DWORD refs = InterlockedIncrement(&apt->refs); TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 58e3856..fb05934 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -252,7 +252,6 @@ void OLEDD_UnInitialize(void); APARTMENT *apartment_findfromoxid(OXID oxid, BOOL ref); APARTMENT *apartment_findfromtid(DWORD tid); -DWORD apartment_addref(struct apartment *apt); DWORD apartment_release(struct apartment *apt); HRESULT apartment_disconnectproxies(struct apartment *apt); void apartment_disconnectobject(struct apartment *apt, void *object);

1 0

André Hentschel : crypt32: Update German translation.
by Alexandre Julliard 07 Jul '09

07 Jul '09

Module: wine Branch: master Commit: c43968a68dfabd6e683811edab4470a79a5e6905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43968a68dfabd6e683811eda… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 6 18:38:05 2009 +0200 crypt32: Update German translation. --- dlls/crypt32/crypt32_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index 0a8bd38..aa3a456 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -177,6 +177,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Zwischenzertifizierungsstellen" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andere Personen" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrauenswürdige Herausgeber" + IDS_LOCALIZEDNAME_DISALLOWED "Nicht Vertrauenswürdige Zertifikate" } STRINGTABLE DISCARDABLE

1 0