d3d10core: Implement ID3D10Device1.

dlls/d3d10core/d3d10core_private.h

@@ -29,7 +29,7 @@
 #include "winuser.h"
 #include "objbase.h"
 
-#include "d3d10.h"
+#include "d3d10_1.h"
 #ifdef D3D10CORE_INIT_GUID
 #include "initguid.h"
 #endif
@@ -285,11 +285,11 @@ struct d3d10_query
 
 HRESULT d3d10_query_init(struct d3d10_query *query, BOOL predicate) DECLSPEC_HIDDEN;
 
-/* IDirect3D10Device */
+/* IDirect3D10Device1 */
 struct d3d10_device
 {
     IUnknown IUnknown_inner;
-    ID3D10Device ID3D10Device_iface;
+    ID3D10Device1 ID3D10Device1_iface;
     IWineDXGIDeviceParent IWineDXGIDeviceParent_iface;
     IUnknown *outer_unk;
     LONG refcount;

dlls/d3d10core/texture.c

@@ -240,11 +240,10 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic
     {
         IWineDXGIDevice *wine_device;
 
-        hr = ID3D10Device_QueryInterface(&device->ID3D10Device_iface, &IID_IWineDXGIDevice,
-                (void **)&wine_device);
-        if (FAILED(hr))
+        if (FAILED(hr = ID3D10Device1_QueryInterface(&device->ID3D10Device1_iface, &IID_IWineDXGIDevice,
+                (void **)&wine_device)))
         {
-            ERR("Device should implement IWineDXGIDevice\n");
+            ERR("Device should implement IWineDXGIDevice.\n");
             return E_FAIL;
         }
 

dlls/dxgi/tests/device.c

@@ -77,7 +77,7 @@ static void test_device_interfaces(void)
 
     if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface)))
         IUnknown_Release(iface);
-    todo_wine ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,
+    ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */,
             "Failed to query ID3D10Device1 interface, hr %#x.\n", hr);
 
     if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D11Device, (void **)&iface)))