November 2011 - Wine-Commits

Nikolay Sivov : msxml3: Return qualified name from get_nodeName().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: ede880a1c38899dbe16467e30d59697e357363e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede880a1c38899dbe16467e30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 16 00:31:40 2011 +0300 msxml3: Return qualified name from get_nodeName(). --- dlls/msxml3/node.c | 27 ++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1df7331..38102ec 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -128,12 +128,33 @@ xmlnode *get_node_obj(IXMLDOMNode *node) HRESULT node_get_nodeName(xmlnode *This, BSTR *name) { + BSTR prefix, base; + HRESULT hr; + if (!name) return E_INVALIDARG; - *name = bstr_from_xmlChar(This->node->name); - if (!*name) - return S_FALSE; + hr = node_get_base_name(This, &base); + if (hr != S_OK) return hr; + + hr = node_get_prefix(This, &prefix); + if (hr == S_OK) + { + static const WCHAR colW = ':'; + WCHAR *ptr; + + /* +1 for ':' */ + ptr = *name = SysAllocStringLen(NULL, SysStringLen(base) + SysStringLen(prefix) + 1); + memcpy(ptr, prefix, SysStringByteLen(prefix)); + ptr += SysStringLen(prefix); + memcpy(ptr++, &colW, sizeof(WCHAR)); + memcpy(ptr, base, SysStringByteLen(base)); + + SysFreeString(base); + SysFreeString(prefix); + } + else + *name = base; return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 699382f..3999b95 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7009,7 +7009,7 @@ static void test_namespaces(void) hr = IXMLDOMNode_get_nodeName(node2, &str); EXPECT_HR(hr, S_OK); - todo_wine ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW( str, _bstr_("Model:Package")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); /* Test get_namespaceURI */ @@ -7030,7 +7030,7 @@ static void test_namespaces(void) hr = IXMLDOMAttribute_get_nodeName(attr, &str); EXPECT_HR(hr, S_OK); - todo_wine ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW( str, _bstr_("Model:name2")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); hr = IXMLDOMAttribute_get_prefix(attr, &str);

1 0

Vincent Povirk : windowscodecs: Add tests for IWICMetadataReader.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: b2fa99851c9d739d7f94eff1b5c54fe3b779087a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2fa99851c9d739d7f94eff1b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 15 15:09:31 2011 -0600 windowscodecs: Add tests for IWICMetadataReader. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/bmpformat.c | 1 + dlls/windowscodecs/tests/metadata.c | 192 ++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 8 ++ 4 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index 51b54d4..048fc29 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ converter.c \ icoformat.c \ info.c \ + metadata.c \ palette.c \ stream.c diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 378c375..f264533 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -25,6 +25,7 @@ #include "initguid.h" #include "objbase.h" #include "wincodec.h" +#include "wincodecsdk.h" #include "wine/test.h" static const char testbmp_24bpp[] = { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c new file mode 100644 index 0000000..d9008a4 --- /dev/null +++ b/dlls/windowscodecs/tests/metadata.c @@ -0,0 +1,192 @@ +/* + * Copyright 2011 Vincent Povirk for CodeWeavers + * + * 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.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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <math.h> + +#define COBJMACROS + +#include "windef.h" +#include "objbase.h" +#include "wincodec.h" +#include "wincodecsdk.h" +#include "wine/test.h" + +#define expect_blob(propvar, data, length) do { \ + ok((propvar).vt == VT_BLOB, "unexpected vt: %i\n", (propvar).vt); \ + if ((propvar).vt == VT_BLOB) { \ + ok((propvar).blob.cbSize == (length), "expected size %i, got %i\n", (length), (propvar).blob.cbSize); \ + if ((propvar).blob.cbSize == (length)) { \ + ok(!memcmp((propvar).blob.pBlobData, (data), (length)), "unexpected data\n"); \ + } \ + } \ +} while (0) + +static const char metadata_unknown[] = "lalala"; + +static const char metadata_tEXt[] = { + 0,0,0,14, /* chunk length */ + 't','E','X','t', /* chunk type */ + 'w','i','n','e','t','e','s','t',0, /* keyword */ + 'v','a','l','u','e', /* text */ + 0x3f,0x64,0x19,0xf3 /* chunk CRC */ +}; + +static void load_stream(IUnknown *reader, const char *data, int data_size) +{ + HRESULT hr; + IWICPersistStream *persist; + IStream *stream; + HGLOBAL hdata; + void *locked_data; + + hdata = GlobalAlloc(GMEM_MOVEABLE, data_size); + ok(hdata != 0, "GlobalAlloc failed\n"); + if (!hdata) return; + + locked_data = GlobalLock(hdata); + memcpy(locked_data, data, data_size); + GlobalUnlock(hdata); + + hr = CreateStreamOnHGlobal(hdata, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void**)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); + + IWICPersistStream_Release(persist); + } + + IStream_Release(stream); +} + +static void test_metadata_unknown(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + PROPVARIANT schema, id, value; + ULONG items_returned; + + hr = CoCreateInstance(&CLSID_WICUnknownMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_unknown, sizeof(metadata_unknown)); + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_OK, "Next failed, hr=%x\n", hr); + ok(items_returned == 1, "unexpected item count %i\n", items_returned); + + if (hr == S_OK && items_returned == 1) + { + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + ok(id.vt == VT_EMPTY, "unexpected vt: %i\n", id.vt); + expect_blob(value, metadata_unknown, sizeof(metadata_unknown)); + + PropVariantClear(&schema); + PropVariantClear(&id); + PropVariantClear(&value); + } + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_FALSE, "Next failed, hr=%x\n", hr); + ok(items_returned == 0, "unexpected item count %i\n", items_returned); + + IWICEnumMetadataItem_Release(enumerator); + } + + IWICMetadataReader_Release(reader); +} + +static void test_metadata_tEXt(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + IWICEnumMetadataItem *enumerator; + PROPVARIANT schema, id, value; + ULONG items_returned; + + hr = CoCreateInstance(&CLSID_WICPngTextMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_tEXt, sizeof(metadata_tEXt)); + + hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); + ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_OK, "Next failed, hr=%x\n", hr); + ok(items_returned == 1, "unexpected item count %i\n", items_returned); + + if (hr == S_OK && items_returned == 1) + { + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(id.pszVal, "winetest"), "unexpected id: %s\n", id.pszVal); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal); + + PropVariantClear(&schema); + PropVariantClear(&id); + PropVariantClear(&value); + } + + hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned); + ok(hr == S_FALSE, "Next failed, hr=%x\n", hr); + ok(items_returned == 0, "unexpected item count %i\n", items_returned); + + IWICEnumMetadataItem_Release(enumerator); + } + + IWICMetadataReader_Release(reader); +} + +START_TEST(metadata) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_metadata_unknown(); + test_metadata_tEXt(); + + CoUninitialize(); +} diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index ed00cfb..e32971c 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -34,6 +34,14 @@ typedef enum WICMetadataCreationOptions { WICMetadataCreationMask = 0xFFFF0000 } WICMetadataCreationOptions; +cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") + +cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") +cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") +cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);") + [ object, uuid(aba958bf-c672-44d1-8d61-ce6df2e682c2)

1 0

Alexandre Julliard : comctl32: Add a couple of DIB helper functions for imagelists.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 4c785235d024883e9c97cef060a0ed808665306f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c785235d024883e9c97cef06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 22:10:45 2011 +0100 comctl32: Add a couple of DIB helper functions for imagelists. --- dlls/comctl32/imagelist.c | 119 ++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 55 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index accbf58..9d2b6f9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -114,6 +114,17 @@ static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, SIZE sz->cy = imagelist_height( count ) * himl->cy; } +static inline int get_dib_stride( int width, int bpp ) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + +static inline int get_dib_image_size( const BITMAPINFO *info ) +{ + return get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ) + * abs( info->bmiHeader.biHeight ); +} + /* * imagelist_copy_images() * @@ -139,6 +150,56 @@ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDe } } +static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int height, + BITMAPINFO *info, BITMAPINFO *mask_info, DWORD *bits, BYTE *mask_bits ) +{ + int i, j, n; + POINT pt; + int stride = info->bmiHeader.biWidth; + int mask_stride = (info->bmiHeader.biWidth + 31) / 32 * 4; + + for (n = 0; n < count; n++) + { + int has_alpha = 0; + + imagelist_point_from_index( himl, pos + n, &pt ); + + /* check if bitmap has an alpha channel */ + for (i = 0; i < height && !has_alpha; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((has_alpha = ((bits[i * stride + j] & 0xff000000) != 0))) break; + + if (!has_alpha) /* generate alpha channel from the mask */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if (!mask_info || !((mask_bits[i * mask_stride + j / 8] << (j % 8)) & 0x80)) + bits[i * stride + j] |= 0xff000000; + else + bits[i * stride + j] = 0; + } + else + { + himl->has_alpha[pos + n] = 1; + + if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((bits[i * stride + j] >> 24) > 25) /* more than 10% alpha */ + mask_bits[i * mask_stride + j / 8] &= ~(0x80 >> (j % 8)); + else + mask_bits[i * mask_stride + j / 8] |= 0x80 >> (j % 8); + } + } + StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + if (mask_info) + StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); + } +} + /* add images with an alpha channel when the image list is 32 bpp */ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, int width, int height, HBITMAP hbmImage, HBITMAP hbmMask ) @@ -148,8 +209,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, BITMAPINFO *info, *mask_info = NULL; DWORD *bits = NULL; BYTE *mask_bits = NULL; - int i, j, n; - POINT pt; DWORD mask_width; if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; @@ -188,46 +247,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; } - for (n = 0; n < count; n++) - { - int has_alpha = 0; - - imagelist_point_from_index( himl, pos + n, &pt ); - - /* check if bitmap has an alpha channel */ - for (i = 0; i < height && !has_alpha; i++) - for (j = n * width; j < (n + 1) * width; j++) - if ((has_alpha = ((bits[i * bm.bmWidth + j] & 0xff000000) != 0))) break; - - if (!has_alpha) /* generate alpha channel from the mask */ - { - for (i = 0; i < height; i++) - for (j = n * width; j < (n + 1) * width; j++) - if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) - bits[i * bm.bmWidth + j] |= 0xff000000; - else - bits[i * bm.bmWidth + j] = 0; - } - else - { - himl->has_alpha[pos + n] = 1; - - if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ - { - for (i = 0; i < height; i++) - for (j = n * width; j < (n + 1) * width; j++) - if ((bits[i * bm.bmWidth + j] >> 24) > 25) /* more than 10% alpha */ - mask_bits[i * mask_width + j / 8] &= ~(0x80 >> (j % 8)); - else - mask_bits[i * mask_width + j / 8] |= 0x80 >> (j % 8); - } - } - StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); - if (mask_info) - StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); - } + add_dib_bits( himl, pos, count, width, height, info, mask_info, bits, mask_bits ); ret = TRUE; done: @@ -2069,17 +2089,6 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, } -/*********************************************************************** - * DIB_GetDIBImageBytes - * - * Return the number of bytes used to hold the image in a DIB bitmap. - */ -static int DIB_GetDIBImageBytes( int width, int height, int depth ) -{ - return (((width * depth + 31) / 8) & ~3) * abs( height ); -} - - /* helper for ImageList_Read, see comments below */ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) { @@ -2112,7 +2121,7 @@ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) else palspace = 0; - bmi->bmiHeader.biSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bitsperpixel); + bmi->bmiHeader.biSizeImage = get_dib_image_size( bmi ); /* read the palette right after the end of the bitmapinfoheader */ if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) @@ -2902,7 +2911,7 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM pstm) return FALSE; bitCount = bm.bmBitsPixel == 1 ? 1 : 24; - sizeImage = DIB_GetDIBImageBytes(bm.bmWidth, bm.bmHeight, bitCount); + sizeImage = get_dib_stride(bm.bmWidth, bitCount) * bm.bmHeight; totalSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); if(bitCount != 24)

1 0

Alexandre Julliard : comctl32: Setup the alpha channel also when reading an imagelist from a stream.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 73b9dc98eb9ab371f92d8c0a054c71f3d9b194ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b9dc98eb9ab371f92d8c0a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 22:11:15 2011 +0100 comctl32: Setup the alpha channel also when reading an imagelist from a stream. --- dlls/comctl32/imagelist.c | 83 +++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 9d2b6f9..c32cb0b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2090,26 +2090,23 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, /* helper for ImageList_Read, see comments below */ -static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) +static void *read_bitmap(LPSTREAM pstm, BITMAPINFO *bmi) { BITMAPFILEHEADER bmfh; int bitsperpixel, palspace; - char bmi_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; - LPBITMAPINFO bmi = (LPBITMAPINFO)bmi_buf; - int result = FALSE; - LPBYTE bits = NULL; + void *bits; if (FAILED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))) - return FALSE; + return NULL; if (bmfh.bfType != (('M'<<8)|'B')) - return FALSE; + return NULL; if (FAILED(IStream_Read ( pstm, &bmi->bmiHeader, sizeof(bmi->bmiHeader), NULL))) - return FALSE; + return NULL; if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader))) - return FALSE; + return NULL; TRACE("width %u, height %u, planes %u, bpp %u\n", bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, @@ -2125,23 +2122,17 @@ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) /* read the palette right after the end of the bitmapinfoheader */ if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) - goto error; + return NULL; bits = Alloc(bmi->bmiHeader.biSizeImage); - if (!bits) - goto error; - if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) - goto error; - - if (!StretchDIBits(hdcIml, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - bits, bmi, DIB_RGB_COLORS, SRCCOPY)) - goto error; - result = TRUE; + if (!bits) return NULL; -error: - Free(bits); - return result; + if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) + { + Free(bits); + return NULL; + } + return bits; } /************************************************************************* @@ -2177,6 +2168,11 @@ error: */ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) { + char image_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; + char mask_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; + BITMAPINFO *image_info = (BITMAPINFO *)image_buf; + BITMAPINFO *mask_info = (BITMAPINFO *)mask_buf; + void *image_bits, *mask_bits = NULL; ILHEAD ilHead; HIMAGELIST himl; int i; @@ -2197,19 +2193,56 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) if (!himl) return NULL; - if (!_read_bitmap(himl->hdcImage, pstm)) + if (!(image_bits = read_bitmap(pstm, image_info))) { WARN("failed to read bitmap from stream\n"); return NULL; } if (ilHead.flags & ILC_MASK) { - if (!_read_bitmap(himl->hdcMask, pstm)) + if (!(mask_bits = read_bitmap(pstm, mask_info))) { WARN("failed to read mask bitmap from stream\n"); return NULL; } } + else mask_info = NULL; + + if (himl->has_alpha && image_info->bmiHeader.biBitCount == 32) + { + DWORD *ptr = image_bits; + BYTE *mask_ptr = mask_bits; + int stride = himl->cy * image_info->bmiHeader.biWidth; + + if (image_info->bmiHeader.biHeight > 0) /* bottom-up */ + { + ptr += (imagelist_height( ilHead.cCurImage ) - 1) * stride; + mask_ptr += (imagelist_height( ilHead.cCurImage ) - 1) * stride / 8; + stride = -stride; + image_info->bmiHeader.biHeight = himl->cy; + } + else image_info->bmiHeader.biHeight = -himl->cy; + + for (i = 0; i < ilHead.cCurImage; i += TILE_COUNT) + { + add_dib_bits( himl, i, min( ilHead.cCurImage - i, TILE_COUNT ), + himl->cx, himl->cy, image_info, mask_info, ptr, mask_ptr ); + ptr += stride; + mask_ptr += stride / 8; + } + } + else + { + StretchDIBits( himl->hdcImage, 0, 0, image_info->bmiHeader.biWidth, image_info->bmiHeader.biHeight, + 0, 0, image_info->bmiHeader.biWidth, image_info->bmiHeader.biHeight, + image_bits, image_info, DIB_RGB_COLORS, SRCCOPY); + if (mask_info) + StretchDIBits( himl->hdcMask, 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, + 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, + mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY); + } + Free( image_bits ); + Free( mask_bits ); himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCOLORVALUE typedef.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 7459180a51135fb4194a8524f7c70f2e513e5485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7459180a51135fb4194a8524f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:27 2011 +0100 wined3d: Get rid of the WINED3DCOLORVALUE typedef. --- dlls/d3d10core/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 9 +++++---- include/wine/wined3d.h | 22 +++++++++++----------- 8 files changed, 30 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7459180a51135fb4194a8…

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskDisableCapture().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 5ffa2aba23fc67160c81e2f51fc276d072d303a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffa2aba23fc67160c81e2f51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 20:45:25 2011 +0100 d3d10: Implement D3D10StateBlockMaskDisableCapture(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/stateblock.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/tests/device.c | 50 +++++++++++++++++++++ dlls/d3d10/utils.c | 34 ++++++++++++++ include/d3d10effect.h | 30 ++++++++++++ 6 files changed, 222 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ffa2aba23fc67160c81e…

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskDisableAll().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 88a55a04a3cd149f6fa3e4402c236c590c4c1836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a55a04a3cd149f6fa3e4402… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:24 2011 +0100 d3d10: Implement D3D10StateBlockMaskDisableAll(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 12 ++++++++++++ dlls/d3d10/tests/device.c | 8 ++++++++ include/d3d10effect.h | 1 + 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index baa0c10..1a09f4a 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -20,7 +20,7 @@ @ stdcall D3D10ReflectShader(ptr long ptr) @ stub D3D10RegisterLayers @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) -@ stub D3D10StateBlockMaskDisableAll +@ stdcall D3D10StateBlockMaskDisableAll(ptr) @ stub D3D10StateBlockMaskDisableCapture @ stub D3D10StateBlockMaskEnableAll @ stub D3D10StateBlockMaskEnableCapture diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index f121a5c..76a27f9 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -166,3 +166,15 @@ HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, return S_OK; } + +HRESULT WINAPI D3D10StateBlockMaskDisableAll(D3D10_STATE_BLOCK_MASK *mask) +{ + TRACE("mask %p.\n", mask); + + if (!mask) + return E_INVALIDARG; + + memset(mask, 0, sizeof(*mask)); + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 1fc3a3b..2197002 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -88,6 +88,14 @@ static void test_stateblock_mask(void) ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + + memset(&result, 0xff, sizeof(result)); + hr = D3D10StateBlockMaskDisableAll(&result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); + ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); + ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskDisableAll(NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); } START_TEST(device) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index d36c3da..e293d3b 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -806,6 +806,7 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); +HRESULT WINAPI D3D10StateBlockMaskDisableAll(D3D10_STATE_BLOCK_MASK *mask); #ifdef __cplusplus }

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskEnableAll().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: be7122034fa1d9a0e58fce9f468ec97b14f28c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7122034fa1d9a0e58fce9f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:26 2011 +0100 d3d10: Implement D3D10StateBlockMaskEnableAll(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 12 ++++++++++++ dlls/d3d10/tests/device.c | 8 ++++++++ include/d3d10effect.h | 1 + 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 49733de..865ded5 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -22,7 +22,7 @@ @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) @ stdcall D3D10StateBlockMaskDisableAll(ptr) @ stdcall D3D10StateBlockMaskDisableCapture(ptr long long long) -@ stub D3D10StateBlockMaskEnableAll +@ stdcall D3D10StateBlockMaskEnableAll(ptr) @ stub D3D10StateBlockMaskEnableCapture @ stub D3D10StateBlockMaskGetSetting @ stub D3D10StateBlockMaskIntersect diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index bf3d64c..7fd2aa2 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -284,3 +284,15 @@ HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, return E_INVALIDARG; } } + +HRESULT WINAPI D3D10StateBlockMaskEnableAll(D3D10_STATE_BLOCK_MASK *mask) +{ + TRACE("mask %p.\n", mask); + + if (!mask) + return E_INVALIDARG; + + memset(mask, 0xff, sizeof(*mask)); + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index c29f65b..894fd1d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -123,6 +123,14 @@ static void test_stateblock_mask(void) hr = D3D10StateBlockMaskDisableAll(NULL); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + memset(&result, 0, sizeof(result)); + hr = D3D10StateBlockMaskEnableAll(&result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableAll failed, hr %#x.\n", hr); + ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); + ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskEnableAll(NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b195dff..697d1c4 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -837,6 +837,7 @@ HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, HRESULT WINAPI D3D10StateBlockMaskDisableAll(D3D10_STATE_BLOCK_MASK *mask); HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, D3D10_DEVICE_STATE_TYPES state_type, UINT start_idx, UINT count); +HRESULT WINAPI D3D10StateBlockMaskEnableAll(D3D10_STATE_BLOCK_MASK *mask); #ifdef __cplusplus }

1 0

Jacek Caban : mshtml: Fixed script tests on IE9.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: e7bbb4ef1e95396b72a58f813b4346d9abccb699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bbb4ef1e95396b72a58f813… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 19:58:27 2011 +0100 mshtml: Fixed script tests on IE9. --- dlls/mshtml/tests/script.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5cac14a..d1a4d4a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2115,7 +2115,6 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(!punkContext, "punkContext = %p\n", punkContext); ok(pvarResult != NULL, "pvarResult == NULL\n"); ok(pexcepinfo != NULL, "pexcepinfo == NULL\n"); @@ -2185,7 +2184,7 @@ static HRESULT WINAPI ActiveScript_QueryInterface(IActiveScript *iface, REFIID r if(IsEqualGUID(&IID_IActiveScriptDebug, riid)) return E_NOINTERFACE; - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + trace("QI(%s)\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Matteo Bruni : d3d9: Remove D3DFMT_R8G8B8 special handling.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 276216360e91ab8b987fc23d5a63cf16cd2eea27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=276216360e91ab8b987fc23d5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 15 15:16:58 2011 +0100 d3d9: Remove D3DFMT_R8G8B8 special handling. --- dlls/d3d9/directx.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b356d13..1770239 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -238,18 +238,6 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(IDirect3D9Ex *iface, UINT TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); - /* This format is nothing special and it is supported perfectly. - * However, ati and nvidia driver on windows do not mark this format as - * supported (tested with the dxCapsViewer) and pretending to - * support this format uncovers a bug in Battlefield 1942 (fonts are missing) - * So do the same as Windows drivers and pretend not to support it on dx8 and 9 - */ - if(CheckFormat == D3DFMT_R8G8B8) - { - WARN("D3DFMT_R8G8B8 is not available on windows, returning D3DERR_NOTAVAILABLE\n"); - return D3DERR_NOTAVAILABLE; - } - switch(RType) { case D3DRTYPE_VERTEXBUFFER: case D3DRTYPE_INDEXBUFFER:

1 0