June 2011 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use replace_node_by_html instead of document. write for conditional comments.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: fe105adff0562a66dedb9ea5437b83fe0c1fa1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe105adff0562a66dedb9ea54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 17 16:18:05 2011 +0200 mshtml: Use replace_node_by_html instead of document.write for conditional comments. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 79 +++++++++++++++--------------------------- 3 files changed, 30 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1d0e6c0..603ae9b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -98,7 +98,7 @@ static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) return NULL; } -static HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, const WCHAR *html) +HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, const WCHAR *html) { nsIDOMDocumentFragment *nsfragment; nsIDOMDocumentRange *nsdocrange; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 275bd81..cc17a64 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -753,6 +753,7 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; +HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*); HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 2117e49..0dc0785 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -44,14 +44,12 @@ static const IID NS_ICONTENTUTILS_CID = static nsIContentUtils *content_utils; -static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *comment) +static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *comment) { - DWORD len; int majorv = 0, minorv = 0; const PRUnichar *ptr, *end; - nsAString nsstr; PRUnichar *buf; - nsresult nsres; + DWORD len; enum { CMP_EQ, @@ -64,7 +62,7 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen static const PRUnichar endifW[] = {'<','!','[','e','n','d','i','f',']'}; if(comment[0] != '[' || comment[1] != 'i' || comment[2] != 'f') - return FALSE; + return NULL; ptr = comment+3; while(isspaceW(*ptr)) @@ -89,28 +87,28 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen } if(!isspaceW(*ptr++)) - return FALSE; + return NULL; while(isspaceW(*ptr)) ptr++; if(ptr[0] != 'I' || ptr[1] != 'E') - return FALSE; + return NULL; ptr +=2; if(!isspaceW(*ptr++)) - return FALSE; + return NULL; while(isspaceW(*ptr)) ptr++; if(!isdigitW(*ptr)) - return FALSE; + return NULL; while(isdigitW(*ptr)) majorv = majorv*10 + (*ptr++ - '0'); if(*ptr == '.') { ptr++; if(!isdigitW(*ptr)) - return FALSE; + return NULL; while(isdigitW(*ptr)) minorv = minorv*10 + (*ptr++ - '0'); } @@ -118,74 +116,64 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen while(isspaceW(*ptr)) ptr++; if(ptr[0] != ']' || ptr[1] != '>') - return FALSE; + return NULL; ptr += 2; len = strlenW(ptr); if(len < sizeof(endifW)/sizeof(WCHAR)) - return FALSE; + return NULL; end = ptr + len-sizeof(endifW)/sizeof(WCHAR); if(memcmp(end, endifW, sizeof(endifW))) - return FALSE; + return NULL; switch(cmpt) { case CMP_EQ: if(majorv == IE_MAJOR_VERSION && minorv == IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_LT: if(majorv > IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv > IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_LTE: if(majorv > IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv >= IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_GT: if(majorv < IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv < IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_GTE: if(majorv < IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv <= IE_MINOR_VERSION) break; - return FALSE; + return NULL; } buf = heap_alloc((end-ptr+1)*sizeof(WCHAR)); if(!buf) - return FALSE; + return NULL; memcpy(buf, ptr, (end-ptr)*sizeof(WCHAR)); buf[end-ptr] = 0; - nsAString_InitDepend(&nsstr, buf); - - /* FIXME: Find better way to insert HTML to document. */ - nsres = nsIDOMHTMLDocument_Write(doc->nsdoc, &nsstr); - nsAString_Finish(&nsstr); - heap_free(buf); - if(NS_FAILED(nsres)) { - ERR("Write failed: %08x\n", nsres); - return FALSE; - } - return TRUE; + return buf; } static nsresult run_insert_comment(HTMLDocumentNode *doc, nsISupports *comment_iface, nsISupports *arg2) { const PRUnichar *comment; nsIDOMComment *nscomment; + PRUnichar *replace_html; nsAString comment_str; - BOOL remove_comment; nsresult nsres; nsres = nsISupports_QueryInterface(comment_iface, &IID_nsIDOMComment, (void**)&nscomment); @@ -200,32 +188,21 @@ static nsresult run_insert_comment(HTMLDocumentNode *doc, nsISupports *comment_i return nsres; nsAString_GetData(&comment_str, &comment); - remove_comment = handle_insert_comment(doc, comment); + replace_html = handle_insert_comment(doc, comment); nsAString_Finish(&comment_str); - if(remove_comment) { - nsIDOMNode *nsparent, *tmp; - nsAString magic_str; + if(replace_html) { + HRESULT hres; - static const PRUnichar remove_comment_magicW[] = - {'#','!','w','i','n','e', 'r','e','m','o','v','e','!','#',0}; - - nsAString_InitDepend(&magic_str, remove_comment_magicW); - nsres = nsIDOMComment_SetData(nscomment, &magic_str); - nsAString_Finish(&magic_str); - if(NS_FAILED(nsres)) - ERR("SetData failed: %08x\n", nsres); - - nsIDOMComment_GetParentNode(nscomment, &nsparent); - if(nsparent) { - nsIDOMNode_RemoveChild(nsparent, (nsIDOMNode*)nscomment, &tmp); - nsIDOMNode_Release(nsparent); - nsIDOMNode_Release(tmp); - } + hres = replace_node_by_html(doc->nsdoc, (nsIDOMNode*)nscomment, replace_html); + heap_free(replace_html); + if(FAILED(hres)) + nsres = NS_ERROR_FAILURE; } + nsIDOMComment_Release(nscomment); - return NS_OK; + return nsres; } static nsresult run_bind_to_tree(HTMLDocumentNode *doc, nsISupports *nsiface, nsISupports *arg2)

1 0

Jacek Caban : mshtml: Moved IHTMLElement:: put_outerHTML implementation to separated, HTMLElement object independent, function.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 357994b7731ddec176e33f58ef27069a477b9ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357994b7731ddec176e33f58e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 17 16:17:45 2011 +0200 mshtml: Moved IHTMLElement::put_outerHTML implementation to separated, HTMLElement object independent, function. --- dlls/mshtml/htmlelem.c | 119 +++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 57 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a47f288..1d0e6c0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -35,6 +35,8 @@ #include "htmlevent.h" #include "htmlstyle.h" +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + static const WCHAR aW[] = {'A',0}; static const WCHAR bodyW[] = {'B','O','D','Y',0}; static const WCHAR embedW[] = {'E','M','B','E','D',0}; @@ -96,6 +98,65 @@ static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) return NULL; } +static HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, const WCHAR *html) +{ + nsIDOMDocumentFragment *nsfragment; + nsIDOMDocumentRange *nsdocrange; + nsIDOMNSRange *nsrange; + nsIDOMNode *nsparent; + nsIDOMRange *range; + nsAString html_str; + nsresult nsres; + HRESULT hres = S_OK; + + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); + if(NS_FAILED(nsres)) + return E_FAIL; + + nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &range); + nsIDOMDocumentRange_Release(nsdocrange); + if(NS_FAILED(nsres)) { + ERR("CreateRange failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMRange_QueryInterface(range, &IID_nsIDOMNSRange, (void**)&nsrange); + nsIDOMRange_Release(range); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSRange: %08x\n", nsres); + return E_FAIL; + } + + nsAString_InitDepend(&html_str, html); + nsIDOMNSRange_CreateContextualFragment(nsrange, &html_str, &nsfragment); + nsIDOMNSRange_Release(nsrange); + nsAString_Finish(&html_str); + if(NS_FAILED(nsres)) { + ERR("CreateContextualFragment failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNode_GetParentNode(nsnode, &nsparent); + if(NS_SUCCEEDED(nsres) && nsparent) { + nsIDOMNode *nstmp; + + nsres = nsIDOMNode_ReplaceChild(nsparent, (nsIDOMNode*)nsfragment, nsnode, &nstmp); + nsIDOMNode_Release(nsparent); + if(NS_FAILED(nsres)) { + ERR("ReplaceChild failed: %08x\n", nsres); + hres = E_FAIL; + }else if(nstmp) { + nsIDOMNode_Release(nstmp); + } + }else { + ERR("GetParentNode failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsIDOMDocumentFragment_Release(nsfragment); + return hres; +} + typedef struct { DispatchEx dispex; @@ -111,9 +172,6 @@ static inline HTMLFiltersCollection *impl_from_IHTMLFiltersCollection(IHTMLFilte static IHTMLFiltersCollection *HTMLFiltersCollection_Create(void); - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); - static inline HTMLElement *impl_from_IHTMLElement(IHTMLElement *iface) { return CONTAINING_RECORD(iface, HTMLElement, IHTMLElement_iface); @@ -1086,63 +1144,10 @@ static HRESULT WINAPI HTMLElement_get_innerText(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_put_outerHTML(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); - nsIDOMDocumentFragment *nsfragment; - nsIDOMDocumentRange *nsdocrange; - nsIDOMNSRange *nsrange; - nsIDOMNode *nsparent; - nsIDOMRange *range; - nsAString html_str; - nsresult nsres; - HRESULT hres = S_OK; TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - nsres = nsIDOMHTMLDocument_QueryInterface(This->node.doc->nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); - if(NS_FAILED(nsres)) - return E_FAIL; - - nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &range); - nsIDOMDocumentRange_Release(nsdocrange); - if(NS_FAILED(nsres)) { - ERR("CreateRange failed: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMRange_QueryInterface(range, &IID_nsIDOMNSRange, (void**)&nsrange); - nsIDOMRange_Release(range); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMNSRange: %08x\n", nsres); - return E_FAIL; - } - - nsAString_InitDepend(&html_str, v); - nsIDOMNSRange_CreateContextualFragment(nsrange, &html_str, &nsfragment); - nsIDOMNSRange_Release(nsrange); - nsAString_Finish(&html_str); - if(NS_FAILED(nsres)) { - ERR("CreateContextualFragment failed: %08x\n", nsres); - return E_FAIL; - } - - nsres = nsIDOMNode_GetParentNode(This->node.nsnode, &nsparent); - if(NS_SUCCEEDED(nsres) && nsparent) { - nsIDOMNode *nstmp; - - nsres = nsIDOMNode_ReplaceChild(nsparent, (nsIDOMNode*)nsfragment, This->node.nsnode, &nstmp); - nsIDOMNode_Release(nsparent); - if(NS_FAILED(nsres)) { - ERR("ReplaceChild failed: %08x\n", nsres); - hres = E_FAIL; - }else if(nstmp) { - nsIDOMNode_Release(nstmp); - } - }else { - ERR("GetParentNode failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsIDOMDocumentFragment_Release(nsfragment); - return hres; + return replace_node_by_html(This->node.doc->nsdoc, This->node.nsnode, v); } static HRESULT WINAPI HTMLElement_get_outerHTML(IHTMLElement *iface, BSTR *p)

1 0

Huw Davies : gdi32: Add support for hatched brushes.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 66399f6f726fdd69d6b5ab4f2f19a34fa5331205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66399f6f726fdd69d6b5ab4f2… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 12:45:36 2011 +0100 gdi32: Add support for hatched brushes. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 111 +++++++++++++++++- dlls/gdi32/dibdrv/primitives.c | 255 ++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/gdi_private.h | 13 ++ 4 files changed, 369 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66399f6f726fdd69d6b5a…

1 0

Huw Davies : gdi32/tests: Add broken behaviour on nt4 sp1-5.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: b9c06ad3411f695b7cf63a424d5ac9e92988ec74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c06ad3411f695b7cf63a424… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 14:52:24 2011 +0100 gdi32/tests: Add broken behaviour on nt4 sp1-5. --- dlls/gdi32/tests/dc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 41d9643..ab8a2d0 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -497,7 +497,7 @@ todo_wine static void test_boundsrect_invalid(void) { HDC hdc; - RECT rect, expect; + RECT rect, expect, set_rect; UINT ret; hdc = GetDC(NULL); @@ -518,8 +518,8 @@ static void test_boundsrect_invalid(void) else { /* Test parameter handling order. */ - SetRect(&rect, 0, 0, 50, 50); - ret = SetBoundsRect(hdc, &rect, DCB_SET); + SetRect(&set_rect, 10, 20, 40, 50); + ret = SetBoundsRect(hdc, &set_rect, DCB_SET); ok(ret & DCB_RESET, "Expected return flag DCB_RESET to be set, got %u\n", ret); @@ -533,7 +533,8 @@ static void test_boundsrect_invalid(void) ok(ret == DCB_RESET, "Expected GetBoundsRect to return DCB_RESET, got %u\n", ret); SetRect(&expect, 0, 0, 0, 0); - ok(EqualRect(&rect, &expect), + ok(EqualRect(&rect, &expect) || + broken(EqualRect(&rect, &set_rect)), /* nt4 sp1-5 */ "Expected output rectangle (0,0)-(0,0), got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); }

1 0

Huw Davies : gdi32/tests: Add broken behaviour on nt4 sp1 and 2.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: d73af0d954da146a04e758f891d9e0a799cd161c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73af0d954da146a04e758f89… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 16:49:13 2011 +0100 gdi32/tests: Add broken behaviour on nt4 sp1 and 2. --- dlls/gdi32/tests/bitmap.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a67d781..5dedb1a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -354,7 +354,9 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ds.dsBmih.biHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); ok(ds.dsBmih.biPlanes == bmih->biPlanes, "%u != %u\n", ds.dsBmih.biPlanes, bmih->biPlanes); ok(ds.dsBmih.biBitCount == bmih->biBitCount, "%u != %u\n", ds.dsBmih.biBitCount, bmih->biBitCount); - ok(ds.dsBmih.biCompression == bmih->biCompression, "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression); + ok(ds.dsBmih.biCompression == bmih->biCompression || + ((bmih->biBitCount == 32) && broken(ds.dsBmih.biCompression == BI_BITFIELDS)), /* nt4 sp1 and 2 */ + "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression); ok(ds.dsBmih.biSizeImage == bmih->biSizeImage, "%u != %u\n", ds.dsBmih.biSizeImage, bmih->biSizeImage); ok(ds.dsBmih.biXPelsPerMeter == bmih->biXPelsPerMeter, "%d != %d\n", ds.dsBmih.biXPelsPerMeter, bmih->biXPelsPerMeter); ok(ds.dsBmih.biYPelsPerMeter == bmih->biYPelsPerMeter, "%d != %d\n", ds.dsBmih.biYPelsPerMeter, bmih->biYPelsPerMeter); @@ -1786,7 +1788,7 @@ static void test_GetDIBits_BI_BITFIELDS(void) if (dibinfo->bmiHeader.biBitCount > 8) { ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, - "compression is %u\n", dibinfo->bmiHeader.biCompression ); + "compression is %u (%d bpp)\n", dibinfo->bmiHeader.biCompression, dibinfo->bmiHeader.biBitCount ); ok( !bitmasks[0], "red mask is set\n" ); ok( !bitmasks[1], "green mask is set\n" );

1 0

Huw Davies : gdi32/tests: Call ReleaseDC not DeleteDC.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: cf5dae18ac4719a0863fc93cbaca98b732690d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5dae18ac4719a0863fc93cb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 14:52:23 2011 +0100 gdi32/tests: Call ReleaseDC not DeleteDC. --- dlls/gdi32/tests/dc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index cdfea10..41d9643 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -556,7 +556,7 @@ static void test_boundsrect_invalid(void) ok(ret == 0, "Expected SetBoundsRect to return 0, got %u\n", ret); } - DeleteDC(hdc); + ReleaseDC(NULL, hdc); } static void test_desktop_colorres(void) @@ -595,7 +595,7 @@ static void test_desktop_colorres(void) } } - DeleteDC(hdc); + ReleaseDC(NULL, hdc); } START_TEST(dc)

1 0

Huw Davies : gdi32/tests: Add tests for hatched brushes.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: cd3281a0de648de0d85dce9fd9b93fc87ccdf065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3281a0de648de0d85dce9fd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 17 12:45:37 2011 +0100 gdi32/tests: Add tests for hatched brushes. --- dlls/gdi32/tests/dib.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 86e4fee..a3e6f25 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -101,6 +101,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", + "e358efb1c11172e40855de620bdb8a8e545cd790", + "9e0c2596c6ecb4f1bc97b18ec3ca493d37626608", NULL }; @@ -131,6 +133,8 @@ static const char *sha1_graphics_a8b8g8r8[] = "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", + "89abaadff4e68c738cf9251c51e3609564843381", + "f6aa3f907f620b9f3493f03cb3b4b292df3a9545", NULL }; @@ -161,6 +165,8 @@ static const char *sha1_graphics_24[] = "b4df692ac70a5f9f303270df4641ab014c6cbf46", "8bc3128ba47891366fd7b02fde7ca19100e64b9f", "e649e00efe7fea1eb8b17f7867fe089e5270c44b", + "a0bffbbfb0adf6f188479c88da04e25d76ab4822", + "92a1ab214dd8027c407814420449119466c92840", NULL }; @@ -191,6 +197,8 @@ static const char *sha1_graphics_r5g5b5[] = "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", + "656bf3b7121bcd620a0a3ad488f0d66604824577", + "d7d8493b5fa7a3a8323d6ac84245093a79f052c1", NULL }; @@ -221,6 +229,8 @@ static const char *sha1_graphics_r4g4b4[] = "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", + "8933450132bf949ba4bc28626968425b5ed2867d", + "9928a8f28a66c00069a124f7171b248817005763", NULL }; @@ -251,6 +261,8 @@ static const char *sha1_graphics_8[] = "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", + "c4efce8f7ed2d380ea5dc6fe1ef8448a27827532", + "bdc0a354635b879871077c5b712570e469863c99", NULL }; @@ -281,6 +293,8 @@ static const char *sha1_graphics_4[] = "39c16648cf6c261be71a33cec41867f28e119b94", "26ad5116562e7b58c76a26eaf521e2e40899e944", "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", + "4f827ca6927f15191588456f985bf29d2a3b3c24", + "e7de769c3d12ea9dd223bef4881c578823bec67e", NULL }; @@ -318,6 +332,8 @@ static const char *sha1_graphics_1[] = "d1e6091caa4482d3142df3b958606c41ebf4698e", "07c1116d8286fb665a1005de220eadc3d5999aaf", "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", + "f2fe295317e795a88edd0b2c52618b8cb0e7f2ce", + "ffc78c075d4be66806f6c59180772d5eed963dc0", NULL }; @@ -519,8 +535,8 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh { DWORD dib_size = get_dib_size(bmi); HPEN solid_pen, dashed_pen, orig_pen; - HBRUSH solid_brush, dib_brush, orig_brush; - INT i, y; + HBRUSH solid_brush, dib_brush, hatch_brush, orig_brush; + INT i, y, hatch_style; HRGN hrgn, hrgn2; BYTE dib_brush_buf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD) + 16 * 16 * sizeof(DWORD)]; /* Enough for 16 x 16 at 32 bpp */ BITMAPINFO *brush_bi = (BITMAPINFO*)dib_brush_buf; @@ -957,6 +973,28 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh pSetLayout(hdc, LAYOUT_LTR); } + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + if(!rop_uses_src(rop3[i])) + { + for(hatch_style = HS_HORIZONTAL; hatch_style <= HS_DIAGCROSS; hatch_style++) + { + hatch_brush = CreateHatchBrush(hatch_style, RGB(0xff, 0, 0)); + SelectObject(hdc, hatch_brush); + ret = PatBlt(hdc, 10 + i + 30 * hatch_style, y, 20, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + SelectObject(hdc, orig_brush); + DeleteObject(hatch_brush); + } + y += 25; + } + } + + compare_hash_broken_todo(bmi, bits, sha1, "hatch brushes", 1, FALSE); /* nt4 is different */ + memset(bits, 0xcc, dib_size); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(hrgn);

1 0

Stefan Dösinger : wined3d: Give GL_ARB_map_buffer_range another try.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 68b15bc5ffe6ddf5d08cbc13479eaf718ad5e39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b15bc5ffe6ddf5d08cbc134… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 21:24:26 2011 +0200 wined3d: Give GL_ARB_map_buffer_range another try. Nvidia's 270.xx.yy driver series fix the glMapBuffer alignment issues that caused major performance problems. If the user is using an older driver we now drop the VBO instead of using doublebuffered loading, which means that we fall back to the current behavior(no dynamic VBO) as needed. Dynamic VBOs are needed on Nvidia drivers for GL_ARB_instanced_arrays. --- dlls/wined3d/buffer.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d9d9a2a..58352c9 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1212,8 +1212,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.allocatedMemory, buffer); - /* GL_ARB_map_buffer_range is disabled for now due to numerous bugs and no gains */ - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others).

1 0

Stefan Dösinger : wined3d: Drop the VBO when the GL alignment doesn't fit on dynamic buffers.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 12140b515871bd4cf672a7776f350b40c89b7cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=12140b515871bd4cf672a7776… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 19 21:23:15 2011 +0200 wined3d: Drop the VBO when the GL alignment doesn't fit on dynamic buffers. --- dlls/wined3d/buffer.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f6ff2a..d9d9a2a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1053,8 +1053,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN if (((DWORD_PTR)buffer->resource.allocatedMemory) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned, falling back to double buffered operation.\n", - buffer->resource.allocatedMemory, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer->resource.allocatedMemory, RESOURCE_ALIGNMENT); ENTER_GL(); GL_EXTCALL(glUnmapBufferARB(buffer->buffer_type_hint)); @@ -1062,7 +1061,21 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN LEAVE_GL(); buffer->resource.allocatedMemory = NULL; - buffer_get_sysmem(buffer, gl_info); + if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + { + /* The extra copy is more expensive than not using VBOs at + * all on the Nvidia Linux driver, which is the only driver + * that returns unaligned pointers + */ + TRACE("Dynamic buffer, dropping VBO\n"); + buffer_unload(&buffer->resource); + buffer->flags &= ~WINED3D_BUFFER_CREATEBO; + } + else + { + TRACE("Falling back to doublebuffered operation\n"); + buffer_get_sysmem(buffer, gl_info); + } TRACE("New pointer is %p.\n", buffer->resource.allocatedMemory); } context_release(context);

1 0

Stefan Dösinger : ddraw: Implement IDirect3D7:: EvictManagedTextures.
by Alexandre Julliard June 17, 2011

June 17, 2011

Module: wine Branch: master Commit: 07c761a6a14a6fda05ed19bdaac399d1f117aca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c761a6a14a6fda05ed19bda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 14 20:21:08 2011 +0200 ddraw: Implement IDirect3D7::EvictManagedTextures. --- dlls/ddraw/ddraw.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2dbad98..0474d19 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5126,12 +5126,16 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device *****************************************************************************/ static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface) { - FIXME("iface %p stub!\n", iface); + IDirectDrawImpl *This = impl_from_IDirect3D7(iface); + HRESULT hr; + TRACE("iface %p!\n", iface); - /* TODO: Just enumerate resources using IWineD3DDevice_EnumResources(), - * then unload surfaces / textures. */ + EnterCriticalSection(&ddraw_cs); + if (!This->d3d_initialized) hr = D3D_OK; + else hr = wined3d_device_evict_managed_resources(This->wined3d_device); + LeaveCriticalSection(&ddraw_cs); - return D3D_OK; + return hr; } static HRESULT WINAPI d3d3_EvictManagedTextures(IDirect3D3 *iface)

1 0