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

André Hentschel : winebuild: Simplify the ARM part of output_import_thunk.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: ac90c1bd1878599710605fa5b4e2fe8ce224b280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac90c1bd1878599710605fa5b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 17 16:53:12 2011 +0200 winebuild: Simplify the ARM part of output_import_thunk. --- tools/winebuild/import.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b0901a6..00c030b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -672,9 +672,8 @@ static void output_import_thunk( const char *name, const char *table, int pos ) break; case CPU_ARM: output( "\tldr IP,[PC,#0]\n"); - output( "\tmov PC,PC\n"); - output( "\t.long %s\n", table ); output( "\tldr PC,[IP,#%d]\n", pos); + output( "\t.long %s\n", table ); break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) );

1 0

Huw Davies : gdi32: Add support for hatched brushes.
by Alexandre Julliard 17 Jun '11

17 Jun '11

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 tests for hatched brushes.
by Alexandre Julliard 17 Jun '11

17 Jun '11

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

Huw Davies : gdi32/tests: Call ReleaseDC not DeleteDC.
by Alexandre Julliard 17 Jun '11

17 Jun '11

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 broken behaviour on nt4 sp1-5.
by Alexandre Julliard 17 Jun '11

17 Jun '11

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 17 Jun '11

17 Jun '11

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

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

17 Jun '11

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

Alexandre Julliard : server: Don't queue low-level hooks to a hung queue.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: f6b0ce3c44060862d79e768385c3c3ad1643fe4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b0ce3c44060862d79e76838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 17 11:54:43 2011 +0200 server: Don't queue low-level hooks to a hung queue. --- server/queue.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/queue.c b/server/queue.c index 8bf2336..d514a52 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1405,6 +1405,7 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa if (!(hook_thread = get_first_global_hook( id ))) return 0; if (!(queue = hook_thread->queue)) return 0; + if (is_queue_hung( queue )) return 0; if (!(msg = mem_alloc( sizeof(*msg) ))) return 0;

1 0

Adam Martinson : msxml3: SysAllocString*() automatically allocates a terminating NULL.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 98580b5d36577443ae473ab20a602d0a59c29c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98580b5d36577443ae473ab20… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Jun 16 21:43:54 2011 -0500 msxml3: SysAllocString*() automatically allocates a terminating NULL. --- dlls/msxml3/node.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a2e4d6f..681cd44 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -858,7 +858,7 @@ BSTR EnsureCorrectEOL(BSTR sInput) if(nNum > 0) { int nPlace = 0; - sNew = SysAllocStringLen(NULL, nLen + nNum+1); + sNew = SysAllocStringLen(NULL, nLen + nNum); for(i=0; i < nLen; i++) { if(sInput[i] == '\n')

1 0

Charles Welton : d3dx9: Implemented GetDevice method.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 3993eef04f7d44a1c415ffffdc3cbf1c74a8d5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3993eef04f7d44a1c415ffffd… Author: Charles Welton <charleswfb(a)gmail.com> Date: Thu Jun 16 17:19:49 2011 -0300 d3dx9: Implemented GetDevice method. --- dlls/d3dx9_36/line.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index e3a0e73..cf49642 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -27,6 +27,8 @@ static const struct ID3DXLineVtbl ID3DXLine_Vtbl; typedef struct ID3DXLineImpl { ID3DXLine ID3DXLine_iface; LONG ref; + + IDirect3DDevice9 *device; } ID3DXLineImpl; static inline ID3DXLineImpl *impl_from_ID3DXLine(ID3DXLine *iface) @@ -71,7 +73,10 @@ static ULONG WINAPI ID3DXLineImpl_Release(ID3DXLine* iface) TRACE("(%p)->(): Release from %u\n", This, ref + 1); if (!ref) + { + IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -81,9 +86,14 @@ static HRESULT WINAPI ID3DXLineImpl_GetDevice(ID3DXLine* iface, LPDIRECT3DDEVICE { ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - FIXME("(%p)->(%p): stub\n", This, device); + TRACE ("(%p)->(%p): relay\n", This, device); - return E_NOTIMPL; + if (device == NULL) return D3DERR_INVALIDCALL; + + *device = This->device; + IDirect3DDevice9_AddRef(This->device); + + return D3D_OK; } static HRESULT WINAPI ID3DXLineImpl_Begin(ID3DXLine* iface) @@ -274,6 +284,8 @@ HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE* line) object->ID3DXLine_iface.lpVtbl = &ID3DXLine_Vtbl; object->ref = 1; + object->device = device; + IDirect3DDevice9_AddRef(device); *line = &object->ID3DXLine_iface;

1 0