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

Nikolay Sivov : comctl32: Fix LVN_DELETEALLITEMS notification for LVS_OWNERDATA case.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: d24095a7d1156928ab15844a54438e1de966d9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24095a7d1156928ab15844a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 9 16:50:59 2014 +0400 comctl32: Fix LVN_DELETEALLITEMS notification for LVS_OWNERDATA case. --- dlls/comctl32/listview.c | 17 ++++++++++------- dlls/comctl32/tests/listview.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c5b5670..fa9895d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5383,9 +5383,8 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP */ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) { - NMLISTVIEW nmlv; HDPA hdpaSubItems = NULL; - BOOL bSuppress; + BOOL suppress = FALSE; ITEMHDR *hdrItem; ITEM_INFO *lpItem; ITEM_ID *lpID; @@ -5400,11 +5399,15 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) SetRectEmpty(&infoPtr->rcFocus); /* But we are supposed to leave nHotItem as is! */ - /* send LVN_DELETEALLITEMS notification */ - ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); - nmlv.iItem = -1; - bSuppress = notify_listview(infoPtr, LVN_DELETEALLITEMS, &nmlv); + if (!(infoPtr->dwStyle & LVS_OWNERDATA) || !destroy) + { + NMLISTVIEW nmlv; + + memset(&nmlv, 0, sizeof(NMLISTVIEW)); + nmlv.iItem = -1; + suppress = notify_listview(infoPtr, LVN_DELETEALLITEMS, &nmlv); + } for (i = infoPtr->nItemCount - 1; i >= 0; i--) { @@ -5412,7 +5415,7 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) { /* send LVN_DELETEITEM notification, if not suppressed and if it is not a virtual listview */ - if (!bSuppress) notify_deleteitem(infoPtr, i); + if (!suppress) notify_deleteitem(infoPtr, i); hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); lpItem = DPA_GetPtr(hdpaSubItems, 0); /* free id struct */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f5d0a01..9310f56 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -330,6 +330,23 @@ static const struct message listview_destroy[] = { { 0 } }; +static const struct message listview_ownerdata_destroy[] = { + { 0x0090, sent|optional }, /* Vista */ + { WM_PARENTNOTIFY, sent }, + { WM_SHOWWINDOW, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_DESTROY, sent }, + { WM_NCDESTROY, sent }, + { 0 } +}; + +static const struct message listview_ownerdata_deleteall[] = { + { LVM_DELETEALLITEMS, sent }, + { WM_NOTIFY, sent|id, 0, 0, LVN_DELETEALLITEMS }, + { 0 } +}; + static const struct message listview_header_changed_seq[] = { { LVM_SETCOLUMNA, sent }, { WM_NOTIFY, sent|id|defwinproc, 0, 0, LISTVIEW_ID }, @@ -5059,6 +5076,7 @@ static void test_hover(void) static void test_destroynotify(void) { HWND hwnd; + BOOL ret; hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create listview window\n"); @@ -5066,6 +5084,23 @@ static void test_destroynotify(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(hwnd); ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_destroy, "check destroy order", FALSE); + + /* same for ownerdata list */ + hwnd = create_listview_control(LVS_REPORT|LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create listview window\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_ownerdata_destroy, "check destroy order, ownerdata", FALSE); + + hwnd = create_listview_control(LVS_REPORT|LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create listview window\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hwnd, LVM_DELETEALLITEMS, 0, 0); + ok(ret == TRUE, "got %d\n", ret); + ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_ownerdata_deleteall, "deleteall ownerdata", FALSE); + DestroyWindow(hwnd); } static void test_header_notification(void)

1 0

Thomas Faber : ntdll/tests: Add tests for RtlUnicodeToUTF8N.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 9694360a274bceecb1fb68d5a44c94a0a92f9b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9694360a274bceecb1fb68d5a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 29 16:14:23 2014 +0100 ntdll/tests: Add tests for RtlUnicodeToUTF8N. --- dlls/ntdll/tests/rtlstr.c | 252 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9694360a274bceecb1fb6…

1 0

Thomas Faber : ntdll/tests: Add tests for RtlUTF8ToUnicodeN.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 2d80ef28d0ce4331a95e6e16bb6caf0a811480ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d80ef28d0ce4331a95e6e16b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 29 16:25:25 2014 +0100 ntdll/tests: Add tests for RtlUTF8ToUnicodeN. --- dlls/ntdll/tests/rtlstr.c | 275 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d80ef28d0ce4331a95e6…

1 0

Alistair Leslie-Hughes : hnetcfg: Register NetFwOpenPort interface.
by Alexandre Julliard 09 Apr '14

09 Apr '14

Module: wine Branch: master Commit: 9938eef4bc5a2b43c917e7d874da96d327a79b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9938eef4bc5a2b43c917e7d87… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 8 09:34:10 2014 +1000 hnetcfg: Register NetFwOpenPort interface. --- dlls/hnetcfg/hnetcfg.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/hnetcfg/hnetcfg.idl b/dlls/hnetcfg/hnetcfg.idl index 0ba4be2..9934f6a 100644 --- a/dlls/hnetcfg/hnetcfg.idl +++ b/dlls/hnetcfg/hnetcfg.idl @@ -35,3 +35,11 @@ coclass NetFwMgr { interface INetFwMgr; } uuid(ec9846b3-2762-4a6b-a214-6acb603462d2) ] coclass NetFwAuthorizedApplication { interface INetFwAuthorizedApplications; } + +[ + helpstring("HNetCfg.FwOpenPort"), + progid("HNetCfg.FwOpenPort"), + threading(both), + uuid(0ca545c6-37ad-4a6c-bf92-9f7610067ef5) +] +coclass NetFwOpenPort { interface INetFwOpenPort; }

1 0

Andrey Gusev : Fix broken link
by Jeremy Newman 09 Apr '14

09 Apr '14

Module: website Branch: master Commit: a283c86d2f94d604de992faf43f66048eb22a562 URL: http://source.winehq.org/git/website.git/?a=commit;h=a283c86d2f94d604de992f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 9 12:02:50 2014 +0300 Fix broken link Fixes bug #35746 --- templates/de/download/debian.template | 2 +- templates/de/download/ubuntu.template | 2 +- templates/en/download/debian.template | 2 +- templates/en/download/ubuntu.template | 2 +- templates/fr/download/debian.template | 2 +- templates/fr/download/ubuntu.template | 2 +- templates/he/download/deb.template | 2 +- templates/he/download/deblenny.template | 2 +- templates/pl/download/debian.template | 2 +- templates/pl/download/ubuntu.template | 2 +- templates/pt/download/debian.template | 2 +- templates/pt/download/ubuntu.template | 2 +- templates/tr/download/debian.template | 2 +- templates/tr/download/ubuntu.template | 2 +- templates/uk/download/debian.template | 2 +- templates/uk/download/ubuntu.template | 2 +- templates/zh-cn/download/debian.template | 2 +- templates/zh-cn/download/ubuntu.template | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a283c86d2f94d604de…

1 0

Zhenbo Li : mshtml: Don't free a string too early.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: c4a51b0b0afa2ad03bea76d540f6028532e7acd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a51b0b0afa2ad03bea76d54… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Apr 6 22:44:39 2014 +0800 mshtml: Don't free a string too early. --- dlls/mshtml/htmltablerow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index f3a4970..74750bd 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -200,7 +200,6 @@ static HRESULT WINAPI HTMLTableRow_get_bgColor(IHTMLTableRow *iface, VARIANT *p) nsAString_Init(&strColor, NULL); nsres = nsIDOMHTMLTableRowElement_GetBgColor(This->nsrow, &strColor); - nsAString_Finish(&strColor); if(NS_SUCCEEDED(nsres)) { nsAString_GetData(&strColor, &color); @@ -211,6 +210,7 @@ static HRESULT WINAPI HTMLTableRow_get_bgColor(IHTMLTableRow *iface, VARIANT *p) hres = E_FAIL; } + nsAString_Finish(&strColor); return hres; }

1 0

Zhenbo Li : mshtml: Added IHTMLTable::bgColor property implementation.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 22c2d81a2d334a8ec324fb9bdb71c8f08ce12158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c2d81a2d334a8ec324fb9bd… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Apr 6 22:48:41 2014 +0800 mshtml: Added IHTMLTable::bgColor property implementation. --- dlls/mshtml/htmltable.c | 41 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index e3a1264..d711ed7 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -246,15 +246,48 @@ static HRESULT WINAPI HTMLTable_get_background(IHTMLTable *iface, BSTR *p) static HRESULT WINAPI HTMLTable_put_bgColor(IHTMLTable *iface, VARIANT v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + nsAString_InitDepend(&val, V_BSTR(&v)); + variant_to_nscolor(&v, &val); + nsres = nsIDOMHTMLTableElement_SetBgColor(This->nstable, &val); + nsAString_Finish(&val); + + if (NS_FAILED(nsres)){ + ERR("Set BgColor(%s) failed!\n", debugstr_variant(&v)); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTable_get_bgColor(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString strColor; + nsresult nsres; + HRESULT hres; + const PRUnichar *color; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&strColor, NULL); + nsres = nsIDOMHTMLTableElement_GetBgColor(This->nstable, &strColor); + + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&strColor, &color); + V_VT(p) = VT_BSTR; + hres = nscolor_to_str(color, &V_BSTR(p)); + }else { + ERR("SetBgColor failed: %08x\n", nsres); + hres = E_FAIL; + } + + nsAString_Finish(&strColor); + return hres; } static HRESULT WINAPI HTMLTable_put_borderColor(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 76c283a..23677f4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5729,6 +5729,7 @@ static void test_table_elem(IHTMLElement *elem) VARIANT v; HRESULT hres; BSTR bstr; + VARIANT vbg, vDefaultbg; static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; @@ -5794,6 +5795,40 @@ static void test_table_elem(IHTMLElement *elem) ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hres = IHTMLTable_get_bgColor(table, &vDefaultbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "bstr != NULL\n"); + ok(!V_BSTR(&vDefaultbg), "V_BSTR(bgColor) = %s\n", wine_dbgstr_w(V_BSTR(&vDefaultbg))); + + V_VT(&vbg) = VT_BSTR; + V_BSTR(&vbg) = a2bstr("red"); + hres = IHTMLTable_put_bgColor(table, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTable_get_bgColor(table, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + V_VT(&vbg) = VT_I4; + V_I4(&vbg) = 0xff0000; + hres = IHTMLTable_put_bgColor(table, vbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vbg); + + hres = IHTMLTable_get_bgColor(table, &vbg); + ok(hres == S_OK, "get_bgColor failed: %08x\n", hres); + ok(V_VT(&vDefaultbg) == VT_BSTR, "V_VT(&vDefaultbg) != VT_BSTR\n"); + ok(!strcmp_wa(V_BSTR(&vbg), "#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); + VariantClear(&vbg); + + /* Restore Originial */ + hres = IHTMLTable_put_bgColor(table, vDefaultbg); + ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); + VariantClear(&vDefaultbg); + IHTMLTable_Release(table); }

1 0

Stefan Dösinger : d3d9/tests: Test locking of mipmap textures.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 9177261a223293ee84791eb4897c75909389fe48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9177261a223293ee84791eb48… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 22:27:28 2014 +0200 d3d9/tests: Test locking of mipmap textures. --- dlls/d3d9/tests/device.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 550c95e..9128292 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7781,6 +7781,78 @@ static void test_resource_type(void) DestroyWindow(window); } +static void test_mipmap_lock(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *surface, *surface2, *surface_dst, *surface_dst2; + IDirect3DTexture9 *texture, *texture_dst; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + D3DLOCKED_RECT locked_rect; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 2, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, &texture_dst, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture_dst, 0, &surface_dst); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture_dst, 1, &surface_dst2); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 4, 4, 2, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 1, &surface2); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_LockRect(surface2, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, surface_dst, NULL); + ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_UpdateSurface(device, surface2, NULL, surface_dst2, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + /* Apparently there's no validation on the container. */ + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, + (IDirect3DBaseTexture9 *)texture_dst); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + hr = IDirect3DSurface9_UnlockRect(surface2); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface_dst2); + IDirect3DSurface9_Release(surface_dst); + IDirect3DSurface9_Release(surface2); + IDirect3DSurface9_Release(surface); + IDirect3DTexture9_Release(texture_dst); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -7870,6 +7942,7 @@ START_TEST(device) test_shader_constant_apply(); test_vdecl_apply(); test_resource_type(); + test_mipmap_lock(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d8/tests: Test locking of mipmap textures.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 2bf09a153866300ac18a38f84be6bd75e110e5d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf09a153866300ac18a38f84… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 22:27:29 2014 +0200 d3d8/tests: Test locking of mipmap textures. --- dlls/d3d8/tests/device.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 37621bf..8d5403c 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6101,6 +6101,77 @@ static void test_resource_type(void) DestroyWindow(window); } +static void test_mipmap_lock(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *surface, *surface2, *surface_dst, *surface_dst2; + IDirect3DTexture8 *texture, *texture_dst; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + D3DLOCKED_RECT locked_rect; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateTexture(device, 4, 4, 2, 0, D3DFMT_X8R8G8B8, + D3DPOOL_DEFAULT, &texture_dst); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture_dst, 0, &surface_dst); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture_dst, 1, &surface_dst2); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateTexture(device, 4, 4, 2, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(texture, 1, &surface2); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_LockRect(surface2, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + hr = IDirect3DDevice8_CopyRects(device, surface, NULL, 0, surface_dst, NULL); + ok(SUCCEEDED(hr), "Failed to update surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_CopyRects(device, surface2, NULL, 0, surface_dst2, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + /* Apparently there's no validation on the container. */ + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)texture, + (IDirect3DBaseTexture8 *)texture_dst); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + hr = IDirect3DSurface8_UnlockRect(surface2); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface_dst2); + IDirect3DSurface8_Release(surface_dst); + IDirect3DSurface8_Release(surface2); + IDirect3DSurface8_Release(surface); + IDirect3DTexture8_Release(texture_dst); + IDirect3DTexture8_Release(texture); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6184,6 +6255,7 @@ START_TEST(device) test_begin_end_state_block(); test_shader_constant_apply(); test_resource_type(); + test_mipmap_lock(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : ddraw/tests: Nvidia has an off-by-one rectangle handling bug.
by Alexandre Julliard 08 Apr '14

08 Apr '14

Module: wine Branch: master Commit: 24187d5397867ffffef46a59543021f19358cce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24187d5397867ffffef46a595… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 22:27:30 2014 +0200 ddraw/tests: Nvidia has an off-by-one rectangle handling bug. --- dlls/ddraw/tests/ddraw1.c | 18 +++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 18 +++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 18 +++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 18 +++++++++++++++++- 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 857882a..c5caff3 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -556,6 +556,21 @@ static void test_clipper_blt(void) 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, }; + /* Nvidia on Windows seems to have an off-by-one error + * when processing source rectangles. Our left = 1 and + * right = 5 input reads from x = {1, 2, 3}. x = 4 is + * read as well, but only for the edge pixels on the + * output image. The bug happens on the y axis as well, + * but we only read one row there, and all source rows + * contain the same data. This bug is not dependent on + * the presence of a clipper. */ + static const D3DCOLOR expected1_broken[] = + { + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00ff0000, 0x00ff0000, + 0x00000000, 0x00000000, 0x0000ff00, 0x00ff0000, + }; static const D3DCOLOR expected2[] = { 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, @@ -669,7 +684,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - ok(compare_color(color, expected1[i * 4 + j], 1), + ok(compare_color(color, expected1[i * 4 + j], 1) + || broken(compare_color(color, expected1_broken[i * 4 + j], 1)), "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 36845fe..921abbd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -504,6 +504,21 @@ static void test_clipper_blt(void) 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, }; + /* Nvidia on Windows seems to have an off-by-one error + * when processing source rectangles. Our left = 1 and + * right = 5 input reads from x = {1, 2, 3}. x = 4 is + * read as well, but only for the edge pixels on the + * output image. The bug happens on the y axis as well, + * but we only read one row there, and all source rows + * contain the same data. This bug is not dependent on + * the presence of a clipper. */ + static const D3DCOLOR expected1_broken[] = + { + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00ff0000, 0x00ff0000, + 0x00000000, 0x00000000, 0x0000ff00, 0x00ff0000, + }; static const D3DCOLOR expected2[] = { 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, @@ -617,7 +632,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - ok(compare_color(color, expected1[i * 4 + j], 1), + ok(compare_color(color, expected1[i * 4 + j], 1) + || broken(compare_color(color, expected1_broken[i * 4 + j], 1)), "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bd2cf17..716dc43 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -696,6 +696,21 @@ static void test_clipper_blt(void) 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, }; + /* Nvidia on Windows seems to have an off-by-one error + * when processing source rectangles. Our left = 1 and + * right = 5 input reads from x = {1, 2, 3}. x = 4 is + * read as well, but only for the edge pixels on the + * output image. The bug happens on the y axis as well, + * but we only read one row there, and all source rows + * contain the same data. This bug is not dependent on + * the presence of a clipper. */ + static const D3DCOLOR expected1_broken[] = + { + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00ff0000, 0x00ff0000, + 0x00000000, 0x00000000, 0x0000ff00, 0x00ff0000, + }; static const D3DCOLOR expected2[] = { 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, @@ -809,7 +824,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - ok(compare_color(color, expected1[i * 4 + j], 1), + ok(compare_color(color, expected1[i * 4 + j], 1) + || broken(compare_color(color, expected1_broken[i * 4 + j], 1)), "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8aab791..31d552d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -670,6 +670,21 @@ static void test_clipper_blt(void) 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, 0x00000000, 0x00000000, 0x00ff0000, 0x00ffffff, }; + /* Nvidia on Windows seems to have an off-by-one error + * when processing source rectangles. Our left = 1 and + * right = 5 input reads from x = {1, 2, 3}. x = 4 is + * read as well, but only for the edge pixels on the + * output image. The bug happens on the y axis as well, + * but we only read one row there, and all source rows + * contain the same data. This bug is not dependent on + * the presence of a clipper. */ + static const D3DCOLOR expected1_broken[] = + { + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00ff0000, 0x00ff0000, + 0x00000000, 0x00000000, 0x0000ff00, 0x00ff0000, + }; static const D3DCOLOR expected2[] = { 0x000000ff, 0x000000ff, 0x00000000, 0x00000000, @@ -783,7 +798,8 @@ static void test_clipper_blt(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = get_surface_color(dst_surface, x, y); - ok(compare_color(color, expected1[i * 4 + j], 1), + ok(compare_color(color, expected1[i * 4 + j], 1) + || broken(compare_color(color, expected1_broken[i * 4 + j], 1)), "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected1[i * 4 + j], x, y, color); } }

1 0