December 2017 - Wine-commits

Jacek Caban : jscript: Support VT_UI8 in variant_to_jsval.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: d2213e205b026dcefcb953391bb2d998b141ec7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2213e205b026dcefcb953391… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 5 18:24:41 2017 +0100 jscript: Support VT_UI8 in variant_to_jsval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 48628bd..4556ec4 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -306,6 +306,13 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_UI4: *r = jsval_number(V_UI4(var)); return S_OK; + case VT_UI8: + /* + * Native doesn't support VT_UI8 here, but it's needed for IE9+ APIs + * (native IE9 doesn't use jscript.dll for JavaScript). + */ + *r = jsval_number(V_UI8(var)); + return S_OK; case VT_R4: *r = jsval_number(V_R4(var)); return S_OK;

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_timeStamp implementation.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: c0f96a406f13e1b94d57ae7aece5bacc5300ffd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f96a406f13e1b94d57ae7ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 5 18:24:46 2017 +0100 mshtml: Added IDOMEvent::get_timeStamp implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/htmlevent.c | 16 ++++++++++++++-- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.js | 41 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 64ad555..a46a0cd 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -219,7 +219,8 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) CASE_VT(VT_VARIANT, VARIANT, *); \ CASE_VT(VT_PTR, void*, V_BYREF); \ CASE_VT(VT_UNKNOWN, IUnknown*, V_UNKNOWN); \ - CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH) + CASE_VT(VT_DISPATCH, IDispatch*, V_DISPATCH); \ + CASE_VT(VT_UI8, ULONGLONG, V_UI8) static BOOL is_arg_type_supported(VARTYPE vt) { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7a01ba5..cbb9954 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1054,8 +1054,11 @@ static HRESULT WINAPI DOMEvent_get_target(IDOMEvent *iface, IEventTarget **p) static HRESULT WINAPI DOMEvent_get_timeStamp(IDOMEvent *iface, ULONGLONG *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = This->time_stamp; + return S_OK; } static HRESULT WINAPI DOMEvent_get_type(IDOMEvent *iface, BSTR *p) @@ -1208,6 +1211,10 @@ static dispex_static_data_t DOMEvent_dispex = { static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { DOMEvent *event; + FILETIME time; + + /* 1601 to 1970 is 369 years plus 89 leap days */ + const ULONGLONG time_epoch = (ULONGLONG)(369 * 365 + 89) * 86400 * 1000; event = heap_alloc_zero(sizeof(*event)); if(!event) @@ -1227,6 +1234,11 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->cancelable = (event_info[event_id].flags & EVENT_CANCELABLE) != 0; } nsIDOMEvent_AddRef(event->nsevent = nsevent); + + GetSystemTimeAsFileTime(&time); + event->time_stamp = (((ULONGLONG)time.dwHighDateTime<<32) + time.dwLowDateTime) / 10000 + - time_epoch; + return event; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 3775e44..0f1ac41 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -67,6 +67,7 @@ typedef struct { WCHAR *type; EventTarget *target; EventTarget *current_target; + ULONGLONG time_stamp; BOOL bubbles; BOOL cancelable; BOOL prevent_default; diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index fc68d8a..f7df4d8 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -295,10 +295,10 @@ function test_prevent_default() { var calls; div.addEventListener("click", function(e) { - calls += "div,"; ok(e.defaultPrevented === false, "e.defaultPrevented = " + e.defaultPrevented); e.preventDefault(); ok(e.defaultPrevented === e.cancelable, "e.defaultPrevented = " + e.defaultPrevented); + calls += "div,"; }, true); a.addEventListener("click", function(e) { @@ -551,6 +551,44 @@ function test_recursive_dispatch() { next_test(); } +function test_time_stamp() { + document.body.innerHTML = '<div></div>'; + var elem = document.body.firstChild; + var calls, last_time_stamp; + + elem.onclick = function(event) { + ok(event.timeStamp === last_time_stamp, "timeStamp = " + event.timeStamp); + calls++; + } + + var e = document.createEvent("Event"); + ok(typeof(e.timeStamp) === "number", "typeof(timeStamp) = " + typeof(e.timeStamp)); + ok(e.timeStamp > 0, "timeStamp = " + e.timeStamp); + + var now = (new Date()).getTime(); + last_time_stamp = e.timeStamp; + ok(Math.abs(now - last_time_stamp) < 3, "timeStamp " + last_time_stamp + " != now " + now); + + e.initEvent("click", true, true); + ok(e.timeStamp === last_time_stamp, "timeStamp = " + e.timeStamp); + calls = 0; + elem.dispatchEvent(e); + ok(calls === 1, "calls = " + calls); + ok(e.timeStamp === last_time_stamp, "timeStamp = " + e.timeStamp); + + elem.onclick = function(event) { + ok(event.timeStamp > 0, "timeStamp = " + event.timeStamp); + trace("timestamp " + event.timeStamp); + calls++; + } + + calls = 0; + elem.click(); + ok(calls === 1, "calls = " + calls); + + next_test(); +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -563,5 +601,6 @@ var tests = [ test_current_target, test_dispatch_event, test_recursive_dispatch, + test_time_stamp, test_listener_order ];

1 0

Nikolay Sivov : httpapi/tests: Added some basic tests for session and group creation.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 727a8fba26eb3f434e34d2f1a7ae80e989bae7b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727a8fba26eb3f434e34d2f1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 4 12:09:16 2017 +0300 httpapi/tests: Added some basic tests for session and group creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/httpapi/Makefile.in | 1 + dlls/httpapi/tests/Makefile.in | 5 ++ dlls/httpapi/tests/httpapi.c | 193 +++++++++++++++++++++++++++++++++++++++++ include/http.h | 1 + 6 files changed, 204 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1da4efa..4704e16 100755 --- a/configure +++ b/configure @@ -18560,7 +18560,8 @@ wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg clean wine_fn_config_test dlls/hnetcfg/tests hnetcfg_test -wine_fn_config_dll httpapi enable_httpapi +wine_fn_config_dll httpapi enable_httpapi implib +wine_fn_config_test dlls/httpapi/tests httpapi_test wine_fn_config_dll iccvid enable_iccvid clean wine_fn_config_dll icmp enable_icmp wine_fn_config_dll ieframe enable_ieframe clean,implib diff --git a/configure.ac b/configure.ac index 6cba83b..69fad41 100644 --- a/configure.ac +++ b/configure.ac @@ -3206,7 +3206,8 @@ WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg,,[clean]) WINE_CONFIG_TEST(dlls/hnetcfg/tests) -WINE_CONFIG_DLL(httpapi) +WINE_CONFIG_DLL(httpapi,,[implib]) +WINE_CONFIG_TEST(dlls/httpapi/tests) WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) WINE_CONFIG_DLL(ieframe,,[clean,implib]) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in index f8cb270..465cb08 100644 --- a/dlls/httpapi/Makefile.in +++ b/dlls/httpapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = httpapi.dll +IMPORTLIB = httpapi C_SRCS = \ httpapi_main.c diff --git a/dlls/httpapi/tests/Makefile.in b/dlls/httpapi/tests/Makefile.in new file mode 100644 index 0000000..1c253a7 --- /dev/null +++ b/dlls/httpapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = httpapi.dll +IMPORTS = httpapi + +C_SRCS = \ + httpapi.c diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c new file mode 100644 index 0000000..47df226 --- /dev/null +++ b/dlls/httpapi/tests/httpapi.c @@ -0,0 +1,193 @@ +/* + * HttpApi tests + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "http.h" + +#include "wine/test.h" + +static ULONG (WINAPI *pHttpCreateServerSession)(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *session_id, + ULONG reserved); +static ULONG (WINAPI *pHttpCloseServerSession)(HTTP_SERVER_SESSION_ID session_id); +static ULONG (WINAPI *pHttpCreateUrlGroup)(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, + ULONG reserved); +static ULONG (WINAPI *pHttpCloseUrlGroup)(HTTP_URL_GROUP_ID group_id); + +static void init(void) +{ + HMODULE mod = GetModuleHandleA("httpapi.dll"); + +#define X(f) p##f = (void *)GetProcAddress(mod, #f) + X(HttpCreateServerSession); + X(HttpCloseServerSession); + X(HttpCreateUrlGroup); + X(HttpCloseUrlGroup); +#undef X +} + +static void test_HttpCreateHttpHandle(void) +{ + HANDLE handle, handle2; + ULONG ret; + BOOL b; + + ret = HttpCreateHttpHandle(NULL, 0); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected ret value %u.\n", ret); + + /* Non-zero reserved parameter is accepted on XP/2k3. */ + handle = NULL; + ret = HttpCreateHttpHandle(&handle, 0); +todo_wine { + ok(!ret, "Unexpected ret value %u.\n", ret); + ok(handle != NULL, "Unexpected handle value %p.\n", handle); +} + handle2 = NULL; + ret = HttpCreateHttpHandle(&handle2, 0); +todo_wine { + ok(!ret, "Unexpected ret value %u.\n", ret); + ok(handle2 != NULL && handle != handle2, "Unexpected handle %p.\n", handle2); +} + b = CloseHandle(handle); +todo_wine + ok(b, "Failed to close queue handle.\n"); +} + +static void test_HttpCreateServerSession(void) +{ + HTTP_SERVER_SESSION_ID session; + HTTPAPI_VERSION version; + ULONG ret; + + if (!pHttpCreateServerSession || !pHttpCloseServerSession) + { + skip("HttpCreateServerSession() is not supported.\n"); + return; + } + + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 1; + ret = pHttpCreateServerSession(version, &session, 0); + ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 3; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 2; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); + + ret = pHttpCloseServerSession(0xdead); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); +} + +static void test_HttpCreateUrlGroup(void) +{ + HTTP_SERVER_SESSION_ID session; + HTTP_URL_GROUP_ID group_id; + HTTPAPI_VERSION version; + ULONG ret; + + if (!pHttpCreateUrlGroup) + { + skip("HttpCreateUrlGroup is not supported.\n"); + return; + } + + group_id = 1; + ret = pHttpCreateUrlGroup(0, &group_id, 0); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + ok(group_id == 1, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id)); + + /* Create session, url group, close session. */ + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + + group_id = 0; + ret = pHttpCreateUrlGroup(session, &group_id, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ok(group_id != 0, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id)); + + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); + + /* Groups are closed together with their session. */ + ret = pHttpCloseUrlGroup(group_id); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + + /* Create session, url group, close group. */ + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + + group_id = 0; + ret = pHttpCreateUrlGroup(session, &group_id, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ok(group_id != 0, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id)); + + ret = pHttpCloseUrlGroup(group_id); + ok(!ret, "Unexpected return value %u.\n", ret); + + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); +} + +START_TEST(httpapi) +{ + HTTPAPI_VERSION version = { 1, 0 }; + ULONG ret; + + init(); + + ret = HttpInitialize(version, HTTP_INITIALIZE_SERVER, NULL); + ok(!ret, "Failed to initialize library, ret %u.\n", ret); + + test_HttpCreateHttpHandle(); + test_HttpCreateServerSession(); + test_HttpCreateUrlGroup(); + + ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL); + ok(!ret, "Failed to terminate, ret %u.\n", ret); +} diff --git a/include/http.h b/include/http.h index db8a3d4..b8ce811 100644 --- a/include/http.h +++ b/include/http.h @@ -52,6 +52,7 @@ typedef enum _HTTP_SERVICE_CONFIG_ID typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; +typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID; ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID);

1 0

Henri Verbeet : d3d10core/tests: Introduce a format compatibility test.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 960017a4d4ad74c6f9a39d6b3505972ad964dd19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960017a4d4ad74c6f9a39d6b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 5 22:54:51 2017 +0330 d3d10core/tests: Introduce a format compatibility test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 136 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4228773..cdac5ec 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -13021,6 +13021,141 @@ static void test_stream_output_resume(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D10Texture2D *dst_texture, *src_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + DWORD colour, expected; + ID3D10Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + D3D10_BOX box; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + if (FAILED(hr) && test_data[i].dst_format == DXGI_FORMAT_B8G8R8A8_UNORM) + { + skip("B8G8R8A8_UNORM not supported, skipping test.\n"); + ID3D10Texture2D_Release(src_texture); + continue; + } + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, + (ID3D10Resource *)src_texture, 0, &box); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -13094,4 +13229,5 @@ START_TEST(device) test_geometry_shader(); test_stream_output(); test_stream_output_resume(); + test_format_compatibility(); }

1 0

Alexandre Julliard : ntdll: Fix CONTEXT definition for ARM.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: eb337adcc260df7fb94e6fc3a43ef96894bebf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb337adcc260df7fb94e6fc3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 09:22:16 2017 +0100 ntdll: Fix CONTEXT definition for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm.c | 8 ++--- dlls/ntdll/signal_arm.c | 36 +++++++++---------- include/winnt.h | 86 ++++++++++++++++++++++++--------------------- programs/winedbg/be_arm.c | 10 +++--- programs/winedbg/gdbproxy.c | 4 +-- 5 files changed, 75 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb337adcc260df7fb94e6…

1 0

Alexandre Julliard : ntdll: Fix CONTEXT definition for ARM64.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 21c12ddc64e88b67167267455bc5e68dc576cfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c12ddc64e88b67167267455… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 13:21:22 2017 +0100 ntdll: Fix CONTEXT definition for ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_arm64.c | 71 ++++++++++++++-------------- dlls/ntdll/signal_arm64.c | 49 ++++++------------- include/winnt.h | 113 +++++++++++++++++++++++++++----------------- programs/winedbg/be_arm64.c | 82 ++++++++++++++++---------------- programs/winedbg/debugger.h | 2 + programs/winedbg/gdbproxy.c | 58 +++++++++++------------ 6 files changed, 193 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c12ddc64e88b6716726…

1 0

Alexandre Julliard : server: Add floating point and debug registers to the ARM context.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 4ba0f628f9d2c03e419304fc8acbc316afbb91b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba0f628f9d2c03e419304fc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 10:30:28 2017 +0100 server: Add floating point and debug registers to the ARM context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 39 +++++++++++++++++++++++++++++++++++++-- include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/thread.c | 2 +- server/trace.c | 17 +++++++++++++++++ 5 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index a0b7bb8..64ff1e0 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -347,6 +347,11 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) to->R11 = from->R11; to->R12 = from->R12; } + if (flags & CONTEXT_FLOATING_POINT) + { + to->Fpscr = from->Fpscr; + memcpy( to->u.D, from->u.D, sizeof(to->u.D) ); + } } @@ -357,7 +362,7 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) */ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) { - DWORD flags = from->ContextFlags & ~CONTEXT_ARM; /* get rid of CPU id */ + DWORD i, flags = from->ContextFlags & ~CONTEXT_ARM; /* get rid of CPU id */ memset( to, 0, sizeof(*to) ); to->cpu = CPU_ARM; @@ -387,6 +392,20 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->integer.arm_regs.r[11] = from->R11; to->integer.arm_regs.r[12] = from->R12; } + if (flags & CONTEXT_FLOATING_POINT) + { + to->flags |= SERVER_CTX_FLOATING_POINT; + for (i = 0; i < 32; i++) to->fp.arm_regs.d[i] = from->u.D[i]; + to->fp.arm_regs.fpscr = from->Fpscr; + } + if (flags & CONTEXT_DEBUG_REGISTERS) + { + to->flags |= SERVER_CTX_DEBUG_REGISTERS; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->debug.arm_regs.bvr[i] = from->Bvr[i]; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->debug.arm_regs.bcr[i] = from->Bcr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->debug.arm_regs.wvr[i] = from->Wvr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->debug.arm_regs.wcr[i] = from->Wcr[i]; + } return STATUS_SUCCESS; } @@ -398,6 +417,8 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) */ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { + DWORD i; + if (from->cpu != CPU_ARM) return STATUS_INVALID_PARAMETER; to->ContextFlags = CONTEXT_ARM; @@ -425,7 +446,21 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) to->R10 = from->integer.arm_regs.r[10]; to->R11 = from->integer.arm_regs.r[11]; to->R12 = from->integer.arm_regs.r[12]; - } + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + for (i = 0; i < 32; i++) to->u.D[i] = from->fp.arm_regs.d[i]; + to->Fpscr = from->fp.arm_regs.fpscr; + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->Bvr[i] = from->debug.arm_regs.bvr[i]; + for (i = 0; i < ARM_MAX_BREAKPOINTS; i++) to->Bcr[i] = from->debug.arm_regs.bcr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->Wvr[i] = from->debug.arm_regs.wvr[i]; + for (i = 0; i < ARM_MAX_WATCHPOINTS; i++) to->Wcr[i] = from->debug.arm_regs.wcr[i]; + } return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d8a93b6..569a23f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -155,12 +155,14 @@ typedef struct unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; + struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; } fp; union { struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; + struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; } debug; union { @@ -6475,6 +6477,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 544 +#define SERVER_PROTOCOL_VERSION 545 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a3f4640..9f11e67 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -171,12 +171,14 @@ typedef struct unsigned char regs[80]; } i386_regs; struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; + struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union { struct { unsigned int dr0, dr1, dr2, dr3, dr6, dr7; } i386_regs; struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; + struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; } debug; /* selected by SERVER_CTX_DEBUG_REGISTERS */ union { diff --git a/server/thread.c b/server/thread.c index 2a57bc9..0d647c7 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1147,7 +1147,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86: return SERVER_CTX_DEBUG_REGISTERS; case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_POWERPC: return 0; - case CPU_ARM: return 0; + case CPU_ARM: return SERVER_CTX_DEBUG_REGISTERS; case CPU_ARM64: return 0; } return 0; diff --git a/server/trace.c b/server/trace.c index 7f84e2a..89506e0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -664,6 +664,23 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) ctx.ctl.arm_regs.pc, ctx.ctl.arm_regs.cpsr ); if (ctx.flags & SERVER_CTX_INTEGER) for (i = 0; i < 13; i++) fprintf( stderr, ",r%u=%08x", i, ctx.integer.arm_regs.r[i] ); + if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) + { + for (i = 0; i < 8; i++) + fprintf( stderr, ",bcr%u=%08x,bvr%u=%08x", + i, ctx.debug.arm_regs.bcr[i], i, ctx.debug.arm_regs.bvr[i] ); + fprintf( stderr, ",wcr0=%08x,wvr0=%08x", + ctx.debug.arm_regs.wcr[0], ctx.debug.arm_regs.wvr[0] ); + } + if (ctx.flags & SERVER_CTX_FLOATING_POINT) + { + for (i = 0; i < 32; i++) + { + fprintf( stderr, ",d%u=", i ); + dump_uint64( "", &ctx.fp.arm_regs.d[i] ); + } + fprintf( stderr, ",fpscr=%08x", ctx.fp.arm_regs.fpscr ); + } break; case CPU_ARM64: if (ctx.flags & SERVER_CTX_CONTROL)

1 0

Alexandre Julliard : server: Add floating point and debug registers to the ARM64 context.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: d12717b9a8643f55f5191220c22650ceafe05630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12717b9a8643f55f5191220c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 5 13:33:38 2017 +0100 server: Add floating point and debug registers to the ARM64 context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 45 +++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 4 ++- server/protocol.def | 2 ++ server/thread.c | 2 +- server/trace.c | 58 ++++++++++++++++++++---------------------- 5 files changed, 77 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index abef7e1..6905ab4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -251,6 +251,19 @@ static void copy_context( CONTEXT *to, const CONTEXT *from, DWORD flags ) { memcpy( to->u.X, from->u.X, sizeof(to->u.X) ); } + if (flags & CONTEXT_FLOATING_POINT) + { + memcpy( to->V, from->V, sizeof(to->V) ); + to->Fpcr = from->Fpcr; + to->Fpsr = from->Fpsr; + } + if (flags & CONTEXT_DEBUG_REGISTERS) + { + memcpy( to->Bcr, from->Bcr, sizeof(to->Bcr) ); + memcpy( to->Bvr, from->Bvr, sizeof(to->Bvr) ); + memcpy( to->Wcr, from->Wcr, sizeof(to->Wcr) ); + memcpy( to->Wvr, from->Wvr, sizeof(to->Wvr) ); + } } /*********************************************************************** @@ -279,6 +292,21 @@ NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) to->flags |= SERVER_CTX_INTEGER; for (i = 0; i <= 28; i++) to->integer.arm64_regs.x[i] = from->u.X[i]; } + if (flags & CONTEXT_FLOATING_POINT) + { + to->flags |= SERVER_CTX_FLOATING_POINT; + for (i = 0; i < 64; i++) to->fp.arm64_regs.d[i] = from->V[i / 2].D[i % 2]; + to->fp.arm64_regs.fpcr = from->Fpcr; + to->fp.arm64_regs.fpsr = from->Fpsr; + } + if (flags & CONTEXT_DEBUG_REGISTERS) + { + to->flags |= SERVER_CTX_DEBUG_REGISTERS; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->debug.arm64_regs.bcr[i] = from->Bcr[i]; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->debug.arm64_regs.bvr[i] = from->Bvr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->debug.arm64_regs.wcr[i] = from->Wcr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->debug.arm64_regs.wvr[i] = from->Wvr[i]; + } return STATUS_SUCCESS; } @@ -308,7 +336,22 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) { to->ContextFlags |= CONTEXT_INTEGER; for (i = 0; i <= 28; i++) to->u.X[i] = from->integer.arm64_regs.x[i]; - } + } + if (from->flags & SERVER_CTX_FLOATING_POINT) + { + to->ContextFlags |= CONTEXT_FLOATING_POINT; + for (i = 0; i < 64; i++) to->V[i / 2].D[i % 2] = from->fp.arm64_regs.d[i]; + to->Fpcr = from->fp.arm64_regs.fpcr; + to->Fpsr = from->fp.arm64_regs.fpsr; + } + if (from->flags & SERVER_CTX_DEBUG_REGISTERS) + { + to->ContextFlags |= CONTEXT_DEBUG_REGISTERS; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->Bcr[i] = from->debug.arm64_regs.bcr[i]; + for (i = 0; i < ARM64_MAX_BREAKPOINTS; i++) to->Bvr[i] = from->debug.arm64_regs.bvr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->Wcr[i] = from->debug.arm64_regs.wcr[i]; + for (i = 0; i < ARM64_MAX_WATCHPOINTS; i++) to->Wvr[i] = from->debug.arm64_regs.wvr[i]; + } return STATUS_SUCCESS; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 569a23f..eef4e7e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -156,6 +156,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; + struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; } fp; union { @@ -163,6 +164,7 @@ typedef struct struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; + struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; union { @@ -6477,6 +6479,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 545 +#define SERVER_PROTOCOL_VERSION 546 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9f11e67..aa337c4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -172,6 +172,7 @@ typedef struct struct { struct { unsigned __int64 low, high; } fpregs[32]; } x86_64_regs; struct { double fpr[32], fpscr; } powerpc_regs; struct { unsigned __int64 d[32]; unsigned int fpscr; } arm_regs; + struct { unsigned __int64 d[64]; unsigned int fpcr, fpsr; } arm64_regs; } fp; /* selected by SERVER_CTX_FLOATING_POINT */ union { @@ -179,6 +180,7 @@ typedef struct struct { unsigned __int64 dr0, dr1, dr2, dr3, dr6, dr7; } x86_64_regs; struct { unsigned int dr[8]; } powerpc_regs; struct { unsigned int bvr[8], bcr[8], wvr[1], wcr[1]; } arm_regs; + struct { unsigned __int64 bvr[8], wvr[2]; unsigned int bcr[8], wcr[2]; } arm64_regs; } debug; /* selected by SERVER_CTX_DEBUG_REGISTERS */ union { diff --git a/server/thread.c b/server/thread.c index 0d647c7..2f65c16 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1148,7 +1148,7 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_x86_64: return SERVER_CTX_DEBUG_REGISTERS; case CPU_POWERPC: return 0; case CPU_ARM: return SERVER_CTX_DEBUG_REGISTERS; - case CPU_ARM64: return 0; + case CPU_ARM64: return SERVER_CTX_DEBUG_REGISTERS; } return 0; } diff --git a/server/trace.c b/server/trace.c index 89506e0..72e1262 100644 --- a/server/trace.c +++ b/server/trace.c @@ -691,37 +691,33 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } if (ctx.flags & SERVER_CTX_INTEGER) { - dump_uint64( ",x0=", &ctx.integer.arm64_regs.x[0] ); - dump_uint64( ",x1=", &ctx.integer.arm64_regs.x[1] ); - dump_uint64( ",x2=", &ctx.integer.arm64_regs.x[2] ); - dump_uint64( ",x3=", &ctx.integer.arm64_regs.x[3] ); - dump_uint64( ",x4=", &ctx.integer.arm64_regs.x[4] ); - dump_uint64( ",x5=", &ctx.integer.arm64_regs.x[5] ); - dump_uint64( ",x6=", &ctx.integer.arm64_regs.x[6] ); - dump_uint64( ",x7=", &ctx.integer.arm64_regs.x[7] ); - dump_uint64( ",x8=", &ctx.integer.arm64_regs.x[8] ); - dump_uint64( ",x9=", &ctx.integer.arm64_regs.x[9] ); - dump_uint64( ",x10=", &ctx.integer.arm64_regs.x[10] ); - dump_uint64( ",x11=", &ctx.integer.arm64_regs.x[11] ); - dump_uint64( ",x12=", &ctx.integer.arm64_regs.x[12] ); - dump_uint64( ",x13=", &ctx.integer.arm64_regs.x[13] ); - dump_uint64( ",x14=", &ctx.integer.arm64_regs.x[14] ); - dump_uint64( ",x15=", &ctx.integer.arm64_regs.x[15] ); - dump_uint64( ",x16=", &ctx.integer.arm64_regs.x[16] ); - dump_uint64( ",x17=", &ctx.integer.arm64_regs.x[17] ); - dump_uint64( ",x18=", &ctx.integer.arm64_regs.x[18] ); - dump_uint64( ",x19=", &ctx.integer.arm64_regs.x[19] ); - dump_uint64( ",x20=", &ctx.integer.arm64_regs.x[20] ); - dump_uint64( ",x21=", &ctx.integer.arm64_regs.x[21] ); - dump_uint64( ",x22=", &ctx.integer.arm64_regs.x[22] ); - dump_uint64( ",x23=", &ctx.integer.arm64_regs.x[23] ); - dump_uint64( ",x24=", &ctx.integer.arm64_regs.x[24] ); - dump_uint64( ",x25=", &ctx.integer.arm64_regs.x[25] ); - dump_uint64( ",x26=", &ctx.integer.arm64_regs.x[26] ); - dump_uint64( ",x27=", &ctx.integer.arm64_regs.x[27] ); - dump_uint64( ",x28=", &ctx.integer.arm64_regs.x[28] ); - dump_uint64( ",x29=", &ctx.integer.arm64_regs.x[29] ); - dump_uint64( ",x30=", &ctx.integer.arm64_regs.x[30] ); + for (i = 0; i < 31; i++) + { + fprintf( stderr, ",x%u=", i ); + dump_uint64( "", &ctx.integer.arm64_regs.x[i] ); + } + } + if (ctx.flags & SERVER_CTX_DEBUG_REGISTERS) + { + for (i = 0; i < 8; i++) + { + fprintf( stderr, ",bcr%u=%08x,bvr%u=", i, ctx.debug.arm64_regs.bcr[i], i ); + dump_uint64( "", &ctx.debug.arm64_regs.bvr[i] ); + } + for (i = 0; i < 2; i++) + { + fprintf( stderr, ",wcr%u=%08x,wvr%u=", i, ctx.debug.arm64_regs.wcr[i], i ); + dump_uint64( "", &ctx.debug.arm64_regs.wvr[i] ); + } + } + if (ctx.flags & SERVER_CTX_FLOATING_POINT) + { + for (i = 0; i < 64; i++) + { + fprintf( stderr, ",d%u=", i ); + dump_uint64( "", &ctx.fp.arm64_regs.d[i] ); + } + fprintf( stderr, ",fpcr=%08x,fpsr=%08x", ctx.fp.arm64_regs.fpcr, ctx.fp.arm64_regs.fpsr ); } break; }

1 0

Zebediah Figura : msi: Complain louder if we can' t find a custom action DLL or EXE.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 13a00077e477d2d462eaaaaf11ed4fef95b81a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a00077e477d2d462eaaaaf1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 4 12:41:15 2017 -0600 msi: Complain louder if we can't find a custom action DLL or EXE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 02c3440..2570fe2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -263,7 +263,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); } binary->source = strdupW( source ); binary->tmpfile = tmpfile; @@ -567,7 +567,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); return ERROR_SUCCESS; } @@ -700,7 +700,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) } if (!len_exe) { - WARN("can't find executable %u\n", GetLastError()); + ERR("can't find executable %u\n", GetLastError()); msi_free( exe ); return INVALID_HANDLE_VALUE; } @@ -738,7 +738,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) msi_free( exe ); if (!ret) { - WARN("unable to execute command %u\n", GetLastError()); + ERR("unable to execute command %u\n", GetLastError()); return INVALID_HANDLE_VALUE; } CloseHandle( info.hThread );

1 0

Hugh McMaster : reg: Make the newline string a static global.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: ecb9ce4b2cf127c9145fc4e421a73dd1fa186cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb9ce4b2cf127c9145fc4e42… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 5 11:25:15 2017 +0000 reg: Make the newline string a static global. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 33e381c..fa2fa7b 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -77,6 +77,8 @@ type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; +static const WCHAR newlineW[] = {'\n',0}; + void *heap_xalloc(size_t size) { void *buf = HeapAlloc(GetProcessHeap(), 0, size); @@ -610,7 +612,6 @@ static const WCHAR *reg_type_to_wchar(DWORD type) static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD data_size) { static const WCHAR fmt[] = {' ',' ',' ',' ','%','1',0}; - static const WCHAR newlineW[] = {'\n',0}; WCHAR defval[32]; WCHAR *reg_data; @@ -660,7 +661,6 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; - WCHAR newlineW[] = {'\n',0}; WCHAR *subkey_name, *subkey_path; HKEY subkey; @@ -740,7 +740,6 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; WCHAR *value_name, *subkey_name, *subkey_path; - WCHAR newlineW[] = {'\n',0}; BYTE *data; HKEY subkey; @@ -821,7 +820,6 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; - WCHAR newlineW[] = {'\n',0}; int ret; if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS)

1 0