December 2017 - Wine-Commits

Józef Kucia : wined3d: Implement SV_ClipDistance.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 431aa3274ca322e143c3dbc856ae1ac894f5d15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=431aa3274ca322e143c3dbc85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:29 2017 +0100 wined3d: Implement SV_ClipDistance. In D3D10+ all clip distances declared in a shader are always enabled. In other words, enablement of clip distances is a property of a shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 63 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 36 +++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 43 ++++++++++++++-------------- 3 files changed, 109 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=431aa3274ca322e143c3d…

1 0

Henri Verbeet : d3d10core/tests: Introduce a format compatibility test.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

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

Nikolay Sivov : httpapi/tests: Added some basic tests for session and group creation.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

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

Jacek Caban : mshtml: Added IDOMEvent::get_timeStamp implementation.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

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

Józef Kucia : ddraw: Store all 32 user clip planes.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: a7186d79d9b6d4c75ec3d5ead90613fe4dd79dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7186d79d9b6d4c75ec3d5ead… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:34 2017 +0100 ddraw: Store all 32 user clip planes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 4 ++++ dlls/ddraw/device.c | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0ae4532..0b6666a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -38,6 +38,8 @@ #include "wine/list.h" #include "wine/wined3d.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; @@ -341,6 +343,8 @@ struct d3d_device /* Handle management */ struct ddraw_handle_table handle_table; D3DMATRIXHANDLE world, proj, view; + + struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7d92df5..32a2f1a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6457,6 +6457,7 @@ static HRESULT WINAPI d3d_device7_GetLightEnable_FPUPreserve(IDirect3DDevice7 *i static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + const struct wined3d_vec4 *wined3d_plane; HRESULT hr; TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane); @@ -6464,8 +6465,16 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV if (!plane) return DDERR_INVALIDPARAMS; + wined3d_plane = (struct wined3d_vec4 *)plane; + wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, (struct wined3d_vec4 *)plane); + hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); + if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + { + WARN("Clip plane %u is not supported.\n", idx); + device->user_clip_planes[idx] = *wined3d_plane; + hr = D3D_OK; + } wined3d_mutex_unlock(); return hr; @@ -6505,6 +6514,7 @@ static HRESULT WINAPI d3d_device7_SetClipPlane_FPUPreserve(IDirect3DDevice7 *ifa static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_vec4 *wined3d_plane; HRESULT hr; TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane); @@ -6512,8 +6522,16 @@ static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV if (!plane) return DDERR_INVALIDPARAMS; + wined3d_plane = (struct wined3d_vec4 *)plane; + wined3d_mutex_lock(); - hr = wined3d_device_get_clip_plane(device->wined3d_device, idx, (struct wined3d_vec4 *)plane); + hr = wined3d_device_get_clip_plane(device->wined3d_device, idx, wined3d_plane); + if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + { + WARN("Clip plane %u is not supported.\n", idx); + *wined3d_plane = device->user_clip_planes[idx]; + hr = D3D_OK; + } wined3d_mutex_unlock(); return hr;

1 0

Józef Kucia : wined3d: Correctly transform FFP clip planes.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 266f1054b54e74093eb1f39196c9ebd7e3aea289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=266f1054b54e74093eb1f3919… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:33 2017 +0100 wined3d: Correctly transform FFP clip planes. A plane isn't transformed as simply as a vector. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 976c7cd..18822c5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1308,7 +1308,7 @@ static void swap_rows(float **a, float **b) *b = tmp; } -static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m) +static BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) { float wtmp[4][8]; float m0, m1, m2, m3, s; @@ -1512,6 +1512,18 @@ static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m) return TRUE; } +static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) +{ + struct wined3d_matrix temp; + unsigned int i, j; + + for (i = 0; i < 4; ++i) + for (j = 0; j < 4; ++j) + (&temp._11)[4 * j + i] = (&m->_11)[4 * i + j]; + + *out = temp; +} + static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { @@ -1709,13 +1721,18 @@ static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_matrix matrix; struct wined3d_vec4 plane; + plane = state->clip_planes[index]; + /* Clip planes are affected by the view transform in d3d for FFP draws. */ if (!use_vs(state)) - multiply_vector_matrix(&plane, &state->clip_planes[index], &state->transforms[WINED3D_TS_VIEW]); - else - plane = state->clip_planes[index]; + { + invert_matrix(&matrix, &state->transforms[WINED3D_TS_VIEW]); + transpose_matrix(&matrix, &matrix); + multiply_vector_matrix(&plane, &plane, &matrix); + } GL_EXTCALL(glUniform4fv(prog->vs.clip_planes_location + index, 1, &plane.x)); }

1 0

Józef Kucia : wined3d: Implement SV_CullDistance.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 429e0c913087bdc2c183f74f346a9438278ec960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e0c913087bdc2c183f74f3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:31 2017 +0100 wined3d: Implement SV_CullDistance. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 13 +++++++++++-- dlls/wined3d/shader.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0bf986..5058740 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -119,6 +119,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_conservative_depth", ARB_CONSERVATIVE_DEPTH }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_copy_image", ARB_COPY_IMAGE }, + {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, @@ -3916,6 +3917,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, + {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b89b7aa..976c7cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6930,8 +6930,10 @@ static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_bu const struct wined3d_shader_signature_element *element, DWORD clip_or_cull_distance_mask) { unsigned int i, clip_or_cull_index; + const char *name; char reg_mask[6]; + name = element->sysval_semantic == WINED3D_SV_CLIP_DISTANCE ? "Clip" : "Cull"; /* Assign consecutive indices starting from 0. */ clip_or_cull_index = element->semantic_idx ? wined3d_popcount(clip_or_cull_distance_mask & 0xf) : 0; for (i = 0; i < 4; ++i) @@ -6940,8 +6942,8 @@ static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_bu continue; shader_glsl_write_mask_to_str(WINED3DSP_WRITEMASK_0 << i, reg_mask); - shader_addline(buffer, "gl_ClipDistance[%u] = outputs[%u]%s;\n", - clip_or_cull_index, element->register_idx, reg_mask); + shader_addline(buffer, "gl_%sDistance[%u] = outputs[%u]%s;\n", + name, clip_or_cull_index, element->register_idx, reg_mask); ++clip_or_cull_index; } } @@ -6993,6 +6995,10 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv { shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->clip_distance_mask); } + else if (output->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->cull_distance_mask); + } else if (output->sysval_semantic) { FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); @@ -7393,6 +7399,8 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { + if (gl_info->supported[ARB_CULL_DISTANCE]) + shader_addline(buffer, "#extension GL_ARB_cull_distance : enable\n"); if (gl_info->supported[ARB_GPU_SHADER5]) shader_addline(buffer, "#extension GL_ARB_gpu_shader5 : enable\n"); if (gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS]) @@ -10875,6 +10883,7 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g if (shader_model_4 && gl_info->supported[ARB_COMPUTE_SHADER] + && gl_info->supported[ARB_CULL_DISTANCE] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7d59f8b..d976573 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1789,6 +1789,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st return hr; reg_maps->clip_distance_mask |= mask; } + else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->cull_distance_mask |= mask; + } } } else if (reg_maps->output_registers) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 455f415..0894c94 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -52,6 +52,7 @@ enum wined3d_gl_extension ARB_CONSERVATIVE_DEPTH, ARB_COPY_BUFFER, ARB_COPY_IMAGE, + ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_TEXTURE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 363118c..0e72aac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1010,6 +1010,7 @@ struct wined3d_shader_reg_maps DWORD uav_counter_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD cull_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ DWORD usesnrm : 1; DWORD vpos : 1; DWORD usesdsx : 1; @@ -1025,7 +1026,7 @@ struct wined3d_shader_reg_maps DWORD usespow : 1; DWORD point_size : 1; DWORD vocp : 1; - DWORD padding : 25; + DWORD padding : 17; DWORD rt_mask; /* Used render targets, 32 max. */

1 0

Józef Kucia : d3d11/tests: Add test for SV_ClipDistance.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: 75c703b47c129344988ec043413c678f2367bfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c703b47c129344988ec0434… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:30 2017 +0100 d3d11/tests: Add test for SV_ClipDistance. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 584 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 574 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75c703b47c129344988ec…

1 0

Matteo Bruni : d3d11: Pass the WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag to wined3d.
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: df461ce90be34353d03f5f9624a35575046119ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df461ce90be34353d03f5f962… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:29 2017 +0100 d3d11: Pass the WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag to wined3d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index e8870d5..177c0cc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -526,6 +526,8 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE if (desc->MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE) flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, @@ -940,6 +942,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi { struct wined3d_resource_desc wined3d_desc; unsigned int levels; + DWORD flags = 0; HRESULT hr; if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS @@ -970,8 +973,11 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(max(desc->Width, desc->Height), desc->Depth)) + 1; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, - 1, levels, 0, (struct wined3d_sub_resource_data *)data, texture, + 1, levels, flags, (struct wined3d_sub_resource_data *)data, texture, &d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d9: Stop calling wined3d_texture_generate_mipmaps().
by Alexandre Julliard Dec. 5, 2017

Dec. 5, 2017

Module: wine Branch: master Commit: dfba903bb231f7357597c059b8709be74325ae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfba903bb231f7357597c059b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:30 2017 +0100 d3d9: Stop calling wined3d_texture_generate_mipmaps(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 5080eb3..96c8bc3 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -273,13 +273,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_2d_GetAutoGenFilterType(IDirect3 static void WINAPI d3d9_texture_2d_GenerateMipSubLevels(IDirect3DTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) @@ -658,13 +652,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_cube_GetAutoGenFilterType(IDirec static void WINAPI d3d9_texture_cube_GenerateMipSubLevels(IDirect3DCubeTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) @@ -1055,13 +1043,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_3d_GetAutoGenFilterType(IDirect3 static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc)

1 0