mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch with stub for d3d11.D3D11CreateDeviceAndSwapChain.
This commit is contained in:
Sebastian Lackner
parent
97fb6e215a
commit
8ecb8c648e
@ -39,8 +39,9 @@ Wine. All those differences are also documented on the
|
||||
Included bug fixes and improvements
|
||||
-----------------------------------
|
||||
|
||||
**Bug fixes and features included in the next upcoming release [4]:**
|
||||
**Bug fixes and features included in the next upcoming release [5]:**
|
||||
|
||||
* Add stub for d3d11.D3D11CreateDeviceAndSwapChain ([Wine Bug #33153](https://bugs.winehq.org/show_bug.cgi?id=33153))
|
||||
* Fix check for texture levels in wined3d_device_update_texture ([Wine Bug #38048](https://bugs.winehq.org/show_bug.cgi?id=38048))
|
||||
* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38480](https://bugs.winehq.org/show_bug.cgi?id=38480))
|
||||
* Ignore garbage after decoding gif lines ([Wine Bug #32227](https://bugs.winehq.org/show_bug.cgi?id=32227))
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -4,6 +4,7 @@ wine-staging (1.7.42) UNRELEASED; urgency=low
|
||||
* Added patch to fix check for texture levels in wined3d_device_update_texture.
|
||||
* Added patch to ignore garbage after decoding gif lines.
|
||||
* Added patch to fix various issues related to advapi32.LookupAccountSidA.
|
||||
* Added patch with stub for d3d11.D3D11CreateDeviceAndSwapChain.
|
||||
* Removed patch to avoid crash when trying to bind mshtml event scripts to window (fixed upstream).
|
||||
* Removed patch for stub of ntdll.WinSqmIsOptedIn (fixed upstream).
|
||||
* Removed patch to fix issues with invalid console handles for new processes (accepted upstream).
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
From 84ef0e10eed439613ce503470eb000f79628fe6c Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Tue, 23 Dec 2014 18:30:51 -0600
|
||||
Subject: d3d11: add a stub for D3D11CreateDeviceAndSwapChain
|
||||
|
||||
---
|
||||
dlls/d3d11/d3d11.spec | 2 +-
|
||||
dlls/d3d11/d3d11_main.c | 12 ++++++++++++
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec
|
||||
index 52d7bcb..2d6c877 100644
|
||||
--- a/dlls/d3d11/d3d11.spec
|
||||
+++ b/dlls/d3d11/d3d11.spec
|
||||
@@ -3,7 +3,7 @@
|
||||
@ stub D3D11CoreGetLayeredDeviceSize
|
||||
@ stub D3D11CoreRegisterLayers
|
||||
@ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr)
|
||||
-@ stub D3D11CreateDeviceAndSwapChain
|
||||
+@ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr)
|
||||
@ stub D3DKMTCloseAdapter
|
||||
@ stub D3DKMTCreateAllocation
|
||||
@ stub D3DKMTCreateContext
|
||||
diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c
|
||||
index ec8236f..bf8f42f 100644
|
||||
--- a/dlls/d3d11/d3d11_main.c
|
||||
+++ b/dlls/d3d11/d3d11_main.c
|
||||
@@ -54,3 +54,15 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t
|
||||
flags, feature_levels, levels, sdk_version, device, feature_level, context);
|
||||
return E_OUTOFMEMORY;
|
||||
}
|
||||
+
|
||||
+HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,
|
||||
+ HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels,
|
||||
+ UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain,
|
||||
+ ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **immediate_context)
|
||||
+{
|
||||
+ FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, "
|
||||
+ "swapchain_desc %p, swapchain %p, device %p, feature_level %p, immediate_context %p stub!\n",
|
||||
+ adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version,
|
||||
+ swapchain_desc, swapchain, device, feature_level, immediate_context);
|
||||
+ return E_INVALIDARG;
|
||||
+}
|
||||
--
|
||||
2.3.5
|
||||
|
||||
1
patches/d3d11-D3D11CreateDeviceAndSwapChain/definition
Normal file
1
patches/d3d11-D3D11CreateDeviceAndSwapChain/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [33153] Add stub for d3d11.D3D11CreateDeviceAndSwapChain
|
||||
@ -72,6 +72,7 @@ patch_enable_all ()
|
||||
enable_combase_String="$1"
|
||||
enable_comctl32_LoadIconMetric="$1"
|
||||
enable_configure_Absolute_RPATH="$1"
|
||||
enable_d3d11_D3D11CreateDeviceAndSwapChain="$1"
|
||||
enable_d3d8_Hotpatch="$1"
|
||||
enable_d3d9_Skip_Tests="$1"
|
||||
enable_d3d9_Surface_Refcount="$1"
|
||||
@ -291,6 +292,9 @@ patch_enable ()
|
||||
configure-Absolute_RPATH)
|
||||
enable_configure_Absolute_RPATH="$2"
|
||||
;;
|
||||
d3d11-D3D11CreateDeviceAndSwapChain)
|
||||
enable_d3d11_D3D11CreateDeviceAndSwapChain="$2"
|
||||
;;
|
||||
d3d8-Hotpatch)
|
||||
enable_d3d8_Hotpatch="$2"
|
||||
;;
|
||||
@ -1698,6 +1702,21 @@ if test "$enable_configure_Absolute_RPATH" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3d11-D3D11CreateDeviceAndSwapChain
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#33153] Add stub for d3d11.D3D11CreateDeviceAndSwapChain
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3d11/d3d11.spec, dlls/d3d11/d3d11_main.c
|
||||
# |
|
||||
if test "$enable_d3d11_D3D11CreateDeviceAndSwapChain" -eq 1; then
|
||||
patch_apply d3d11-D3D11CreateDeviceAndSwapChain/0001-d3d11-add-a-stub-for-D3D11CreateDeviceAndSwapChain.patch
|
||||
(
|
||||
echo '+ { "Austin English", "d3d11: add a stub for D3D11CreateDeviceAndSwapChain.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3d8-Hotpatch
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user