January 2018 - Wine-commits

Henri Verbeet : winex11: Implement WGL_ARB_create_context_no_error.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 3eaa23cbbf827247dccdeb6869f2f003a503fcda URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eaa23cbbf827247dccdeb68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 17:33:22 2018 +0100 winex11: Implement WGL_ARB_create_context_no_error. Mostly because it's easy, and we'd like to use this from wined3d at some point. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 1 + dlls/winex11.drv/opengl.c | 10 ++++++++++ include/wine/wgl.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index d5d614b..ebdca67 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -369,6 +369,7 @@ my %remapped_wgl_functions = my %supported_wgl_extensions = ( "WGL_ARB_create_context" => 1, + "WGL_ARB_create_context_no_error" => 1, "WGL_ARB_create_context_profile" => 1, "WGL_ARB_extensions_string" => 1, "WGL_ARB_make_current_read" => 1, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e665286..e976ad7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -163,6 +163,8 @@ typedef XID GLXPbuffer; #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 +/** GLX_ARB_create_context_no_error */ +#define GLX_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 /** GLX_ARB_create_context_profile */ #define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 /** GLX_ATI_pixel_format_float */ @@ -2118,6 +2120,12 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList += 2; ret->numAttribs++; break; + case WGL_CONTEXT_OPENGL_NO_ERROR_ARB: + pContextAttribList[0] = GLX_CONTEXT_OPENGL_NO_ERROR_ARB; + pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; + ret->numAttribs++; + break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; @@ -3179,6 +3187,8 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension( "WGL_ARB_create_context" ); opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB; + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_no_error" )) + register_extension( "WGL_ARB_create_context_no_error" ); if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile")) register_extension("WGL_ARB_create_context_profile"); } diff --git a/include/wine/wgl.h b/include/wine/wgl.h index a329fa4..8f68f68 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -5016,6 +5016,7 @@ typedef unsigned int GLhandleARB; #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define WGL_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 #define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 #define WGL_CUBE_MAP_FACE_ARB 0x207C #define WGL_DEPTH_BITS_ARB 0x2022

1 0

Józef Kucia : dxgi/tests: Introduce check_interface() function.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 88a69a4698802936aae2cbba4535a40277693ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a69a4698802936aae2cbba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 18:15:15 2018 +0100 dxgi/tests: Introduce check_interface() function. 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/dxgi/tests/device.c | 62 +++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 899a063..dfbbab4 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -39,6 +39,35 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } +#define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, + BOOL supported, BOOL is_broken) +{ + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; + + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } + + out = (IUnknown *)0xdeadbeef; + hr = IUnknown_QueryInterface(unknown, iid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(out); + else + ok_(__FILE__, line)(!out, "Got unexpected pointer %p.\n", out); + return hr; +} + #define MODE_DESC_IGNORE_RESOLUTION 0x00000001u #define MODE_DESC_IGNORE_REFRESH_RATE 0x00000002u #define MODE_DESC_IGNORE_FORMAT 0x00000004u @@ -458,8 +487,6 @@ static void test_create_surface(void) DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; - IUnknown *surface1; - IUnknown *texture; ULONG refcount; HRESULT hr; @@ -478,19 +505,11 @@ static void test_create_surface(void) hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); - IUnknown_Release(texture); - - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Surface should implement ID3D11Texture2D.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(texture); - - hr = IDXGISurface_QueryInterface(surface, &IID_IDXGISurface1, (void **)&surface1); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Surface should implement IDXGISurface1.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(surface1); + check_interface(surface, &IID_ID3D10Texture2D, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(surface, &IID_ID3D11Texture2D, TRUE, TRUE); + /* Not available on all Windows versions. */ + check_interface(surface, &IID_IDXGISurface1, TRUE, TRUE); IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); @@ -2341,7 +2360,6 @@ done: static void test_create_factory(void) { - IDXGIFactory1 *factory; IUnknown *iface; ULONG refcount; HRESULT hr; @@ -2359,12 +2377,9 @@ static void test_create_factory(void) ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); IUnknown_Release(iface); - factory = (void *)0xdeadbeef; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); - hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(!factory, "Got unexpected factory %p.\n", factory); + check_interface(iface, &IID_IDXGIFactory1, FALSE, FALSE); IUnknown_Release(iface); iface = (void *)0xdeadbeef; @@ -2403,10 +2418,9 @@ static void test_create_factory(void) hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); - hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to query IDXGIFactory1 interface, hr %#x.\n", hr); - IDXGIFactory1_Release(factory); - IUnknown_Release(iface); + check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr);

1 0

Józef Kucia : dxgi: Implement dxgi_factory_EnumAdapterByLuid().
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: c3cb2e6caae16330eab1c0f696f8973e827c6dd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3cb2e6caae16330eab1c0f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 18:15:16 2018 +0100 dxgi: Implement dxgi_factory_EnumAdapterByLuid(). 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/dxgi/factory.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 1c9284b..f38d67c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -421,10 +421,40 @@ static UINT STDMETHODCALLTYPE dxgi_factory_GetCreationFlags(IDXGIFactory4 *iface static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IDXGIFactory4 *iface, LUID luid, REFIID iid, void **adapter) { - FIXME("iface %p, luid %08x:%08x, iid %s, adapter %p stub!\n", + unsigned int adapter_index; + DXGI_ADAPTER_DESC1 desc; + IDXGIAdapter1 *adapter1; + HRESULT hr; + + TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); - return E_NOTIMPL; + adapter_index = 0; + while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) + { + if (FAILED(hr = IDXGIAdapter1_GetDesc1(adapter1, &desc))) + { + WARN("Failed to get adapter %u desc, hr %#x.\n", adapter_index, hr); + ++adapter_index; + continue; + } + + if (desc.AdapterLuid.LowPart == luid.LowPart + && desc.AdapterLuid.HighPart == luid.HighPart) + { + hr = IDXGIAdapter1_QueryInterface(adapter1, iid, adapter); + IDXGIAdapter1_Release(adapter1); + return hr; + } + + IDXGIAdapter1_Release(adapter1); + ++adapter_index; + } + if (hr != DXGI_ERROR_NOT_FOUND) + WARN("Failed to enumerate adapters, hr %#x.\n", hr); + + WARN("Adapter could not be found.\n"); + return DXGI_ERROR_NOT_FOUND; } static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumWarpAdapter(IDXGIFactory4 *iface,

1 0

Józef Kucia : dxgi/tests: Add test for adapter locally unique identifiers.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: b7f6413120944ba862c393629a86c54b15f4cf59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f6413120944ba862c39362… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 18:15:17 2018 +0100 dxgi/tests: Add test for adapter locally unique identifiers. 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/dxgi/tests/device.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index dfbbab4..714798f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -32,6 +32,7 @@ enum frame_latency static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); +static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); static ULONG get_refcount(IUnknown *iface) { @@ -115,6 +116,45 @@ static void check_mode_desc_(unsigned int line, const DXGI_MODE_DESC *desc, } } +static BOOL equal_luid(LUID a, LUID b) +{ + return a.LowPart == b.LowPart && a.HighPart == b.HighPart; +} + +#define check_adapter_desc(a, b) check_adapter_desc_(__LINE__, a, b) +static void check_adapter_desc_(unsigned int line, const DXGI_ADAPTER_DESC *desc, + const struct DXGI_ADAPTER_DESC *expected_desc) +{ + ok_(__FILE__, line)(!lstrcmpW(desc->Description, expected_desc->Description), + "Got description %s, expected %s.\n", + wine_dbgstr_w(desc->Description), wine_dbgstr_w(expected_desc->Description)); + ok_(__FILE__, line)(desc->VendorId == expected_desc->VendorId, + "Got vendor id %04x, expected %04x.\n", + desc->VendorId, expected_desc->VendorId); + ok_(__FILE__, line)(desc->DeviceId == expected_desc->DeviceId, + "Got device id %04x, expected %04x.\n", + desc->DeviceId, expected_desc->DeviceId); + ok_(__FILE__, line)(desc->SubSysId == expected_desc->SubSysId, + "Got subsys id %04x, expected %04x.\n", + desc->SubSysId, expected_desc->SubSysId); + ok_(__FILE__, line)(desc->Revision == expected_desc->Revision, + "Got revision %02x, expected %02x.\n", + desc->Revision, expected_desc->Revision); + ok_(__FILE__, line)(desc->DedicatedVideoMemory == expected_desc->DedicatedVideoMemory, + "Got dedicated video memory %lu, expected %lu.\n", + desc->DedicatedVideoMemory, expected_desc->DedicatedVideoMemory); + ok_(__FILE__, line)(desc->DedicatedSystemMemory == expected_desc->DedicatedSystemMemory, + "Got dedicated system memory %lu, expected %lu.\n", + desc->DedicatedSystemMemory, expected_desc->DedicatedSystemMemory); + ok_(__FILE__, line)(desc->SharedSystemMemory == expected_desc->SharedSystemMemory, + "Got shared system memory %lu, expected %lu.\n", + desc->SharedSystemMemory, expected_desc->SharedSystemMemory); + ok_(__FILE__, line)(equal_luid(desc->AdapterLuid, expected_desc->AdapterLuid), + "Got LUID %08x:%08x, expected %08x:%08x.\n", + desc->AdapterLuid.HighPart, desc->AdapterLuid.LowPart, + expected_desc->AdapterLuid.HighPart, expected_desc->AdapterLuid.LowPart); +} + #define check_output_desc(a, b) check_output_desc_(__LINE__, a, b) static void check_output_desc_(unsigned int line, const DXGI_OUTPUT_DESC *desc, const struct DXGI_OUTPUT_DESC *expected_desc) @@ -416,7 +456,7 @@ static void test_adapter_desc(void) "Got unexpected dedicated system memory %lu.\n", desc1.DedicatedSystemMemory); ok(desc1.SharedSystemMemory == desc.SharedSystemMemory, "Got unexpected shared system memory %lu.\n", desc1.SharedSystemMemory); - ok(!memcmp(&desc.AdapterLuid, &desc1.AdapterLuid, sizeof(desc.AdapterLuid)), + ok(equal_luid(desc1.AdapterLuid, desc.AdapterLuid), "Got unexpected adapter LUID %08x:%08x.\n", desc1.AdapterLuid.HighPart, desc1.AdapterLuid.LowPart); trace("Flags: %08x.\n", desc1.Flags); @@ -428,6 +468,125 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_adapter_luid(void) +{ + DXGI_ADAPTER_DESC device_adapter_desc, desc, desc2; + static const LUID luid = {0xdeadbeef, 0xdeadbeef}; + IDXGIAdapter *adapter, *adapter2; + unsigned int found_adapter_count; + unsigned int adapter_index; + BOOL is_null_luid_adapter; + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + BOOL have_unique_luid; + IDXGIDevice *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetDesc(adapter, &device_adapter_desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + is_null_luid_adapter = !device_adapter_desc.AdapterLuid.HighPart + && !device_adapter_desc.AdapterLuid.LowPart; + + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + have_unique_luid = TRUE; + found_adapter_count = 0; + adapter_index = 0; + while ((hr = IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)) == S_OK) + { + hr = IDXGIAdapter_GetDesc(adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + + if (equal_luid(desc.AdapterLuid, device_adapter_desc.AdapterLuid)) + { + check_adapter_desc(&desc, &device_adapter_desc); + ++found_adapter_count; + } + + if (equal_luid(desc.AdapterLuid, luid)) + have_unique_luid = FALSE; + + if (factory4) + { + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, desc.AdapterLuid, + &IID_IDXGIAdapter, (void **)&adapter2); + ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + hr = IDXGIAdapter_GetDesc(adapter2, &desc2); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + check_adapter_desc(&desc2, &desc); + ok(adapter2 != adapter, "Expected to get new instance of IDXGIAdapter.\n"); + refcount = IDXGIAdapter_Release(adapter2); + ok(!refcount, "Adapter has %u references left.\n", refcount); + } + + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "Adapter has %u references left.\n", refcount); + + ++adapter_index; + } + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + /* Older versions of WARP aren't enumerated by IDXGIFactory_EnumAdapters(). */ + todo_wine ok(found_adapter_count == 1 || broken(is_null_luid_adapter), + "Found %u adapters for LUID %08x:%08x.\n", + found_adapter_count, device_adapter_desc.AdapterLuid.HighPart, + device_adapter_desc.AdapterLuid.LowPart); + + if (factory4) + IDXGIFactory4_Release(factory4); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + + if (!pCreateDXGIFactory2 + || FAILED(hr = pCreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory4))) + { + skip("DXGI 1.4 is not available.\n"); + return; + } + + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, + &IID_IDXGIAdapter, (void **)&adapter); + todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter_GetDesc(adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + check_adapter_desc(&desc, &device_adapter_desc); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "Adapter has %u references left.\n", refcount); + } + + if (have_unique_luid) + { + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, luid, &IID_IDXGIAdapter, (void **)&adapter); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } + else + { + skip("Our LUID is not unique.\n"); + } + + refcount = IDXGIFactory4_Release(factory4); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void test_check_interface_support(void) { LARGE_INTEGER driver_version; @@ -3215,12 +3374,15 @@ static void test_output_desc(void) START_TEST(device) { - pCreateDXGIFactory1 = (void *)GetProcAddress(GetModuleHandleA("dxgi.dll"), "CreateDXGIFactory1"); + HMODULE dxgi_module = GetModuleHandleA("dxgi.dll"); + pCreateDXGIFactory1 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory1"); + pCreateDXGIFactory2 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory2"); registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); test_adapter_desc(); + test_adapter_luid(); test_check_interface_support(); test_create_surface(); test_parents();

1 0

Józef Kucia : dxguid: Add more Direct3D IIDs.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 547db302016445df78dd2bbfce4b61f1c9de1ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547db302016445df78dd2bbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 18:15:18 2018 +0100 dxguid: Add more Direct3D IIDs. 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/dxgi/dxgi_private.h | 2 +- dlls/dxguid/dx10guid.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index eb11b7f..b8af8c3 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -31,10 +31,10 @@ #include "winnls.h" #include "d3d10_1.h" +#include "dxgi1_6.h" #ifdef DXGI_INIT_GUID #include "initguid.h" #endif -#include "dxgi1_6.h" #include "wine/wined3d.h" #include "wine/winedxgi.h" diff --git a/dlls/dxguid/dx10guid.c b/dlls/dxguid/dx10guid.c index 8a447c7..1959d00 100644 --- a/dlls/dxguid/dx10guid.c +++ b/dlls/dxguid/dx10guid.c @@ -31,8 +31,9 @@ #include "olectl.h" #include "initguid.h" +#include "dxgi1_6.h" #include "d3d10_1.h" -#include "d3d11.h" +#include "d3d11_4.h" #include "d3dx10.h" #include "d3d10_1shader.h" #include "d3d11shader.h"

1 0

Józef Kucia : dxgi/tests: Fix crash in test_output_desc().
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: f65f1a939aaace9d65ddba90c29f5c8a3b9f7413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65f1a939aaace9d65ddba90… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 23 18:15:19 2018 +0100 dxgi/tests: Fix crash in test_output_desc(). 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/dxgi/tests/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 714798f..f7b3ba0 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3343,8 +3343,6 @@ static void test_output_desc(void) refcount = get_refcount((IUnknown *)output); ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); - hr = IDXGIOutput_GetDesc(output, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x for output %u on adapter %u.\n", hr, j, i); hr = IDXGIOutput_GetDesc(output, &desc); ok(SUCCEEDED(hr), "Failed to get desc for output %u on adapter %u, hr %#x.\n", j, i, hr);

1 0

Hans Leidekker : webservices: Also set localname and value for xmlns attributes.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 69ea451bdef891dafcb15b904079a3365a5393d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ea451bdef891dafcb15b90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:30:01 2018 +0100 webservices: Also set localname and value for xmlns attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 39 +++++++++++ dlls/webservices/tests/reader.c | 142 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 169 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69ea451bdef891dafcb1…

1 0

Hans Leidekker : webervices/tests: Add tests for out of range string IDs.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: e3851a87404841b3550e78f1b1bf2f153a1a280b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3851a87404841b3550e78f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 24 14:30:02 2018 +0100 webervices/tests: Add tests for out of range string IDs. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 9879fac..7064cf0 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5612,6 +5612,10 @@ static void test_dictionary(void) {0x40,0x01,'t',0x0a,0x0a,0x01}; static const char test8[] = {0x40,0x01,'t',0x0b,0x01,'p',0x0a,0x01}; + static const char test9[] = + {0x42,0x0c,0x01}; + static const char test10[] = + {0x42,0x04,0xab,0x0c,0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; @@ -5940,6 +5944,23 @@ static void test_dictionary(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* element name string id out of range */ + hr = set_input_bin( reader, test9, sizeof(test9), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* text string id out of range */ + hr = set_input_bin( reader, test10, sizeof(test10), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = WsGetDictionary( 0, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Hans Leidekker : kerberos: Implement SpAcquireCredentialsHandle.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 737d464e759d5d24d62e79181be5a5e84d08a022 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737d464e759d5d24d62e7918… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:24 2018 +0800 kerberos: Implement SpAcquireCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 122 ++++++++++++++++++++++++++ configure.ac | 18 ++++ dlls/kerberos/Makefile.in | 2 +- dlls/kerberos/krb5_ap.c | 216 ++++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 9 ++ 5 files changed, 350 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=737d464e759d5d24d62e…

1 0

Hans Leidekker : kerberos: Implement SpInitLsaModeContext.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 61086485e8afa79d5c459b6bd900372a401a7863 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61086485e8afa79d5c459b6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 18 23:51:28 2018 +0800 kerberos: Implement SpInitLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 06a0ad4..0821e7c 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -187,7 +187,10 @@ static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gss_acquire_cred); +MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); +MAKE_FUNCPTR(gss_init_sec_context); +MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -207,7 +210,10 @@ static BOOL load_gssapi_krb5(void) } LOAD_FUNCPTR(gss_acquire_cred) + LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) + LOAD_FUNCPTR(gss_init_sec_context) + LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -225,11 +231,28 @@ static void unload_gssapi_krb5(void) libgssapi_krb5_handle = NULL; } +static inline gss_cred_id_t credhandle_sspi_to_gss( LSA_SEC_HANDLE cred ) +{ + if (!cred) return GSS_C_NO_CREDENTIAL; + return (gss_cred_id_t)cred; +} + static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) { *cred = (LSA_SEC_HANDLE)handle; } +static inline gss_ctx_id_t ctxthandle_sspi_to_gss( LSA_SEC_HANDLE ctxt ) +{ + if (!ctxt) return GSS_C_NO_CONTEXT; + return (gss_ctx_id_t)ctxt; +} + +static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE *ctxt ) +{ + *ctxt = (LSA_SEC_HANDLE)handle; +} + static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) @@ -286,6 +309,43 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam HeapFree( GetProcessHeap(), 0, buf.value ); return status_gss_to_sspi( ret ); } + +static ULONG flags_isc_req_to_gss( ULONG flags ) +{ + ULONG ret = GSS_C_DCE_STYLE; + if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; + if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; + if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; + if (flags & ISC_REQ_SEQUENCE_DETECT) ret |= GSS_C_SEQUENCE_FLAG; + if (flags & ISC_REQ_CONFIDENTIALITY) ret |= GSS_C_CONF_FLAG; + if (flags & ISC_REQ_INTEGRITY) ret |= GSS_C_INTEG_FLAG; + if (flags & ISC_REQ_NULL_SESSION) ret |= GSS_C_ANON_FLAG; + return ret; +} + +static ULONG flags_gss_to_isc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ISC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ISC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ISC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ISC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + return ret; +} + +static int get_buffer_index( SecBufferDesc *desc, DWORD type ) +{ + UINT i; + if (!desc) return -1; + for (i = 0; i < desc->cBuffers; i++) + { + if (desc->pBuffers[i].BufferType == type) return i; + } + return -1; +} #endif /* SONAME_LIBGSSAPI_KRB5 */ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( @@ -344,6 +404,85 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, + LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, + BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; + OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req & ~supported) + { + FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + + ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, + GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, + &expiry_time ); + TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_INCOMPLETE_MESSAGE; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_isc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + if (target != GSS_C_NO_NAME) pgss_release_name( &minor_status, &target ); + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -387,7 +526,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ - NULL, /* InitLsaModeContext */ + kerberos_SpInitLsaModeContext, NULL, /* AcceptLsaModeContext */ NULL, /* DeleteContext */ NULL, /* ApplyControlToken */

1 0