Author: akhaldi
Date: Sat Sep 16 20:43:50 2017
New Revision: 75848
URL:
http://svn.reactos.org/svn/reactos?rev=75848&view=rev
Log:
[D3D8] Sync with Wine Staging 2.16. CORE-13762
Modified:
trunk/reactos/dll/directx/wine/d3d8/directx.c
Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d8/directx.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d8/directx.c [iso-8859-1] Sat Sep 16 20:43:50 2017
@@ -228,6 +228,12 @@
TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x,
resource_type %#x, format %#x.\n",
iface, adapter, device_type, adapter_format, usage, resource_type, format);
+ if (!adapter_format)
+ {
+ WARN("Invalid adapter format.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
usage = usage & (WINED3DUSAGE_MASK | WINED3DUSAGE_QUERY_MASK);
switch (resource_type)
{
@@ -399,7 +405,7 @@
DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING
| WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER
| WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART
- | WINED3D_LEGACY_CUBEMAP_FILTERING;
+ | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_LIMIT_VIEWPORT;
d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl;
d3d8->refcount = 1;