May 2014 - Wine-commits - list.winehq.org

Henri Verbeet : ddraw: Cleanup DDRAW_dump_pixelformat().
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: 4d887292afb32cb44e40b990c3855dcf8f678632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d887292afb32cb44e40b990c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:17 2014 +0200 ddraw: Cleanup DDRAW_dump_pixelformat(). --- dlls/ddraw/utils.c | 54 ++++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 38 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 6ac4fc9..ebd355b 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -735,57 +735,35 @@ DDRAW_dump_pixelformat(const DDPIXELFORMAT *pf) TRACE("( "); DDRAW_dump_pixelformat_flag(pf->dwFlags); if (pf->dwFlags & DDPF_FOURCC) - { - TRACE(", dwFourCC code '%c%c%c%c' (0x%08x) - %d bits per pixel", + TRACE(", dwFourCC code '%c%c%c%c' (0x%08x) - %u bits per pixel", (unsigned char)( pf->dwFourCC &0xff), (unsigned char)((pf->dwFourCC>> 8)&0xff), (unsigned char)((pf->dwFourCC>>16)&0xff), (unsigned char)((pf->dwFourCC>>24)&0xff), pf->dwFourCC, - pf->u1.dwYUVBitCount - ); - } + pf->u1.dwYUVBitCount); if (pf->dwFlags & DDPF_RGB) { - const char *cmd; - TRACE(", RGB bits: %d, ", pf->u1.dwRGBBitCount); - switch (pf->u1.dwRGBBitCount) - { - case 4: cmd = "%1lx"; break; - case 8: cmd = "%02lx"; break; - case 16: cmd = "%04lx"; break; - case 24: cmd = "%06lx"; break; - case 32: cmd = "%08lx"; break; - default: ERR("Unexpected bit depth!\n"); cmd = "%d"; break; - } - TRACE(" R "); TRACE(cmd, pf->u2.dwRBitMask); - TRACE(" G "); TRACE(cmd, pf->u3.dwGBitMask); - TRACE(" B "); TRACE(cmd, pf->u4.dwBBitMask); + TRACE(", RGB bits: %u, R 0x%08x G 0x%08x B 0x%08x", + pf->u1.dwRGBBitCount, + pf->u2.dwRBitMask, + pf->u3.dwGBitMask, + pf->u4.dwBBitMask); if (pf->dwFlags & DDPF_ALPHAPIXELS) - { - TRACE(" A "); TRACE(cmd, pf->u5.dwRGBAlphaBitMask); - } + TRACE(" A 0x%08x", pf->u5.dwRGBAlphaBitMask); if (pf->dwFlags & DDPF_ZPIXELS) - { - TRACE(" Z "); TRACE(cmd, pf->u5.dwRGBZBitMask); - } + TRACE(" Z 0x%08x", pf->u5.dwRGBZBitMask); } if (pf->dwFlags & DDPF_ZBUFFER) - { - TRACE(", Z bits : %d", pf->u1.dwZBufferBitDepth); - } + TRACE(", Z bits: %u", pf->u1.dwZBufferBitDepth); if (pf->dwFlags & DDPF_ALPHA) - { - TRACE(", Alpha bits : %d", pf->u1.dwAlphaBitDepth); - } + TRACE(", Alpha bits: %u", pf->u1.dwAlphaBitDepth); if (pf->dwFlags & DDPF_BUMPDUDV) - { - const char *cmd = "%08lx"; - TRACE(", Bump bits: %d, ", pf->u1.dwBumpBitCount); - TRACE(" U "); TRACE(cmd, pf->u2.dwBumpDuBitMask); - TRACE(" V "); TRACE(cmd, pf->u3.dwBumpDvBitMask); - TRACE(" L "); TRACE(cmd, pf->u4.dwBumpLuminanceBitMask); - } + TRACE(", Bump bits: %u, U 0x%08x V 0x%08x L 0x%08x", + pf->u1.dwBumpBitCount, + pf->u2.dwBumpDuBitMask, + pf->u3.dwBumpDvBitMask, + pf->u4.dwBumpLuminanceBitMask); TRACE(")\n"); }

1 0

Henri Verbeet : d3dcompiler: Make some string arrays const.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: ffc01ec6485b062375283ce094177113517f1a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc01ec6485b062375283ce09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:18 2014 +0200 d3dcompiler: Make some string arrays const. --- dlls/d3dcompiler_43/hlsl.y | 4 ++-- dlls/d3dcompiler_43/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 777fb4e..ef68547 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -46,7 +46,7 @@ void hlsl_message(const char *fmt, ...) static const char *hlsl_get_error_level_name(enum hlsl_error_level level) { - const char *names[] = + static const char * const names[] = { "error", "warning", @@ -199,7 +199,7 @@ static void declare_predefined_types(struct hlsl_scope *scope) { struct hlsl_type *type; unsigned int x, y, bt; - static const char *names[] = + static const char * const names[] = { "float", "half", diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 221dad5..c110718 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1974,7 +1974,7 @@ const char *debug_modifiers(DWORD modifiers) static const char *debug_node_type(enum hlsl_ir_node_type type) { - const char *names[] = + static const char * const names[] = { "HLSL_IR_VAR", "HLSL_IR_ASSIGNMENT", @@ -2080,7 +2080,7 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char *op_names[] = + static const char * const op_names[] = { "~", "!",

1 0

Henri Verbeet : d3d9/tests: Merge vertexdeclaration.c into device.c.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: 301a17d55649b0159f3ecc1e394a3dd6608ecc74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=301a17d55649b0159f3ecc1e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 2 12:50:19 2014 +0200 d3d9/tests: Merge vertexdeclaration.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 751 +++++++++++++++++++++++++++++- dlls/d3d9/tests/vertexdeclaration.c | 866 ----------------------------------- 3 files changed, 750 insertions(+), 868 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=301a17d55649b0159f3ec…

1 0

Zhenbo Li : mshtml: Added IHTMLTable::width property implementation.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: cfb411c10d234df8885ccc72343257cf9023c3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb411c10d234df8885ccc723… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Apr 29 21:04:54 2014 +0800 mshtml: Added IHTMLTable::width property implementation. --- dlls/mshtml/htmltable.c | 96 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 48 ++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 08a0bf0..fd7c265 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -57,6 +57,57 @@ static inline HTMLTable *impl_from_IHTMLTable3(IHTMLTable3 *iface) return CONTAINING_RECORD(iface, HTMLTable, IHTMLTable3_iface); } +static HRESULT var2str(const VARIANT *p, nsAString *nsstr) +{ + BSTR str; + BOOL ret; + HRESULT hres; + + switch(V_VT(p)) { + case VT_BSTR: + return nsAString_Init(nsstr, V_BSTR(p))? + S_OK : E_OUTOFMEMORY; + case VT_R8: + hres = VarBstrFromR8(V_R8(p), 0, 0, &str); + break; + case VT_R4: + hres = VarBstrFromR4(V_R4(p), 0, 0, &str); + break; + case VT_I4: + hres = VarBstrFromI4(V_I4(p), 0, 0, &str); + break; + default: + FIXME("unsupported arg %s\n", debugstr_variant(p)); + return E_NOTIMPL; + } + if (FAILED(hres)) + return hres; + + ret = nsAString_Init(nsstr, str); + SysFreeString(str); + return ret ? S_OK : E_OUTOFMEMORY; +} + +static HRESULT nsstr_to_truncated_bstr(const nsAString *nsstr, BSTR *ret_ptr) +{ + const PRUnichar *str, *ptr, *end = NULL; + BSTR ret; + + nsAString_GetData(nsstr, &str); + + for(ptr = str; isdigitW(*ptr); ptr++); + if(*ptr == '.') { + for(end = ptr++; isdigitW(*ptr); ptr++); + if(*ptr) + end = NULL; + } + + ret = end ? SysAllocStringLen(str, end-str) : SysAllocString(str); + + *ret_ptr = ret; + return ret ? S_OK : E_OUTOFMEMORY; +} + static HRESULT WINAPI HTMLTable_QueryInterface(IHTMLTable *iface, REFIID riid, void **ppv) { @@ -395,15 +446,52 @@ static HRESULT WINAPI HTMLTable_get_rows(IHTMLTable *iface, IHTMLElementCollecti static HRESULT WINAPI HTMLTable_put_width(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString val; + HRESULT hres; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + hres = var2str(&v, &val); + + if (FAILED(hres)){ + ERR("Set Width(%s) failed when initializing a nsAString, err = %08x\n", + debugstr_variant(&v), hres); + return hres; + } + + nsres = nsIDOMHTMLTableElement_SetWidth(This->nstable, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set Width(%s) failed, err = %08x\n", debugstr_variant(&v), nsres); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + BSTR bstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableElement_GetWidth(This->nstable, &val); + if (NS_FAILED(nsres)){ + ERR("Get Width failed!\n"); + nsAString_Finish(&val); + return E_FAIL; + } + + hres = nsstr_to_truncated_bstr(&val, &bstr); + nsAString_Finish(&val); + + V_VT(p) = VT_BSTR; + V_BSTR(p) = bstr; + return hres; } static HRESULT WINAPI HTMLTable_put_height(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b863ac2..02e0d00 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5916,6 +5916,54 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11.9"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("40.2%"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "40.2%"), "Expected 40.2%%, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_I4; + V_I4(&v) = 11; + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_R8; + V_R8(&v) = 11.9; + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!strcmp_wa(V_BSTR(&v), "11"), "Expected 11, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IHTMLTable_Release(table); }

1 0

Akihiro Sagawa : gdi32/tests: Make bmi structure const.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: b6ef7274c54aa75ae9cd6be3149cc88eb859aa36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ef7274c54aa75ae9cd6be31… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:19 2014 +0900 gdi32/tests: Make bmi structure const. --- dlls/gdi32/tests/dib.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 6e0fccd..d12c752 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -1210,17 +1210,17 @@ static const char **current_sha1; static const RECT *current_bounds; static const char *dst_format; -static inline DWORD get_stride(BITMAPINFO *bmi) +static inline DWORD get_stride(const BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; } -static inline DWORD get_dib_size(BITMAPINFO *bmi) +static inline DWORD get_dib_size(const BITMAPINFO *bmi) { return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); } -static char *hash_dib(BITMAPINFO *bmi, void *bits) +static char *hash_dib(const BITMAPINFO *bmi, const void *bits) { DWORD dib_size = get_dib_size(bmi); HCRYPTHASH hash; @@ -1288,7 +1288,7 @@ static void skip_compare( int count ) current_bounds++; } -static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) +static void compare_hash_broken_todo(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) { char *hash = hash_dib(bmi, bits); BOOL ok_cond; @@ -1332,7 +1332,7 @@ static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const compare_bounds( hdc, info ); } -static void compare_hash(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char *info) +static void compare_hash(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info) { compare_hash_broken_todo(hdc, bmi, bits, info, 0, FALSE); } @@ -1615,7 +1615,7 @@ static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, C DeleteObject( SelectObject( hdc, brush ) ); } -static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) +static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) { char pal_buffer[sizeof(LOGPALETTE) + 255 * sizeof(PALETTEENTRY)]; LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; @@ -2840,7 +2840,7 @@ static inline COLORREF aa_colorref( COLORREF dst, COLORREF text, BYTE glyph ) static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; -static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) { DWORD dib_size = get_dib_size(bmi), ret; LOGFONTA lf; @@ -2956,7 +2956,7 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) DeleteObject( font ); } -static void draw_text( HDC hdc, BITMAPINFO *bmi, BYTE *bits ) +static void draw_text( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) { draw_text_2( hdc, bmi, bits, FALSE );

1 0

Akihiro Sagawa : msvfw32/tests: Add tests for drawdib.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: 93089217c3b3d182e8105c6c926c47e05bf8d337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93089217c3b3d182e8105c6c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:21 2014 +0900 msvfw32/tests: Add tests for drawdib. --- dlls/msvfw32/tests/Makefile.in | 3 +- dlls/msvfw32/tests/drawdib.c | 166 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/Makefile.in b/dlls/msvfw32/tests/Makefile.in index 26cd529..1ae7897 100644 --- a/dlls/msvfw32/tests/Makefile.in +++ b/dlls/msvfw32/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = msvfw32.dll -IMPORTS = msvfw32 +IMPORTS = msvfw32 advapi32 gdi32 C_SRCS = \ + drawdib.c \ msvfw.c diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c new file mode 100644 index 0000000..54dd813 --- /dev/null +++ b/dlls/msvfw32/tests/drawdib.c @@ -0,0 +1,166 @@ +/* + * Copyright 2014 Akihiro Sagawa + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <vfw.h> +#include <wincrypt.h> +#include <stdlib.h> +#include <string.h> + +#include "wine/test.h" + +#define WIDTH 16 +#define HEIGHT 12 + +static HCRYPTPROV crypt_prov; + +static inline DWORD get_stride(const BITMAPINFO *bmi) +{ + return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; +} + +static inline DWORD get_dib_size(const BITMAPINFO *bmi) +{ + return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); +} + +static char *hash_dib(const BITMAPINFO *bmi, const void *bits) +{ + DWORD dib_size = get_dib_size(bmi); + HCRYPTHASH hash; + char *buf; + BYTE hash_buf[20]; + DWORD hash_size = sizeof(hash_buf); + int i; + static const char *hex = "0123456789abcdef"; + + if(!crypt_prov) return NULL; + + if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; + + CryptHashData(hash, bits, dib_size, 0); + + CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); + if(hash_size != sizeof(hash_buf)) return NULL; + + CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); + CryptDestroyHash(hash); + + buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + + for(i = 0; i < hash_size; i++) + { + buf[i * 2] = hex[hash_buf[i] >> 4]; + buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; + } + buf[i * 2] = '\0'; + + return buf; +} + +static void init_bmi(BITMAPINFO *bmi, LONG width, LONG height, DWORD size) +{ + memset(bmi, 0, sizeof(*bmi)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biWidth = width; + bmi->bmiHeader.biHeight = height; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiHeader.biSizeImage = size; +} + +static void test_DrawDib_sizeimage(void) +{ + const struct { + LONG width, height; + DWORD size; + char hash[41]; + } test_data[] = { + /* [0] correct size */ + { WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* [1] zero size */ + { WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + }; + HDC hdc; + DWORD src_dib_size, dst_dib_size; + BOOL r; + HBITMAP dib; + BITMAPINFO src_info, dst_info; + RGBQUAD *src_bits = NULL, *dst_bits; + HDRAWDIB hdd; + unsigned int i; + + hdc = CreateCompatibleDC(NULL); + + init_bmi(&dst_info, WIDTH, HEIGHT, 0); + dib = CreateDIBSection(NULL, &dst_info, DIB_RGB_COLORS, (void **)&dst_bits, NULL, 0); + dst_dib_size = get_dib_size(&dst_info); + ok(dib != NULL, "CreateDIBSection failed\n"); + SelectObject(hdc, dib); + + init_bmi(&src_info, WIDTH, HEIGHT, 0); + src_dib_size = get_dib_size(&src_info); + src_bits = HeapAlloc(GetProcessHeap(), 0, src_dib_size); + ok(src_bits != NULL, "Can't allocate memory\n"); + memset(src_bits, 0x88, src_dib_size); + + hdd = DrawDibOpen(); + ok(hdd != NULL, "DrawDibOpen failed\n"); + + for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) { + char *hash; + memset(dst_bits, 0xff, dst_dib_size); + init_bmi(&src_info, test_data[i].width, test_data[i].height, test_data[i].size); + r = DrawDibDraw(hdd, hdc, + 0, 0, -1, -1, &src_info.bmiHeader, src_bits, + 0, 0, test_data[i].width, test_data[i].height, 0); + if (test_data[i].hash[0]) + ok(r, "[%u] DrawDibDraw failed, expected success\n", i); + else + ok(!r, "[%u] DrawDibDraw succeeded, expected failed\n", i); + if (!r || !test_data[i].hash[0]) + continue; + + hash = hash_dib(&dst_info, dst_bits); + if (!hash) { + win_skip("This platform doesn't support SHA-1 hash\n"); + continue; + } + ok(strcmp(hash, test_data[i].hash) == 0, + "[%u] got %s, expected %s\n", + i, hash, test_data[i].hash); + HeapFree(GetProcessHeap(), 0, hash); + } + + r = DrawDibClose(hdd); + ok(r, "DrawDibClose failed\n"); + + HeapFree(GetProcessHeap(), 0, src_bits); + + DeleteDC(hdc); +} + +START_TEST(drawdib) +{ + CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + test_DrawDib_sizeimage(); + CryptReleaseContext(crypt_prov, 0); +}

1 0

Akihiro Sagawa : msvfw32: Drawdib doesn't support inverted DIBs.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: 47a3a0528d5bb2ec84b58a00937639413a803727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a3a0528d5bb2ec84b58a009… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:22 2014 +0900 msvfw32: Drawdib doesn't support inverted DIBs. --- dlls/msvfw32/drawdib.c | 17 ++++++++++++++--- dlls/msvfw32/tests/drawdib.c | 7 +++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 9877e62..2916126 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -246,9 +246,18 @@ BOOL VFWAPI DrawDibBegin(HDRAWDIB hdd, DWORD dwSize; /* No compression */ TRACE("Not compressed!\n"); - dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); - whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); - memcpy(whdd->lpbiOut, lpbi, dwSize); + if (lpbi->biHeight <= 0) + { + /* we don't draw inverted DIBs */ + TRACE("detected inverted DIB\n"); + ret = FALSE; + } + else + { + dwSize = lpbi->biSize + num_colours(lpbi)*sizeof(RGBQUAD); + whdd->lpbiOut = HeapAlloc(GetProcessHeap(), 0, dwSize); + memcpy(whdd->lpbiOut, lpbi, dwSize); + } } if (ret) @@ -332,6 +341,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, { TRACE("Something changed!\n"); ret = DrawDibBegin(hdd, hdc, dxDst, dyDst, lpbi, dxSrc, dySrc, 0); + if (!ret) + return ret; } #undef CHANGED diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 54dd813..24d8631 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -98,6 +98,13 @@ static void test_DrawDib_sizeimage(void) { WIDTH, HEIGHT, WIDTH * HEIGHT * sizeof(RGBQUAD), "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, /* [1] zero size */ { WIDTH, HEIGHT, 0, "bc943d5ab024b8b0118d0a80aa283055d39942b8" }, + /* error patterns */ + { WIDTH, -HEIGHT, 0, "" }, + { -WIDTH, HEIGHT, 0, "" }, + { -WIDTH, -HEIGHT, 0, "" }, + { 0, 0, 0, "" }, + { 0, HEIGHT, 0, "" }, + { WIDTH, 0, 0, "" }, }; HDC hdc; DWORD src_dib_size, dst_dib_size;

1 0

Akihiro Sagawa : msvfw32: Fix uncompressed bitmap size handling in DrawDibDraw.
by Alexandre Julliard 02 May '14

02 May '14

Module: wine Branch: master Commit: af089289b32dbeec797f810938bca4adc8f717db URL: http://source.winehq.org/git/wine.git/?a=commit;h=af089289b32dbeec797f81093… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri May 2 22:14:24 2014 +0900 msvfw32: Fix uncompressed bitmap size handling in DrawDibDraw. --- dlls/msvfw32/drawdib.c | 8 ++------ dlls/msvfw32/tests/drawdib.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index 2916126..c4e5c40 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -355,12 +355,6 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, if (!(wFlags & DDF_UPDATE)) { - DWORD biSizeImage = lpbi->biSizeImage; - - /* biSizeImage may be set to 0 for BI_RGB (uncompressed) bitmaps */ - if ((lpbi->biCompression == BI_RGB) && (biSizeImage == 0)) - biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; - if (lpbi->biCompression) { DWORD flags = 0; @@ -374,6 +368,8 @@ BOOL VFWAPI DrawDibDraw(HDRAWDIB hdd, HDC hdc, } else { + /* BI_RGB: lpbi->biSizeImage isn't reliable */ + DWORD biSizeImage = ((lpbi->biWidth * lpbi->biBitCount + 31) / 32) * 4 * lpbi->biHeight; memcpy(whdd->lpvbits, lpBits, biSizeImage); } } diff --git a/dlls/msvfw32/tests/drawdib.c b/dlls/msvfw32/tests/drawdib.c index 24d8631..0a59d82 100644 --- a/dlls/msvfw32/tests/drawdib.c +++ b/dlls/msvfw32/tests/drawdib.c @@ -105,6 +105,12 @@ static void test_DrawDib_sizeimage(void) { 0, 0, 0, "" }, { 0, HEIGHT, 0, "" }, { WIDTH, 0, 0, "" }, + /* [8] zero size (to compare [9], [10] ) */ + { WIDTH, HEIGHT/2, 0, "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [9] insufficient size */ + { WIDTH, HEIGHT/2, sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, + /* [10] too much size */ + { WIDTH, HEIGHT/2, WIDTH * HEIGHT * sizeof(RGBQUAD), "8b75bf6d54a8645380114fe77505ee0699ffffaa" }, }; HDC hdc; DWORD src_dib_size, dst_dib_size;

1 0

Alex Henrie : bcrypt: Add stub for BCryptOpenAlgorithmProvider.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: d5f18414174d93474680743fb555b3ad80de6c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f18414174d93474680743fb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Apr 29 20:24:58 2014 -0600 bcrypt: Add stub for BCryptOpenAlgorithmProvider. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 87623f8..185f950 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -32,7 +32,7 @@ @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair -@ stub BCryptOpenAlgorithmProvider +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) @ stub BCryptQueryContextConfiguration @ stub BCryptQueryContextFunctionConfiguration @ stub BCryptQueryContextFunctionProperty diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 22da0dd..fcad58c 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -91,3 +91,16 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE algorithm, UCHAR *buffer, ULON FIXME("called with unsupported parameters, returning error\n"); return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWSTR algorithmId, + LPCWSTR implementation, DWORD flags) +{ + FIXME("%p, %s, %s, %08x - stub\n", algorithm, wine_dbgstr_w(algorithmId), wine_dbgstr_w(implementation), flags); + + if (!algorithm) + return STATUS_INVALID_PARAMETER; + + *algorithm = NULL; + + return STATUS_NOT_IMPLEMENTED; +}

1 0

Erich E. Hoover : user32: Reduce the minimum Set[System] Timer from 15 ms to 10 ms.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: b5bd529769696f2b4e4f7d6389f2dc21da5acd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bd529769696f2b4e4f7d638… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu May 1 07:41:57 2014 -0600 user32: Reduce the minimum Set[System]Timer from 15 ms to 10 ms. --- dlls/user32/message.c | 8 ++------ dlls/user32/tests/msg.c | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1e93c8d..be5d995 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4439,9 +4439,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ - timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); SERVER_START_REQ( set_win_timer ) { @@ -4474,9 +4472,7 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ - timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); SERVER_START_REQ( set_win_timer ) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6406190..66b9c7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8390,8 +8390,8 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) } #define TIMER_ID 0x19 -#define TIMER_COUNT_EXPECTED 64 -#define TIMER_COUNT_TOLERANCE 9 +#define TIMER_COUNT_EXPECTED 100 +#define TIMER_COUNT_TOLERANCE 10 static int count = 0; static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) @@ -8442,8 +8442,9 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * ±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); @@ -8452,8 +8453,9 @@ static void test_timers(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3 */, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); @@ -8473,7 +8475,9 @@ static void test_timers(void) syscount++; DispatchMessageA(&msg); } - ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE + || broken(abs(syscount-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(syscount > 4000 && syscount < 12000) /* win2k3sp0 */, "did not get expected count for minimum timeout (%d != ~%d).\n", syscount, TIMER_COUNT_EXPECTED); todo_wine ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", @@ -8507,8 +8511,9 @@ static void test_timers_no_wnd(void) ok(count == 1, "killing replaced timer did not work (%i).\n", count); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * ±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(NULL, 0, 0, callback_count); @@ -8516,7 +8521,8 @@ static void test_timers_no_wnd(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id);

1 0