wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 83e481fee20bc5c6598e65f8295be1b3f11fb70b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-08-22 09:09:03 +10:00
parent 110a6f6016
commit 8cf0e5c285
11 changed files with 110 additions and 578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
patches/d3d11-Depth_Bias/0007-d3d10core-tests-Add-test-for-depth-bias-clamp.patch
View File

@ -1,18 +1,18 @@
From de26db5e899f92d2477c49fcfc57e673a3048205 Mon Sep 17 00:00:00 2001
From 23044a3ed53cfe0c8a35c5cc19d51913e1523c51 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Thu, 17 May 2018 09:29:08 -0500
Subject: d3d10core/tests: Add test for depth bias clamp.
Subject: [PATCH] d3d10core/tests: Add test for depth bias clamp.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
---
dlls/d3d10core/tests/device.c | 120 +++++++++++++++++++++++++-----------------
1 file changed, 71 insertions(+), 49 deletions(-)
dlls/d3d10core/tests/d3d10core.c | 126 ++++++++++++++++++-------------
1 file changed, 74 insertions(+), 52 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 50521bd..6e92c77 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -14697,10 +14697,10 @@ static void test_depth_bias(void)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index e675c12a39e..2100a6611e5 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -14957,10 +14957,10 @@ static void test_depth_bias(void)
struct resource_readback rb;
ID3D10DepthStencilView *dsv;
unsigned int expected_value;
@ -24,7 +24,7 @@ index 50521bd..6e92c77 100644
unsigned int shift = 0;
ID3D10Device *device;
float *depth_values;
@@ -14727,6 +14727,10 @@ static void test_depth_bias(void)
@@ -14987,6 +14987,10 @@ static void test_depth_bias(void)
-10000, -1000, -100, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 50, 100, 200, 500, 1000, 10000,
};
@ -35,7 +35,7 @@ index 50521bd..6e92c77 100644
static const float quad_slopes[] =
{
0.0f, 0.5f, 1.0f
@@ -14819,68 +14823,86 @@ static void test_depth_bias(void)
@@ -15079,68 +15083,86 @@ static void test_depth_bias(void)
for (j = 0; j < ARRAY_SIZE(bias_tests); ++j)
{
rasterizer_desc.DepthBias = bias_tests[j];
@ -45,12 +45,25 @@ index 50521bd..6e92c77 100644
- ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0);
- draw_quad(&test_context);
- switch (format)
+
+ for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k)
{
- {
- case DXGI_FORMAT_D32_FLOAT:
- bias = rasterizer_desc.DepthBias * pow(2.0f, quads[i].exponent - 23.0f);
- depth = min(max(0.0f, quads[i].z + bias), 1.0f);
-
- check_texture_float(texture, depth, 2);
- break;
- case DXGI_FORMAT_D24_UNORM_S8_UINT:
- r = 1.0f / 16777215.0f;
- bias = rasterizer_desc.DepthBias * r;
- depth = min(max(0.0f, quads[i].z + bias), 1.0f);
- get_texture_readback(texture, 0, &rb);
- for (y = 0; y < texture_desc.Height; ++y)
- {
- expected_value = depth * 16777215.0f + 0.5f;
- for (x = 0; x < texture_desc.Width; ++x)
+ for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k)
+ {
+ rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k];
+ ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs);
+ ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr);
@ -66,13 +79,7 @@ index 50521bd..6e92c77 100644
+ if (rasterizer_desc.DepthBiasClamp < 0)
+ bias = max(bias, rasterizer_desc.DepthBiasClamp);
+ depth = min(max(0.0f, quads[i].z + bias), 1.0f);
- check_texture_float(texture, depth, 2);
- break;
- case DXGI_FORMAT_D24_UNORM_S8_UINT:
- r = 1.0f / 16777215.0f;
- bias = rasterizer_desc.DepthBias * r;
- depth = min(max(0.0f, quads[i].z + bias), 1.0f);
+
+ check_texture_float(texture, depth, 2);
+ break;
+ case DXGI_FORMAT_D24_UNORM_S8_UINT:
@ -83,12 +90,7 @@ index 50521bd..6e92c77 100644
+ if (rasterizer_desc.DepthBiasClamp < 0)
+ bias = max(bias, rasterizer_desc.DepthBiasClamp);
+ depth = min(max(0.0f, quads[i].z + bias), 1.0f);
- get_texture_readback(texture, 0, &rb);
- for (y = 0; y < texture_desc.Height; ++y)
- {
- expected_value = depth * 16777215.0f + 0.5f;
- for (x = 0; x < texture_desc.Width; ++x)
+
+ get_texture_readback(texture, 0, &rb);
+ for (y = 0; y < texture_desc.Height; ++y)
{
@ -116,6 +118,12 @@ index 50521bd..6e92c77 100644
- r = 1.0f / 65535.0f;
- bias = rasterizer_desc.DepthBias * r;
- depth = min(max(0.0f, quads[i].z + bias), 1.0f);
-
- get_texture_readback(texture, 0, &rb);
- for (y = 0; y < texture_desc.Height; ++y)
- {
- expected_value = depth * 65535.0f + 0.5f;
- for (x = 0; x < texture_desc.Width; ++x)
+ release_resource_readback(&rb);
+ break;
+ case DXGI_FORMAT_D16_UNORM:
@ -126,12 +134,7 @@ index 50521bd..6e92c77 100644
+ if (rasterizer_desc.DepthBiasClamp < 0)
+ bias = max(bias, rasterizer_desc.DepthBiasClamp);
+ depth = min(max(0.0f, quads[i].z + bias), 1.0f);
- get_texture_readback(texture, 0, &rb);
- for (y = 0; y < texture_desc.Height; ++y)
- {
- expected_value = depth * 65535.0f + 0.5f;
- for (x = 0; x < texture_desc.Width; ++x)
+
+ get_texture_readback(texture, 0, &rb);
+ for (y = 0; y < texture_desc.Height; ++y)
{
@ -171,5 +174,5 @@ index 50521bd..6e92c77 100644
{
for (j = 0; j < ARRAY_SIZE(vertices); ++j)
--
2.7.4
2.18.0

405
patches/dinput8-shared-code/0001-dinput8-Use-shared-source-directory.patch
View File

@ -1,405 +0,0 @@
From b545fa3045a535c75e0611ca6c80b43e5dde57d5 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Mon, 30 Jul 2018 09:33:29 +1000
Subject: [PATCH] dinput8: Use shared source directory.
Based off a patch by Andrew Wesie.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
---
dlls/dinput/Makefile.in | 1 +
dlls/dinput/dinput_main.c | 63 +++++++++++
dlls/dinput8/Makefile.in | 17 ++-
dlls/dinput8/dinput8_main.c | 247 --------------------------------------------
4 files changed, 79 insertions(+), 249 deletions(-)
delete mode 100644 dlls/dinput8/dinput8_main.c
diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in
index 5d287a3..b1107ee 100644
--- a/dlls/dinput/Makefile.in
+++ b/dlls/dinput/Makefile.in
@@ -1,6 +1,7 @@
MODULE = dinput.dll
IMPORTLIB = dinput
IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32
+EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700
EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
C_SRCS = \
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index e4538a0..d42a826 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -164,6 +164,60 @@ HRESULT WINAPI DirectInputCreateEx(
return DI_OK;
}
+#if DIRECTINPUT_VERSION == 0x0800
+/******************************************************************************
+ * DirectInput8Create (DINPUT8.@)
+ */
+HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter)
+{
+ IDirectInputImpl *This;
+ HRESULT hr;
+
+ TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);
+
+ if (!ppDI)
+ return E_POINTER;
+
+ if (!IsEqualGUID(&IID_IDirectInput8A, riid) &&
+ !IsEqualGUID(&IID_IDirectInput8W, riid) &&
+ !IsEqualGUID(&IID_IUnknown, riid))
+ {
+ *ppDI = NULL;
+ return DIERR_NOINTERFACE;
+ }
+
+ hr = create_directinput_instance(riid, ppDI, &This);
+
+ if (FAILED(hr)) {
+ ERR("CoCreateInstance failed with hr = 0x%08x\n", hr);
+ return hr;
+ }
+
+ /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */
+ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) {
+ hr = IDirectInput8_Initialize(&This->IDirectInput8A_iface, hinst, dwVersion);
+ if (FAILED(hr))
+ {
+ IDirectInput8_Release(&This->IDirectInput8A_iface);
+ *ppDI = NULL;
+ return hr;
+ }
+ }
+
+ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) {
+ hr = IDirectInput8_Initialize(&This->IDirectInput8W_iface, hinst, dwVersion);
+ if (FAILED(hr))
+ {
+ IDirectInput8_Release(&This->IDirectInput8W_iface);
+ *ppDI = NULL;
+ return hr;
+ }
+ }
+
+ return S_OK;
+}
+#endif
+
/******************************************************************************
* DirectInputCreateA (DINPUT.@)
*/
@@ -1513,6 +1567,7 @@ static HRESULT WINAPI DICF_CreateInstance(
IClassFactoryImpl *This = impl_from_IClassFactory(iface);
TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
+#if DIRECTINPUT_VERSION < 0x0800
if ( IsEqualGUID( &IID_IUnknown, riid ) ||
IsEqualGUID( &IID_IDirectInputA, riid ) ||
IsEqualGUID( &IID_IDirectInputW, riid ) ||
@@ -1522,6 +1577,13 @@ static HRESULT WINAPI DICF_CreateInstance(
IsEqualGUID( &IID_IDirectInput7W, riid ) ) {
return create_directinput_instance(riid, ppobj, NULL);
}
+#else
+ if( IsEqualGUID( &IID_IDirectInput8A, riid ) ||
+ IsEqualGUID( &IID_IDirectInput8W, riid ) ||
+ IsEqualGUID( &IID_IUnknown, riid )) {
+ return create_directinput_instance(riid, ppobj, NULL);
+ }
+#endif
FIXME("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj);
return E_NOINTERFACE;
@@ -1833,3 +1895,4 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved)
}
return TRUE;
}
+
diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in
index 26672ae..6b62969 100644
--- a/dlls/dinput8/Makefile.in
+++ b/dlls/dinput8/Makefile.in
@@ -1,9 +1,22 @@
MODULE = dinput8.dll
IMPORTLIB = dinput8
-IMPORTS = uuid dxguid dinput ole32 advapi32
+IMPORTS = dxguid uuid comctl32 ole32 user32 advapi32
+EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800
+EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS)
+PARENTSRC = ../dinput
C_SRCS = \
- dinput8_main.c
+ config.c \
+ data_formats.c \
+ device.c \
+ dinput_main.c \
+ effect_linuxinput.c \
+ joystick.c \
+ joystick_linux.c \
+ joystick_linuxinput.c \
+ joystick_osx.c \
+ keyboard.c \
+ mouse.c
IDL_SRCS = dinput8.idl
diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c
deleted file mode 100644
index 9824c76..0000000
--- a/dlls/dinput8/dinput8_main.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* DirectInput 8
- *
- * Copyright 2002 TransGaming Technologies Inc.
- * Copyright 2006 Roderick Colenbrander
- *
- * 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 "config.h"
-#include <assert.h>
-#include <stdarg.h>
-#include <string.h>
-
-#define COBJMACROS
-
-#include "wine/debug.h"
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
-#include "objbase.h"
-#include "rpcproxy.h"
-#include "dinput.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dinput);
-
-static HINSTANCE instance;
-static LONG dll_count;
-
-/*
- * Dll lifetime tracking declaration
- */
-static void LockModule(void)
-{
- InterlockedIncrement(&dll_count);
-}
-
-static void UnlockModule(void)
-{
- InterlockedDecrement(&dll_count);
-}
-
-/******************************************************************************
- * DirectInput8Create (DINPUT8.@)
- */
-HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) {
- IDirectInputA *pDI;
- HRESULT hr, hrCo;
-
- TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter);
-
- if (!ppDI)
- return E_POINTER;
-
- if (!IsEqualGUID(&IID_IDirectInput8A, riid) &&
- !IsEqualGUID(&IID_IDirectInput8W, riid) &&
- !IsEqualGUID(&IID_IUnknown, riid))
- {
- *ppDI = NULL;
- return DIERR_NOINTERFACE;
- }
-
- hrCo = CoInitialize(NULL);
-
- hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&pDI);
-
- /* Ensure balance of calls. */
- if (SUCCEEDED(hrCo))
- CoUninitialize();
-
- if (FAILED(hr)) {
- ERR("CoCreateInstance failed with hr = 0x%08x\n", hr);
- return hr;
- }
-
- hr = IDirectInput_QueryInterface(pDI, riid, ppDI);
- IDirectInput_Release(pDI);
-
- if (FAILED(hr))
- return hr;
-
- /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */
- if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) {
- IDirectInput8A *DI = *ppDI;
-
- hr = IDirectInput8_Initialize(DI, hinst, dwVersion);
- if (FAILED(hr))
- {
- IDirectInput8_Release(DI);
- *ppDI = NULL;
- return hr;
- }
- }
-
- if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8W, riid)) {
- IDirectInput8W *DI = *ppDI;
-
- hr = IDirectInput8_Initialize(DI, hinst, dwVersion);
- if (FAILED(hr))
- {
- IDirectInput8_Release(DI);
- *ppDI = NULL;
- return hr;
- }
- }
-
- return S_OK;
-}
-
-/*******************************************************************************
- * DirectInput8 ClassFactory
- */
-typedef struct
-{
- /* IUnknown fields */
- IClassFactory IClassFactory_iface;
-} IClassFactoryImpl;
-
-static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
-{
- return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface);
-}
-
-static HRESULT WINAPI DI8CF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
- IClassFactoryImpl *This = impl_from_IClassFactory(iface);
- FIXME("%p %s %p\n",This,debugstr_guid(riid),ppobj);
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI DI8CF_AddRef(LPCLASSFACTORY iface) {
- LockModule();
- return 2;
-}
-
-static ULONG WINAPI DI8CF_Release(LPCLASSFACTORY iface) {
- UnlockModule();
- return 1;
-}
-
-static HRESULT WINAPI DI8CF_CreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj) {
- IClassFactoryImpl *This = impl_from_IClassFactory(iface);
-
- TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
- if( IsEqualGUID( &IID_IDirectInput8A, riid ) || IsEqualGUID( &IID_IDirectInput8W, riid ) || IsEqualGUID( &IID_IUnknown, riid )) {
- IDirectInputA *ppDI;
- HRESULT hr;
-
- hr = CoCreateInstance(&CLSID_DirectInput, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInputA, (void **)&ppDI);
- if (FAILED(hr))
- return hr;
-
- hr = IDirectInput_QueryInterface(ppDI, riid, ppobj);
- IDirectInput_Release(ppDI);
-
- return hr;
- }
-
- ERR("(%p,%p,%s,%p) Interface not found!\n",This,pOuter,debugstr_guid(riid),ppobj);
- return E_NOINTERFACE;
-}
-
-static HRESULT WINAPI DI8CF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
- TRACE("(%p)->(%d)\n", iface, dolock);
-
- if(dolock)
- LockModule();
- else
- UnlockModule();
-
- return S_OK;
-}
-
-static const IClassFactoryVtbl DI8CF_Vtbl = {
- DI8CF_QueryInterface,
- DI8CF_AddRef,
- DI8CF_Release,
- DI8CF_CreateInstance,
- DI8CF_LockServer
-};
-static IClassFactoryImpl DINPUT8_CF = { { &DI8CF_Vtbl } };
-
-
-/***********************************************************************
- * DllCanUnloadNow (DINPUT8.@)
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
- return dll_count == 0 ? S_OK : S_FALSE;
-}
-
-/***********************************************************************
- * DllGetClassObject (DINPUT8.@)
- */
-HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
- TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
- if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) {
- *ppv = &DINPUT8_CF;
- IClassFactory_AddRef((IClassFactory*)*ppv);
- return S_OK;
- }
-
- FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
- return CLASS_E_CLASSNOTAVAILABLE;
-}
-
-/***********************************************************************
- * DllMain
- */
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
-{
- switch (reason)
- {
- case DLL_PROCESS_ATTACH:
- instance = hInstDLL;
- DisableThreadLibraryCalls( hInstDLL );
- break;
- }
- return TRUE;
-}
-
-/***********************************************************************
- * DllRegisterServer (DINPUT8.@)
- */
-HRESULT WINAPI DllRegisterServer(void)
-{
- return __wine_register_resources( instance );
-}
-
-/***********************************************************************
- * DllUnregisterServer (DINPUT8.@)
- */
-HRESULT WINAPI DllUnregisterServer(void)
-{
- return __wine_unregister_resources( instance );
-}
--
1.9.1

1
patches/dinput8-shared-code/definition
View File

@ -1 +0,0 @@
Fixes: [45568] League of Legends 8.12+ fails to start a game (anticheat engine, validation of loaded DLLs)

24
patches/dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch
View File

@ -1,16 +1,16 @@
From ac234f708a63cbbf13d4b2894c15d072bcd27cdd Mon Sep 17 00:00:00 2001
From c6530912db59318d93b77daa1cab061ff5afadaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 24 Jan 2017 01:37:29 +0100
Subject: [PATCH] dxgi: Implement setting and querying the gamma value of an
output.
---
dlls/dxgi/output.c | 17 +++++++++++++++--
dlls/dxgi/tests/device.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
dlls/dxgi/output.c | 17 ++++++++++++++--
dlls/dxgi/tests/dxgi.c | 45 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
index 2b168fb..31bdf9a 100644
index 2b168fb627b..31bdf9a3805 100644
--- a/dlls/dxgi/output.c
+++ b/dlls/dxgi/output.c
@@ -293,9 +293,22 @@ static void STDMETHODCALLTYPE dxgi_output_ReleaseOwnership(IDXGIOutput4 *iface)
@ -38,11 +38,11 @@ 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 8ad4935..8007c49 100644
--- a/dlls/dxgi/tests/device.c
+++ b/dlls/dxgi/tests/device.c
@@ -1942,11 +1942,13 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index 56065456eb0..6bd257c6190 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -2110,11 +2110,13 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain,
static void test_set_fullscreen(void)
{
struct swapchain_fullscreen_state initial_state;
@ -56,7 +56,7 @@ index 8ad4935..8007c49 100644
ULONG refcount;
HRESULT hr;
@@ -1962,6 +1964,17 @@ static void test_set_fullscreen(void)
@@ -2130,6 +2132,17 @@ static void test_set_fullscreen(void)
hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory);
ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr);
@ -74,7 +74,7 @@ index 8ad4935..8007c49 100644
swapchain_desc.BufferDesc.Width = 800;
swapchain_desc.BufferDesc.Height = 600;
swapchain_desc.BufferDesc.RefreshRate.Numerator = 60;
@@ -1992,6 +2005,38 @@ static void test_set_fullscreen(void)
@@ -2160,6 +2173,38 @@ static void test_set_fullscreen(void)
skip("Could not change fullscreen state.\n");
goto done;
}
@ -114,5 +114,5 @@ index 8ad4935..8007c49 100644
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
refcount = IDXGISwapChain_Release(swapchain);
--
1.9.1
2.18.0

42
patches/kernel32-SetFileCompletionNotificationModes/0005-ntdll-Do-not-require-unix-fd-for-FileIoCompletionNot.patch
View File

@ -1,42 +0,0 @@
From 652431398236beda32c5d3239451dbc46fbf1937 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 9 Apr 2017 02:01:25 +0200
Subject: ntdll: Do not require unix fd for
FileIoCompletionNotificationInformation.
---
dlls/ntdll/file.c | 3 ++-
dlls/ntdll/tests/pipe.c | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 4e6051a42d..5e21ecc662 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -2440,7 +2440,8 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io,
if (len < info_sizes[class])
return io->u.Status = STATUS_INFO_LENGTH_MISMATCH;
- if (class != FilePipeInformation && class != FilePipeLocalInformation)
+ if (class != FilePipeInformation && class != FilePipeLocalInformation &&
+ class != FileIoCompletionNotificationInformation)
{
if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL )))
{
diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c
index fa0ca2da00..013eb2b39f 100644
--- a/dlls/ntdll/tests/pipe.c
+++ b/dlls/ntdll/tests/pipe.c
@@ -380,9 +380,7 @@ static void test_completion(void)
info.Flags = 0;
status = pNtQueryInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation);
- todo_wine
ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
- todo_wine
ok((info.Flags & FILE_SKIP_COMPLETION_PORT_ON_SUCCESS) != 0, "got %08x\n", info.Flags);
ret = WriteFile(client, buf, sizeof(buf), &num_bytes, &ov);
--
2.11.0

18
patches/ntdll-Pipe_SpecialCharacters/0001-ntdll-Allow-special-characters-in-pipe-names.patch
View File

@ -1,4 +1,4 @@
From 6250b3812eea73306a90ac68d329f16cb4436e8d Mon Sep 17 00:00:00 2001
From 1d2d91834c73a5001e025eadb0f05e7120ce114a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 27 Jul 2014 03:35:42 +0200
Subject: [PATCH] ntdll: Allow special characters in pipe names.
@ -10,7 +10,7 @@ Based on patch by Valentyn Pavliuchenko.
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 22d120f..8e5c07f 100644
index 10c971b1b0a..89fcb03353c 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -30,6 +30,7 @@
@ -21,9 +21,9 @@ index 22d120f..8e5c07f 100644
#define NB_SERVER_LOOPS 8
@@ -627,6 +628,15 @@ static void test_CreateNamedPipe(int pipemode)
@@ -673,6 +674,15 @@ static void test_CreateNamedPipe(int pipemode)
ok(CloseHandle(hnp), "CloseHandle\n");
CloseHandle(hnp);
+ hnp = CreateNamedPipeA(PIPENAME_SPECIAL, PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT,
+ /* nMaxInstances */ 1,
@ -38,10 +38,10 @@ index 22d120f..8e5c07f 100644
}
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 3b76f9b..4206584 100644
index 71761efa781..d5e44b58c08 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -2825,6 +2825,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI
@@ -2814,6 +2814,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI
UINT disposition, BOOLEAN check_case )
{
static const WCHAR unixW[] = {'u','n','i','x'};
@ -49,7 +49,7 @@ index 3b76f9b..4206584 100644
static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 };
NTSTATUS status = STATUS_SUCCESS;
@@ -2835,6 +2836,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI
@@ -2824,6 +2825,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI
int pos, ret, name_len, unix_len, prefix_len, used_default;
WCHAR prefix[MAX_DIR_ENTRY_LEN];
BOOLEAN is_unix = FALSE;
@ -57,7 +57,7 @@ index 3b76f9b..4206584 100644
name = nameW->Buffer;
name_len = nameW->Length / sizeof(WCHAR);
@@ -2868,13 +2870,17 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI
@@ -2857,13 +2859,17 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI
name += prefix_len;
name_len -= prefix_len;
@ -80,5 +80,5 @@ index 3b76f9b..4206584 100644
else
{
--
2.7.4
2.18.0

29
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "8204d04b7fd416c1b6296708937e3c06e058809b"
echo "83e481fee20bc5c6598e65f8295be1b3f11fb70b"
}
# Show version information
@ -139,7 +139,6 @@ patch_enable_all ()
enable_ddraw_Write_Vtable="$1"
enable_dinput_Deadlock="$1"
enable_dinput_Initialize="$1"
enable_dinput8_shared_code="$1"
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
enable_dsound_Revert_Cleanup="$1"
@ -594,9 +593,6 @@ patch_enable ()
dinput-Initialize)
enable_dinput_Initialize="$2"
;;
dinput8-shared-code)
enable_dinput8_shared_code="$2"
;;
dsound-EAX)
enable_dsound_EAX="$2"
;;
@ -3060,8 +3056,8 @@ fi
# | * [#43848] Implement support for depth bias clamping
# |
# | Modified files:
# | * dlls/d3d10core/tests/device.c, dlls/d3d11/device.c, dlls/wined3d/adapter_gl.c, dlls/wined3d/cs.c, dlls/wined3d/state.c,
# | dlls/wined3d/stateblock.c, dlls/wined3d/utils.c, dlls/wined3d/wined3d_gl.h, include/wine/wined3d.h
# | * dlls/d3d10core/tests/d3d10core.c, dlls/d3d11/device.c, dlls/wined3d/adapter_gl.c, dlls/wined3d/cs.c,
# | dlls/wined3d/state.c, dlls/wined3d/stateblock.c, dlls/wined3d/utils.c, dlls/wined3d/wined3d_gl.h, include/wine/wined3d.h
# |
if test "$enable_d3d11_Depth_Bias" -eq 1; then
patch_apply d3d11-Depth_Bias/0006-wined3d-Add-support-for-depth-bias-clamping.patch
@ -3574,21 +3570,6 @@ if test "$enable_dinput_Initialize" -eq 1; then
) >> "$patchlist"
fi
# Patchset dinput8-shared-code
# |
# | This patchset fixes the following Wine bugs:
# | * [#45568] League of Legends 8.12+ fails to start a game (anticheat engine, validation of loaded DLLs)
# |
# | Modified files:
# | * dlls/dinput/Makefile.in, dlls/dinput/dinput_main.c, dlls/dinput8/Makefile.in, dlls/dinput8/dinput8_main.c
# |
if test "$enable_dinput8_shared_code" -eq 1; then
patch_apply dinput8-shared-code/0001-dinput8-Use-shared-source-directory.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "dinput8: Use shared source directory.", 1 },';
) >> "$patchlist"
fi
# Patchset dsound-Fast_Mixer
# |
# | This patchset fixes the following Wine bugs:
@ -3738,7 +3719,7 @@ fi
# | * [#43584] Implement DXGI GammaControl methods
# |
# | Modified files:
# | * dlls/dxgi/output.c, dlls/dxgi/tests/device.c
# | * dlls/dxgi/output.c, dlls/dxgi/tests/dxgi.c
# |
if test "$enable_dxgi_GammaRamp" -eq 1; then
patch_apply dxgi-GammaRamp/0001-dxgi-Implement-setting-and-querying-the-gamma-value-.patch
@ -4326,7 +4307,6 @@ if test "$enable_kernel32_SetFileCompletionNotificationModes" -eq 1; then
patch_apply kernel32-SetFileCompletionNotificationModes/0002-ntdll-Allow-to-query-file-IO-completion-notification.patch
patch_apply kernel32-SetFileCompletionNotificationModes/0003-ws2_32-tests-Add-test-for-completion-notification-fl.patch
patch_apply kernel32-SetFileCompletionNotificationModes/0004-ntdll-tests-Add-more-tests-for-FileIoCompletionNotif.patch
patch_apply kernel32-SetFileCompletionNotificationModes/0005-ntdll-Do-not-require-unix-fd-for-FileIoCompletionNot.patch
patch_apply kernel32-SetFileCompletionNotificationModes/0006-server-Skip-async-completion-when-possible.patch
patch_apply kernel32-SetFileCompletionNotificationModes/0007-ws2_32-Don-t-skip-completion-in-AcceptEx.patch
(
@ -4334,7 +4314,6 @@ if test "$enable_kernel32_SetFileCompletionNotificationModes" -eq 1; then
printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Allow to query file IO completion notification mode.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Add test for completion notification flags.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "ntdll/tests: Add more tests for FileIoCompletionNotificationInformation.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Do not require unix fd for FileIoCompletionNotificationInformation.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "server: Skip async completion when possible.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "ws2_32: Don'\''t skip completion in AcceptEx.", 1 },';
) >> "$patchlist"

26
patches/shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch
View File

@ -1,13 +1,13 @@
From 60ba2a81dd862811f14539f862dafdf522e270fb Mon Sep 17 00:00:00 2001
From 6db5e60ef680422a15d63bbda12e279c485fbcca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 24 May 2015 00:39:14 +0200
Subject: shell32: Add placeholder icons to match icon offset with XP.
Subject: [PATCH] shell32: Add placeholder icons to match icon offset with XP.
---
dlls/shell32/resources/placeholder.ico | Bin 0 -> 1726 bytes
dlls/shell32/shell32.rc | 166 +++++++++++++++++++++++++++++++
dlls/shell32/shresdef.h | 175 +++++++++++++++++++++++++++++++++
3 files changed, 341 insertions(+)
dlls/shell32/shell32.rc | 166 ++++++++++++++++++++++++
dlls/shell32/shresdef.h | 173 +++++++++++++++++++++++++
3 files changed, 339 insertions(+)
create mode 100644 dlls/shell32/resources/placeholder.ico
diff --git a/dlls/shell32/resources/placeholder.ico b/dlls/shell32/resources/placeholder.ico
@ -34,10 +34,10 @@ literal 0
HcmV?d00001
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 1eb5b16..dce8438 100644
index 6c35fb7c238..6cb9afdf340 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -517,6 +517,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico
@@ -564,6 +564,172 @@ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico
/* @makedep: resources/mydocs.ico */
IDI_SHELL_FAVORITES ICON resources/mydocs.ico
@ -211,15 +211,13 @@ index 1eb5b16..dce8438 100644
IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index d352d7c..e566200 100644
index 2fcb5b6cc2e..7c42b5850e0 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -193,23 +193,198 @@
#define IDI_SHELL_SETTINGS 22
#define IDI_SHELL_SEARCH 23
@@ -230,23 +230,196 @@
#define IDI_SHELL_HELP 24
+#define IDI_SHELL_PLACEHOLDER25 25
+#define IDI_SHELL_PLACEHOLDER26 26
#define IDI_SHELL_RUN 25
#define IDI_SHELL_SLEEP 26
+#define IDI_SHELL_PLACEHOLDER27 27
+#define IDI_SHELL_PLACEHOLDER28 28
#define IDI_SHELL_FOLDER_OPEN_LARGE 29
@ -414,5 +412,5 @@ index d352d7c..e566200 100644
/*
--
2.7.4
2.18.0

24
patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch
View File

@ -1,7 +1,7 @@
From 276fddccbf8cd4dba81da097d777f0afbef193bd Mon Sep 17 00:00:00 2001
From 9e65ab913d2995b3add1fad7ea3124b114fdd5af Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 2 Mar 2016 16:36:33 +0800
Subject: shell32: Add toolbar bitmaps compatible with IE6.
Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6.
These are extended to 16 icons (IE6 expects that the toolbar contains 16 icons)
and scaled down copies of dlls/ieframe/ietoolbar.svg:
@ -10,9 +10,9 @@ ietoolbar_small.svg - 256x16
---
dlls/shell32/Makefile.in | 2 +
dlls/shell32/resources/ietoolbar.bmp | Bin 0 -> 37002 bytes
dlls/shell32/resources/ietoolbar.svg | 1782 ++++++++++++++++++++++++++++
dlls/shell32/resources/ietoolbar.svg | 1782 ++++++++++++++++++++
dlls/shell32/resources/ietoolbar_small.bmp | Bin 0 -> 16522 bytes
dlls/shell32/resources/ietoolbar_small.svg | 1782 ++++++++++++++++++++++++++++
dlls/shell32/resources/ietoolbar_small.svg | 1782 ++++++++++++++++++++
dlls/shell32/shell32.rc | 8 +
6 files changed, 3574 insertions(+)
create mode 100644 dlls/shell32/resources/ietoolbar.bmp
@ -21,13 +21,13 @@ ietoolbar_small.svg - 256x16
create mode 100644 dlls/shell32/resources/ietoolbar_small.svg
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 731b6f4..f36b581 100644
index d7d1cc0b026..fb63f036b97 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -71,6 +71,8 @@ SVG_SRCS = \
resources/floppy.svg \
@@ -73,6 +73,8 @@ SVG_SRCS = \
resources/folder.svg \
resources/folder_open.svg \
resources/help.svg \
+ resources/ietoolbar.svg \
+ resources/ietoolbar_small.svg \
resources/internet.svg \
@ -182,7 +182,7 @@ HcmV?d00001
diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg
new file mode 100644
index 0000000..a49bd2e
index 00000000000..a49bd2e9096
--- /dev/null
+++ b/dlls/shell32/resources/ietoolbar.svg
@@ -0,0 +1,1782 @@
@ -2054,7 +2054,7 @@ HcmV?d00001
diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg
new file mode 100644
index 0000000..2aa52cd
index 00000000000..2aa52cdb3a0
--- /dev/null
+++ b/dlls/shell32/resources/ietoolbar_small.svg
@@ -0,0 +1,1782 @@
@ -3841,10 +3841,10 @@ index 0000000..2aa52cd
+ </g>
+</svg>
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 1eb5b16..be42e5b 100644
index 6cb9afdf340..cff05c6be0d 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -529,6 +529,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
@@ -742,6 +742,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp
/* @makedep: resources/idb_tb_small.bmp */
IDB_TB_SMALL_DARK BITMAP resources/idb_tb_small.bmp
@ -3860,5 +3860,5 @@ index 1eb5b16..be42e5b 100644
IDR_AVI_SEARCHING AVI resources/searching.avi
--
2.7.4
2.18.0

14
patches/shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch
View File

@ -1,13 +1,13 @@
From 336a9359d181bd50cf0762b476c4ae806d5a779d Mon Sep 17 00:00:00 2001
From 51a90a64edceb850ae778878f0c8dcfa5d3e46c0 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Thu, 3 Mar 2016 14:07:44 +0800
Subject: shell32: Add more Tango icons to the IE toolbar.
Subject: [PATCH] shell32: Add more Tango icons to the IE toolbar.
---
dlls/shell32/resources/ietoolbar.bmp | Bin 37002 -> 37002 bytes
dlls/shell32/resources/ietoolbar.svg | 3324 ++++++++++++++++++++++++---
dlls/shell32/resources/ietoolbar.svg | 3324 +++++++++++++++++--
dlls/shell32/resources/ietoolbar_small.bmp | Bin 16522 -> 16522 bytes
dlls/shell32/resources/ietoolbar_small.svg | 3326 +++++++++++++++++++++++++---
dlls/shell32/resources/ietoolbar_small.svg | 3326 ++++++++++++++++++--
4 files changed, 6035 insertions(+), 615 deletions(-)
diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp
@ -362,7 +362,7 @@ zuUS~Wy!8>TO97%46O7UX`O`Y9%GqnFVy-U6XLewQn$NGo|4PZ%mM9=2cyZ{+oKZ^H
Mh@;K=FXyTM0xWa?p#T5?
diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg
index a49bd2e..eaf0e80 100644
index a49bd2e9096..eaf0e8013f5 100644
--- a/dlls/shell32/resources/ietoolbar.svg
+++ b/dlls/shell32/resources/ietoolbar.svg
@@ -31,9 +31,9 @@
@ -4056,7 +4056,7 @@ z+54EZqRduH;{KjYsD<1NTmv9_=r0Km5qyGfVoe=8HtF3u;a>(3unH!VIUcz^`(yC*
P^dx_SAxuIE&=UAR#Z?Dq
diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg
index 2aa52cd..759eb58 100644
index 2aa52cdb3a0..759eb580343 100644
--- a/dlls/shell32/resources/ietoolbar_small.svg
+++ b/dlls/shell32/resources/ietoolbar_small.svg
@@ -31,9 +31,9 @@
@ -7503,5 +7503,5 @@ index 2aa52cd..759eb58 100644
</g>
</svg>
--
2.7.4
2.18.0

34
patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch
View File

@ -1,20 +1,20 @@
From 80ad1268188358c71be2e7320e3169a7df6995d9 Mon Sep 17 00:00:00 2001
From 1c3699443060f0ac1e780fddc38483831235026a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 Apr 2016 18:18:54 +0200
Subject: wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
Subject: [PATCH] wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
QUERY_TYPE_SO_OVERFLOW.
---
dlls/d3d10core/tests/device.c | 4 +-
dlls/d3d11/tests/d3d11.c | 4 +-
dlls/wined3d/query.c | 100 ++++++++++++++++++++++++++++++++++++++++++
dlls/d3d10core/tests/d3d10core.c | 4 +-
dlls/d3d11/tests/d3d11.c | 4 +-
dlls/wined3d/query.c | 100 +++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 311ffeb82ba..9958feb1c25 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -3826,8 +3826,8 @@ static void test_create_query(void)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index 2100a6611e5..1d84cc8e269 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -4322,8 +4322,8 @@ static void test_create_query(void)
{D3D10_QUERY_TIMESTAMP_DISJOINT, FALSE, FALSE},
{D3D10_QUERY_PIPELINE_STATISTICS, FALSE, FALSE},
{D3D10_QUERY_OCCLUSION_PREDICATE, TRUE, FALSE},
@ -26,10 +26,10 @@ index 311ffeb82ba..9958feb1c25 100644
ULONG refcount, expected_refcount;
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index a3f2c9879b4..28859f897bd 100644
index c499c8401e4..c688ad4f7e5 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -4600,8 +4600,8 @@ static void test_create_query(void)
@@ -5249,8 +5249,8 @@ static void test_create_query(void)
{D3D11_QUERY_TIMESTAMP_DISJOINT, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE},
{D3D11_QUERY_PIPELINE_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE},
{D3D11_QUERY_OCCLUSION_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE},
@ -41,10 +41,10 @@ index a3f2c9879b4..28859f897bd 100644
{D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE},
{D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, FALSE},
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 8445922423f..30b1d8d7a70 100644
index 01e6bcb9905..1eb35306b9a 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -860,6 +860,34 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD
@@ -920,6 +920,34 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD
return poll;
}
@ -79,7 +79,7 @@ index 8445922423f..30b1d8d7a70 100644
static void wined3d_event_query_ops_destroy(struct wined3d_query *query)
{
struct wined3d_event_query *event_query = wined3d_event_query_from_query(query);
@@ -1143,6 +1171,72 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device,
@@ -1204,6 +1232,72 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device,
return WINED3D_OK;
}
@ -152,7 +152,7 @@ index 8445922423f..30b1d8d7a70 100644
HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type,
void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query)
{
@@ -1173,6 +1267,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q
@@ -1234,6 +1328,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q
case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS:
return wined3d_pipeline_query_create(device, type, parent, parent_ops, query);
@ -166,5 +166,5 @@ index 8445922423f..30b1d8d7a70 100644
FIXME("Unhandled query type %#x.\n", type);
return WINED3DERR_NOTAVAILABLE;
--
2.13.0
2.18.0