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

Dmitry Timoshkov : schedsvc: Add some tests for SchRpcGetTaskInfo.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 9b9b07e4cdbf61daf1fb6fdc4695d5df5e1bf1a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9b07e4cdbf61daf1fb6fdc4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:49 2014 +0900 schedsvc: Add some tests for SchRpcGetTaskInfo. --- dlls/schedsvc/tests/rpcapi.c | 50 ++++++++++++++++++++++++++++++++++++++++-- include/wine/schrpc.idl | 1 + 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 2ef50c9..480aa83 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -93,7 +93,7 @@ START_TEST(rpcapi) }; WCHAR xmlW[sizeof(xml1)], *xml; HRESULT hr; - DWORD version, start_index, count, i, enumed; + DWORD version, start_index, count, i, enumed, enabled, state; WCHAR *path; TASK_XML_ERROR_INFO *info; TASK_NAMES names; @@ -407,7 +407,7 @@ START_TEST(rpcapi) ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), - "expected Task3, got %s\n", wine_dbgstr_w(names[0])); + "expected Task1, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -473,6 +473,52 @@ START_TEST(rpcapi) MIDL_user_free(names[0]); MIDL_user_free(names); + if (0) /* crashes under win7 */ + { + hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); + hr = SchRpcGetTaskInfo(Task1, 0, NULL, NULL); + hr = SchRpcGetTaskInfo(Task1, 0, &enabled, NULL); + hr = SchRpcGetTaskInfo(Task1, 0, NULL, &state); + } + + hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + + enabled = state = 0xdeadbeef; + hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); +if (hr == S_OK) +{ + ok(enabled == 0, "expected 0, got %u\n", enabled); + ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); +} + + enabled = state = 0xdeadbeef; + hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); +if (hr == S_OK) +{ + ok(enabled == 0, "expected 0, got %u\n", enabled); + ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); +} + + hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + enabled = state = 0xdeadbeef; + hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); +if (hr == S_OK) +{ + ok(enabled == 1, "expected 1, got %u\n", enabled); + ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); +} + hr = SchRpcDelete(Wine_Task1+1, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = SchRpcDelete(Wine_Task2+1, 0); diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 55acb38..4af709d 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -19,6 +19,7 @@ */ cpp_quote("#define SCHEDSVC_TRANSPORT {'n','c','a','l','r','p','c',0}") +cpp_quote("#define SCH_FLAG_STATE 0x10000000") import "oaidl.idl"; import "ocidl.idl";

1 0

Thomas Faber : ntdll/tests: Add tests for RtlUTF8ToUnicodeN.
by Alexandre Julliard April 9, 2014

April 9, 2014

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

Dmitry Timoshkov : schedsvc: Add SchRpcGetTaskInfo stub implementation.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 67100eb29c1e11bf3cdc20856bb8d2c55e384670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67100eb29c1e11bf3cdc20856… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 9 18:50:53 2014 +0900 schedsvc: Add SchRpcGetTaskInfo stub implementation. --- dlls/schedsvc/schedsvc.c | 16 +++++++++++++++- dlls/schedsvc/tests/rpcapi.c | 15 ++------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index a0daab2..eb84998 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -664,8 +664,22 @@ HRESULT __cdecl SchRpcGetLastRunInfo(const WCHAR *path, SYSTEMTIME *last_runtime HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled, DWORD *task_state) { + WCHAR *full_name, *xml; + HRESULT hr; + FIXME("%s,%#x,%p,%p: stub\n", debugstr_w(path), flags, enabled, task_state); - return E_NOTIMPL; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + hr = read_xml(full_name, &xml); + heap_free(full_name); + if (hr != S_OK) return hr; + heap_free(xml); + + *enabled = 0; + *task_state = (flags & SCH_FLAG_STATE) ? TASK_STATE_DISABLED : TASK_STATE_UNKNOWN; + return S_OK; } HRESULT __cdecl SchRpcGetNumberOfMissedRuns(const WCHAR *path, DWORD *runs) diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 480aa83..02f6882 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -482,28 +482,19 @@ START_TEST(rpcapi) } hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -if (hr == S_OK) -{ ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); -} enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -if (hr == S_OK) -{ ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); -} hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); todo_wine @@ -511,13 +502,11 @@ todo_wine enabled = state = 0xdeadbeef; hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); -todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -if (hr == S_OK) -{ +todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); +todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); -} hr = SchRpcDelete(Wine_Task1+1, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Piotr Caban : server: Don' t debug children when DEBUG_PROCESS and DEBUG_ONLY_THIS_PROCESS flags are passed to CreateProcess.
by Alexandre Julliard April 9, 2014

April 9, 2014

Module: wine Branch: master Commit: 4fca1693018de3c77d8fea0c10753f40c7a3cd1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fca1693018de3c77d8fea0c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 9 10:15:41 2014 +0200 server: Don't debug children when DEBUG_PROCESS and DEBUG_ONLY_THIS_PROCESS flags are passed to CreateProcess. --- dlls/kernel32/tests/debugger.c | 1 + server/process.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 41e4f1a..011ed5f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -846,6 +846,7 @@ START_TEST(debugger) test_debug_loop(myARGC, myARGV); test_debug_children(myARGV[0], DEBUG_PROCESS, TRUE); test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE); + test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE); test_debug_children(myARGV[0], 0, FALSE); } } diff --git a/server/process.c b/server/process.c index ceaef64..7b9a3b2 100644 --- a/server/process.c +++ b/server/process.c @@ -955,7 +955,8 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->debug_children = !!(req->create_flags & DEBUG_PROCESS); + process->debug_children = (req->create_flags & DEBUG_PROCESS) + && !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); /* connect to the window station */

1 0

Andrey Gusev : Fix broken link
by Jeremy Newman April 9, 2014

April 9, 2014

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 April 8, 2014

April 8, 2014

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 April 8, 2014

April 8, 2014

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 : ddraw: SetPrivateData(..., data = NULL, ...) is not valid.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: ee57e19b40ec60aa4481ca2e313736f4f6ed5d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee57e19b40ec60aa4481ca2e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 22:27:32 2014 +0200 ddraw: SetPrivateData(..., data = NULL, ...) is not valid. --- dlls/ddraw/surface.c | 6 ++++++ dlls/ddraw/tests/ddraw4.c | 9 +++++++++ dlls/ddraw/tests/ddraw7.c | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5cfec01..5717956 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2254,6 +2254,12 @@ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface, TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(tag), data, size, flags); + if (!data) + { + WARN("data is NULL, returning DDERR_INVALIDPARAMS.\n"); + return DDERR_INVALIDPARAMS; + } + wined3d_mutex_lock(); hr = wined3d_private_store_set_private_data(&surface->private_store, tag, data, size, flags); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 716dc43..be965dc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6103,6 +6103,15 @@ static void test_private_data(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + /* NULL pointers are not valid, but don't cause a crash. */ + hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, NULL, + sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, NULL, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, NULL, 1, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* DDSPD_IUNKNOWNPOINTER needs sizeof(IUnknown *) bytes of data. */ hr = IDirectDrawSurface4_SetPrivateData(surface, &ddraw_private_data_test_guid, ddraw, 0, DDSPD_IUNKNOWNPOINTER); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 31d552d..940d28b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5958,6 +5958,15 @@ static void test_private_data(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + /* NULL pointers are not valid, but don't cause a crash. */ + hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, NULL, + sizeof(IUnknown *), DDSPD_IUNKNOWNPOINTER); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, NULL, 0, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, NULL, 1, 0); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* DDSPD_IUNKNOWNPOINTER needs sizeof(IUnknown *) bytes of data. */ hr = IDirectDrawSurface7_SetPrivateData(surface, &ddraw_private_data_test_guid, ddraw, 0, DDSPD_IUNKNOWNPOINTER);

1 0

Stefan Dösinger : d3d9/tests: Test locking of mipmap textures.
by Alexandre Julliard April 8, 2014

April 8, 2014

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

Sebastian Lackner : ntdll: Implement RtlAddFunctionTable / RtlDeleteFunctionTable for x86_64.
by Alexandre Julliard April 8, 2014

April 8, 2014

Module: wine Branch: master Commit: 98307b22fba5c0d757be15b9f355b29e97ab1d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=98307b22fba5c0d757be15b9f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 7 00:22:07 2014 +0200 ntdll: Implement RtlAddFunctionTable / RtlDeleteFunctionTable for x86_64. --- dlls/ntdll/signal_x86_64.c | 84 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0e72092..8b4c0ee 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -56,6 +56,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/exception.h" +#include "wine/list.h" #include "ntdll_misc.h" #include "wine/debug.h" @@ -271,6 +272,33 @@ typedef int (*wine_signal_handler)(unsigned int sig); static wine_signal_handler handlers[256]; +/*********************************************************************** + * Dynamic unwind table + */ + +struct dynamic_unwind_entry +{ + struct list entry; + + /* memory region which matches this entry */ + DWORD64 base; + DWORD size; + + /* lookup table */ + RUNTIME_FUNCTION *table; + DWORD table_size; +}; + +static struct list dynamic_unwind_list = LIST_INIT(dynamic_unwind_list); + +static RTL_CRITICAL_SECTION dynamic_unwind_section; +static RTL_CRITICAL_SECTION_DEBUG dynamic_unwind_debug = +{ + 0, 0, &dynamic_unwind_section, + { &dynamic_unwind_debug.ProcessLocksList, &dynamic_unwind_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": dynamic_unwind_section") } +}; +static RTL_CRITICAL_SECTION dynamic_unwind_section = { &dynamic_unwind_debug, -1, 0, 0, 0, 0 }; /*********************************************************************** * Definitions for Win32 unwind tables @@ -1927,6 +1955,7 @@ static RUNTIME_FUNCTION *find_function_info( ULONG64 pc, HMODULE module, static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MODULE **module ) { RUNTIME_FUNCTION *func = NULL; + struct dynamic_unwind_entry *entry; ULONG size; /* PE module or wine module */ @@ -1941,8 +1970,22 @@ static RUNTIME_FUNCTION *lookup_function_info( ULONG64 pc, ULONG64 *base, LDR_MO } } else + { *module = NULL; + RtlEnterCriticalSection( &dynamic_unwind_section ); + LIST_FOR_EACH_ENTRY( entry, &dynamic_unwind_list, struct dynamic_unwind_entry, entry ) + { + if (pc >= entry->base && pc < entry->base + entry->size) + { + *base = entry->base; + func = find_function_info( pc, (HMODULE)entry->base, entry->table, entry->table_size ); + break; + } + } + RtlLeaveCriticalSection( &dynamic_unwind_section ); + } + return func; } @@ -2528,7 +2571,25 @@ void signal_init_process(void) */ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 addr ) { - FIXME( "%p %u %lx: stub\n", table, count, addr ); + struct dynamic_unwind_entry *entry; + + TRACE( "%p %u %lx\n", table, count, addr ); + + /* NOTE: Windows doesn't check if table is aligned or a NULL pointer */ + + entry = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*entry) ); + if (!entry) + return FALSE; + + entry->base = addr; + entry->size = table[count - 1].EndAddress; + entry->table = table; + entry->table_size = count * sizeof(RUNTIME_FUNCTION); + + RtlEnterCriticalSection( &dynamic_unwind_section ); + list_add_tail( &dynamic_unwind_list, &entry->entry ); + RtlLeaveCriticalSection( &dynamic_unwind_section ); + return TRUE; } @@ -2538,7 +2599,26 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD64 */ BOOLEAN CDECL RtlDeleteFunctionTable( RUNTIME_FUNCTION *table ) { - FIXME( "%p: stub\n", table ); + struct dynamic_unwind_entry *entry, *to_free = NULL; + + TRACE( "%p\n", table ); + + RtlEnterCriticalSection( &dynamic_unwind_section ); + LIST_FOR_EACH_ENTRY( entry, &dynamic_unwind_list, struct dynamic_unwind_entry, entry ) + { + if (entry->table == table) + { + to_free = entry; + list_remove( &entry->entry ); + break; + } + } + RtlLeaveCriticalSection( &dynamic_unwind_section ); + + if (!to_free) + return FALSE; + + RtlFreeHeap( GetProcessHeap(), 0, to_free ); return TRUE; }

1 0