wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

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: 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 : 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: 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

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

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 213bd4cffaef2fc255398d915aea71808e54d196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=213bd4cffaef2fc255398d91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 21:30:18 2018 +0100 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/opengl_ext.c | 44 ++++++++++++++++++++++---------------------- dlls/opengl32/opengl_norm.c | 4 ++-- include/wine/wgl.h | 9 +++++++++ include/wine/wgl_driver.h | 6 +++--- 4 files changed, 36 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=213bd4cffaef2fc25539…

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_srcElement implementation.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 07954f36215ebef81205437f0ae87b38f0505d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07954f36215ebef81205437f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 24 17:38:12 2018 +0100 mshtml: Added IDOMEvent::get_srcElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 20 ++++++++++++++------ dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index abc0a1c..8e977f1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -396,10 +396,12 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - if(This->event && This->event->target) - IDispatchEx_QueryInterface(&This->event->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); - return S_OK; + if(!This->event) { + *p = NULL; + return S_OK; + } + + return IDOMEvent_get_srcElement(&This->event->IDOMEvent_iface, p); } static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL *p) @@ -1167,8 +1169,14 @@ static HRESULT WINAPI DOMEvent_get_cancelBubble(IDOMEvent *iface, VARIANT_BOOL * static HRESULT WINAPI DOMEvent_get_srcElement(IDOMEvent *iface, IHTMLElement **p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->target) + IDispatchEx_QueryInterface(&This->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); + else + *p = NULL; + return S_OK; } static const IDOMEventVtbl DOMEventVtbl = { diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index f471b86..30d23c7 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -469,6 +469,7 @@ function test_dispatch_event() { return function(event) { ok(event === e, "event != e"); ok(event.target === child, "target != child"); + ok(event.srcElement === child, "srcElement != child"); calls += msg + ","; }; } @@ -485,12 +486,14 @@ function test_dispatch_event() { e = document.createEvent("Event"); e.initEvent("click", true, true); ok(e.target === null, "e.target != null"); + ok(e.srcElement === null, "e.srcElement != null"); calls = ""; child.dispatchEvent(e); ok(calls === "parent.click(capture),child.click(capture),child.click(bubble)," + "parent.click(bubble),", "calls = " + calls); ok(e.target === child, "e.target != child"); + ok(e.srcElement === child, "e.srcElement != child"); ok(e.currentTarget === null, "e.currentTarget != null"); e = document.createEvent("Event");

1 0

Sebastian Lackner : shcore: Add SetProcessDpiAwareness stub.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 6f7532cb7b58e77492a72b926d8327bafe73957d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f7532cb7b58e77492a72b92… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 24 01:19:05 2018 -0700 shcore: Add SetProcessDpiAwareness stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 6 ++++++ dlls/shcore/shcore.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 44c0e93..6194c8c 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -5,5 +5,5 @@ @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications -@ stub SetProcessDpiAwareness +@ stdcall SetProcessDpiAwareness(long) shcore.SetProcessDpiAwareness @ stub UnregisterScaleChangeEvent diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 9073bd1..739e3ff 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -51,6 +51,12 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val return S_OK; } +HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) +{ + FIXME("(%u): stub\n", value); + return E_NOTIMPL; +} + HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y) { HDC hDC; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 958c91f..a9a6f31 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -78,7 +78,7 @@ @ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi @ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID -@ stub SetProcessDpiAwareness +@ stdcall SetProcessDpiAwareness(long) @ stub SetProcessReference @ stub UnregisterScaleChangeEvent

1 0

Sebastian Lackner : shcore: Implement semi-stub for GetDpiForMonitor.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 4a4bf34f069f9464a3644c0d83875eecd0d300b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a4bf34f069f9464a3644c0d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 24 01:19:04 2018 -0700 shcore: Implement semi-stub for GetDpiForMonitor. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/Makefile.in | 1 + dlls/shcore/main.c | 16 ++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index acf194a..44c0e93 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,4 +1,4 @@ -@ stub GetDpiForMonitor +@ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice @ stub GetScaleFactorForMonitor diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index ec2e95f..8497198 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = shcore.dll +IMPORTS = user32 gdi32 C_SRCS = \ main.c diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 9075a38..9073bd1 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -21,6 +21,8 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "shellscalingapi.h" #include "wine/debug.h" @@ -48,3 +50,17 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val if (value) *value = PROCESS_DPI_UNAWARE; return S_OK; } + +HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y) +{ + HDC hDC; + + FIXME("(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y); + + hDC = GetDC(0); + if (x) *x = GetDeviceCaps(hDC, LOGPIXELSX); + if (y) *y = GetDeviceCaps(hDC, LOGPIXELSY); + ReleaseDC(0, hDC); + + return S_OK; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 374fafb..958c91f 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -7,7 +7,7 @@ @ stub DllGetActivationFactory @ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID -@ stub GetDpiForMonitor +@ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent @ stdcall GetProcessDpiAwareness(long ptr) @ stub GetProcessReference

1 0

Sebastian Lackner : shcore: Add stub dll and GetProcessDpiAwareness stub.
by Alexandre Julliard 24 Jan '18

24 Jan '18

Module: wine Branch: master Commit: 225f8bea79e0c5daf58b2d00c3303625ba91bdeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=225f8bea79e0c5daf58b2d00… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 24 01:19:03 2018 -0700 shcore: Add stub dll and GetProcessDpiAwareness stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/Makefile.in | 4 + dlls/shcore/main.c | 50 ++++++ dlls/shcore/shcore.spec | 181 +++++++++++++++++++++ tools/make_specfiles | 7 +- 7 files changed, 245 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=225f8bea79e0c5daf58b…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2018