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

Jacek Caban : ws2_32: Improved WSAIoctl debug messages.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 35f164fac86ac1377552beb456c6d0f6ddf1dd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f164fac86ac1377552beb45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 6 14:57:13 2014 +0100 ws2_32: Improved WSAIoctl debug messages. --- dlls/ws2_32/socket.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2a2c809..42044e6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3682,8 +3682,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID int fd; DWORD status = 0, total = 0; - TRACE("%ld, 0x%08x, %p, %d, %p, %d, %p, %p, %p\n", - s, code, in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); + TRACE("%ld, %s, %p, %d, %p, %d, %p, %p, %p\n", + s, debugstr_wsaioctl(code), in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code) { @@ -3693,6 +3693,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } + TRACE("-> FIONBIO (%x)\n", *(WS_u_long*)in_buff); if (_get_sock_mask(s)) { /* AsyncSelect()'ed sockets are always nonblocking */

1 0

Vincent Povirk : kernel32: Cache locale info from the registry.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 49f3b4282d29890fe3c213d096571af4de2c45cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f3b4282d29890fe3c213d09… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 27 16:10:58 2014 -0600 kernel32: Cache locale info from the registry. --- dlls/kernel32/locale.c | 338 ++++++++++++++++++++++++++++-------------------- 1 file changed, 200 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f3b4282d29890fe3c21…

1 0

Nikolay Sivov : msxml3: Implement endElement() for writer' s IVBSAXContentHandler.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 87fb169f9cdf18c9cd38c313d82689ddf18659c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fb169f9cdf18c9cd38c313d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 6 09:22:38 2014 +0400 msxml3: Implement endElement() for writer's IVBSAXContentHandler. --- dlls/msxml3/mxwriter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b0765c0..01e21a7 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -2112,8 +2112,16 @@ static HRESULT WINAPI VBSAXContentHandler_endElement(IVBSAXContentHandler *iface BSTR *localName, BSTR *QName) { mxwriter *This = impl_from_IVBSAXContentHandler( iface ); - FIXME("(%p)->(%p %p %p): stub\n", This, namespaceURI, localName, QName); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, namespaceURI, localName, QName); + + if (!namespaceURI || !localName || !QName) + return E_POINTER; + + return ISAXContentHandler_endElement(&This->ISAXContentHandler_iface, + *namespaceURI, SysStringLen(*namespaceURI), + *localName, SysStringLen(*localName), + *QName, SysStringLen(*QName)); } static HRESULT WINAPI VBSAXContentHandler_characters(IVBSAXContentHandler *iface, BSTR *chars)

1 0

Nikolay Sivov : oleaut32/tests: Some tests for propputref invocation.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 05c970c484f1379e33135afef2f28a075d965c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c970c484f1379e33135afef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 6 12:16:03 2014 +0400 oleaut32/tests: Some tests for propputref invocation. --- dlls/oleaut32/tests/test_reg.idl | 4 +++ dlls/oleaut32/tests/typelib.c | 59 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 385ac60..ff32a1c 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -137,5 +137,9 @@ library register_test { [propget, id(DISPID_VALUE)] LONG test([in] LONG i); + [propputref, id(1)] + LONG testprop([in] LONG *i); + [propputref, id(2)] + LONG testprop2([in] IUnknown *i); } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f27a67f..a7e7c96 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -136,6 +136,16 @@ static LONG WINAPI invoketest_get_test(IInvokeTest *iface, LONG i) return i+1; } +static LONG WINAPI invoketest_putref_testprop(IInvokeTest *iface, LONG *i) +{ + return *i+2; +} + +static LONG WINAPI invoketest_putref_testprop2(IInvokeTest *iface, IUnknown *i) +{ + return 6; +} + static const IInvokeTestVtbl invoketestvtbl = { invoketest_QueryInterface, invoketest_AddRef, @@ -144,7 +154,9 @@ static const IInvokeTestVtbl invoketestvtbl = { invoketest_GetTypeInfo, invoketest_GetIDsOfNames, invoketest_Invoke, - invoketest_get_test + invoketest_get_test, + invoketest_putref_testprop, + invoketest_putref_testprop2 }; static IInvokeTest invoketest = { &invoketestvtbl }; @@ -672,6 +684,7 @@ static void test_TypeInfo(void) const char *filenameA; WCHAR filename[MAX_PATH]; TYPEATTR *attr; + LONG l; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -866,8 +879,6 @@ static void test_TypeInfo(void) V_VT(&args[0]) = VT_I4; V_I4(&args[0]) = 0; - V_VT(&res) = VT_EMPTY; - i = 0; V_VT(&res) = VT_EMPTY; V_I4(&res) = 0; @@ -893,6 +904,48 @@ static void test_TypeInfo(void) ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + /* DISPATCH_PROPERTYPUTREF */ + l = 1; + V_VT(&args[0]) = VT_I4|VT_BYREF; + V_I4REF(&args[0]) = &l; + + dispidMember = DISPID_PROPERTYPUT; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidMember; + dispparams.rgvarg = args; + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 1, DISPATCH_PROPERTYPUTREF, &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 3, "got %d\n", V_I4(&res)); + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 1, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + + i = 0; + V_VT(&args[0]) = VT_UNKNOWN; + V_UNKNOWN(&args[0]) = NULL; + + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 2, DISPATCH_PROPERTYPUTREF, &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 6, "got %d\n", V_I4(&res)); + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 2, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); DeleteFileA(filenameA);

1 0

Henri Verbeet : wined3d: Get rid of GL_VENDOR_INTEL.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: ae63dee5178521a1af3fc0347e5e311f6f1f4892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae63dee5178521a1af3fc0347… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:05 2014 +0100 wined3d: Get rid of GL_VENDOR_INTEL. --- dlls/wined3d/directx.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 178b246..eaf2427 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -69,7 +69,6 @@ enum wined3d_gl_vendor GL_VENDOR_UNKNOWN, GL_VENDOR_APPLE, GL_VENDOR_FGLRX, - GL_VENDOR_INTEL, GL_VENDOR_MESA, GL_VENDOR_NVIDIA, }; @@ -1577,20 +1576,16 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in if (strstr(gl_vendor_string, "ATI")) return GL_VENDOR_FGLRX; - if (strstr(gl_vendor_string, "Intel(R)") - /* Intel switched from Intel(R) to Intel® recently, so just match Intel. */ - || strstr(gl_renderer, "Intel") - || strstr(gl_vendor_string, "Intel Inc.")) - return GL_VENDOR_INTEL; - if (strstr(gl_vendor_string, "Mesa") || strstr(gl_vendor_string, "X.Org") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") || strstr(gl_vendor_string, "DRI R300 Project") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.") + || strstr(gl_vendor_string, "Intel") || strstr(gl_renderer, "Mesa") - || strstr(gl_renderer, "Gallium")) + || strstr(gl_renderer, "Gallium") + || strstr(gl_renderer, "Intel")) return GL_VENDOR_MESA; FIXME("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_UNKNOWN.\n", @@ -2282,7 +2277,6 @@ vmware_gl_vendor_table[] = intel_gl_vendor_table[] = { {GL_VENDOR_APPLE, "Apple OSX Intel binary driver", select_card_intel}, - {GL_VENDOR_INTEL, "Mesa Intel driver", select_card_intel}, {GL_VENDOR_MESA, "Mesa Intel driver", select_card_intel}, };

1 0

Henri Verbeet : ddraw/tests: Verify that creating a ddraw object works before running any real tests.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 0b547ee750f7fb5dfc61a7f66e73511ca03726b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b547ee750f7fb5dfc61a7f66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:06 2014 +0100 ddraw/tests: Verify that creating a ddraw object works before running any real tests. --- dlls/ddraw/tests/ddraw1.c | 272 ++++++++++-------------------------- dlls/ddraw/tests/ddraw2.c | 335 +++++++++++++-------------------------------- dlls/ddraw/tests/ddraw4.c | 254 ++++++++++------------------------ dlls/ddraw/tests/ddraw7.c | 244 ++++++++++----------------------- 4 files changed, 320 insertions(+), 785 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b547ee750f7fb5dfc61a…

1 0

Henri Verbeet : d3d8/tests: Don't bother handling Direct3DCreate8() failures, we verified it works earlier.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: db34ccd7f2cb6d509921ca3903636045338cd3df URL: http://source.winehq.org/git/wine.git/?a=commit;h=db34ccd7f2cb6d509921ca390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:07 2014 +0100 d3d8/tests: Don't bother handling Direct3DCreate8() failures, we verified it works earlier. --- dlls/d3d8/tests/device.c | 582 +++++++++++++++++----------------------------- 1 file changed, 214 insertions(+), 368 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db34ccd7f2cb6d509921c…

1 0

Henri Verbeet : d3d9/tests: Don't bother handling Direct3DCreate9() failures, we verified it works earlier.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: b50235ab3518a9011213623f7f58504d96e6c623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b50235ab3518a9011213623f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:08 2014 +0100 d3d9/tests: Don't bother handling Direct3DCreate9() failures, we verified it works earlier. --- dlls/d3d9/tests/device.c | 716 ++++++++++++++++------------------------------ 1 file changed, 244 insertions(+), 472 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b50235ab3518a90112136…

1 0

Dmitry Timoshkov : taskschd/tests: Add more ITaskFolder:: RegisterTask tests.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: e06bac6ad8a97e548e58656b95b3be8bf20c2371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06bac6ad8a97e548e58656b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:25:36 2014 +0900 taskschd/tests: Add more ITaskFolder::RegisterTask tests. --- dlls/taskschd/tests/scheduler.c | 53 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d554779..0f89021 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -702,6 +702,26 @@ static void test_GetTask(void) " </Exec>\n" " </Actions>\n" "</Task>\n"; + static const struct + { + DWORD flags, hr; + } create_new_task[] = + { + { 0, S_OK }, + { TASK_CREATE, S_OK }, + { TASK_UPDATE, 0x80070002 /* HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ }, + { TASK_CREATE | TASK_UPDATE, S_OK } + }; + static const struct + { + DWORD flags, hr; + } open_existing_task[] = + { + { 0, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { TASK_CREATE, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { TASK_UPDATE, S_OK }, + { TASK_CREATE | TASK_UPDATE, S_OK } + }; WCHAR xmlW[sizeof(xml1)]; HRESULT hr; BSTR bstr; @@ -712,6 +732,7 @@ static void test_GetTask(void) ITaskFolder *root, *folder; IRegisteredTask *task1, *task2; IID iid; + int i; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -746,14 +767,34 @@ static void test_GetTask(void) hr = ITaskFolder_GetTask(root, Wine, &task1); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); } + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + { + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +/* FIXME: Remove once Wine is fixed */ +if (create_new_task[i].hr != S_OK) todo_wine + ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); +else + ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); + if (hr == S_OK) + { + hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); +todo_wine + ok(hr == S_OK, "DeleteTask error %#x\n", hr); + } + } + hr = ITaskFolder_RegisterTask(root, Wine_Task1, NULL, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "expected RPC_X_NULL_REF_POINTER, got %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_VALIDATE_ONLY, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), "expected ERROR_ACCESS_DENIED, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -769,6 +810,16 @@ todo_wine hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); + for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + { + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +/* FIXME: Remove once Wine is fixed */ +if (open_existing_task[i].hr != S_OK) todo_wine + ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); +else + ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); + } + hr = IRegisteredTask_get_Name(task1, NULL); todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr);

1 0

Dmitry Timoshkov : gdiplus/tests: Mark some GdipGetPropertyItem test results as broken under XP.
by Alexandre Julliard 06 Mar '14

06 Mar '14

Module: wine Branch: master Commit: 865b503af832e6ae2c2f27683217f4d95c6b8fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=865b503af832e6ae2c2f27683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:25:46 2014 +0900 gdiplus/tests: Mark some GdipGetPropertyItem test results as broken under XP. --- dlls/gdiplus/tests/image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c4e61cc..db0bc6a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3213,8 +3213,10 @@ static void test_tiff_properties(void) ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); prop_size -= sizeof(*prop_item); ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length); - ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); - ok(td[i].length == prop_size, "%u: expected length %u, got %u\n", i, td[i].length, prop_size); + ok(td[i].length == prop_item->length || broken(td[i].id == 0xf00f && td[i].length == prop_item->length+1) /* XP */, + "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); + ok(td[i].length == prop_size || broken(td[i].id == 0xf00f && td[i].length == prop_size+1) /* XP */, + "%u: expected length %u, got %u\n", i, td[i].length, prop_size); if (td[i].length == prop_item->length) { int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0;

1 0