diff --git a/patches/dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch b/patches/dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch index 769fa466..3875e790 100644 --- a/patches/dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch +++ b/patches/dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch @@ -1,27 +1,14 @@ -From 62b06b3339801083e955422e22be7f2d3c2ced12 Mon Sep 17 00:00:00 2001 +From ac234f708a63cbbf13d4b2894c15d072bcd27cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 24 Jan 2017 01:37:29 +0100 Subject: [PATCH] dxgi: Implement setting and querying the gamma value of an output. --- - dlls/dxgi/Makefile.in | 2 +- dlls/dxgi/output.c | 17 +++++++++++++++-- dlls/dxgi/tests/device.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 61 insertions(+), 3 deletions(-) + 2 files changed, 60 insertions(+), 2 deletions(-) -diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in -index ce76b8e..1a0c908 100644 ---- a/dlls/dxgi/Makefile.in -+++ b/dlls/dxgi/Makefile.in -@@ -1,6 +1,6 @@ - MODULE = dxgi.dll - IMPORTLIB = dxgi --IMPORTS = dxguid uuid wined3d user32 -+IMPORTS = dxguid uuid wined3d user32 gdi32 - - C_SRCS = \ - adapter.c \ diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 2b168fb..31bdf9a 100644 --- a/dlls/dxgi/output.c @@ -52,10 +39,10 @@ index 2b168fb..31bdf9a 100644 static HRESULT STDMETHODCALLTYPE dxgi_output_SetGammaControl(IDXGIOutput4 *iface, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c -index 58c3bba..acf0f85 100644 +index 8ad4935..8007c49 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c -@@ -1852,11 +1852,13 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, +@@ -1942,11 +1942,13 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, static void test_set_fullscreen(void) { struct swapchain_fullscreen_state initial_state; @@ -69,7 +56,7 @@ index 58c3bba..acf0f85 100644 ULONG refcount; HRESULT hr; -@@ -1872,6 +1874,17 @@ static void test_set_fullscreen(void) +@@ -1962,6 +1964,17 @@ static void test_set_fullscreen(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); @@ -87,7 +74,7 @@ index 58c3bba..acf0f85 100644 swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; -@@ -1902,6 +1915,38 @@ static void test_set_fullscreen(void) +@@ -1992,6 +2005,38 @@ static void test_set_fullscreen(void) skip("Could not change fullscreen state.\n"); goto done; } diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7070c4cd..e33fb8cf 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "d3a71dec7ee99e9c65630d080c02d7d4182e61a6" + echo "185d9ee7ebf56e0663f715e532f2ee2c27289f12" } # Show version information @@ -3730,7 +3730,7 @@ fi # | * [#43584] Implement DXGI GammaControl methods # | # | Modified files: -# | * dlls/dxgi/Makefile.in, dlls/dxgi/output.c, dlls/dxgi/tests/device.c +# | * dlls/dxgi/output.c, dlls/dxgi/tests/device.c # | if test "$enable_dxgi_GammaRamp" -eq 1; then patch_apply dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch