[ros-diffs] [akhaldi] 62830: [DXDIAGN] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Sun Apr 20 00:20:21 2014
New Revision: 62830

URL: http://svn.reactos.org/svn/reactos?rev=62830&view=rev
Log:
[DXDIAGN]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl
    trunk/reactos/dll/directx/wine/dxdiagn/provider.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxdiagn/dxdiagn.idl	[iso-8859-1] Sun Apr 20 00:20:21
2014
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#pragma makedep register
+
 [
     helpstring("DxDiagProvider Class"),
     threading(apartment),

Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxdiagn/provider.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c	[iso-8859-1] Sun Apr 20 00:20:21
2014
@@ -52,6 +52,9 @@
 static const WCHAR szRevisionId[] =
{'s','z','R','e','v','i','s','i','o','n','I','d',0};
 static const WCHAR dwRefreshRate[] =
{'d','w','R','e','f','r','e','s','h','R','a','t','e',0};
 static const WCHAR szManufacturer[] =
{'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0};
+static const WCHAR szChipType[] =
{'s','z','C','h','i','p','T','y','p','e',0};
+static const WCHAR szDACType[] =
{'s','z','D','A','C','T','y','p','e',0};
+static const WCHAR szRevision[] =
{'s','z','R','e','v','i','s','i','o','n',0};
 
 struct IDxDiagProviderImpl
 {
@@ -898,10 +901,15 @@
         static const WCHAR id_fmtW[] =
{'0','x','%','0','4','x',0};
         static const WCHAR subsysid_fmtW[] =
{'0','x','%','0','8','x',0};
         static const WCHAR mem_fmt[] =
{'%','.','1','f',' ','M','B',0};
+        static const WCHAR b3DAccelerationExists[] =
{'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0};
+        static const WCHAR b3DAccelerationEnabled[] =
{'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
+        static const WCHAR bDDAccelerationEnabled[] =
{'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
 
         D3DADAPTER_IDENTIFIER9 adapter_info;
         D3DDISPLAYMODE adapter_mode;
+        D3DCAPS9 device_caps;
         DWORD available_mem = 0;
+        BOOL hardware_accel;
 
         snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index);
         display_adapter = allocate_information_node(buffer);
@@ -1002,6 +1010,18 @@
         if (FAILED(hr))
             goto cleanup;
 
+        hr = add_bstr_property(display_adapter, szChipType, szEmpty);
+        if (FAILED(hr))
+            goto cleanup;
+
+        hr = add_bstr_property(display_adapter, szDACType, szEmpty);
+        if (FAILED(hr))
+            goto cleanup;
+
+        hr = add_bstr_property(display_adapter, szRevision, szEmpty);
+        if (FAILED(hr))
+            goto cleanup;
+
         if (!get_texture_memory(&adapter_info.DeviceIdentifier, &available_mem))
             WARN("get_texture_memory helper failed\n");
 
@@ -1012,6 +1032,21 @@
             goto cleanup;
 
         hr = add_bstr_property(display_adapter, szDisplayMemoryEnglish, buffer);
+        if (FAILED(hr))
+            goto cleanup;
+
+        hr = IDirect3D9_GetDeviceCaps(pDirect3D9, index, D3DDEVTYPE_HAL,
&device_caps);
+        hardware_accel = SUCCEEDED(hr);
+
+        hr = add_bool_property(display_adapter, b3DAccelerationEnabled, hardware_accel);
+        if (FAILED(hr))
+            goto cleanup;
+
+        hr = add_bool_property(display_adapter, b3DAccelerationExists, hardware_accel);
+        if (FAILED(hr))
+            goto cleanup;
+
+        hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel);
         if (FAILED(hr))
             goto cleanup;
     }
@@ -1028,7 +1063,7 @@
     static const WCHAR *empty_properties[] = {szDeviceIdentifier, szVendorId,
szDeviceId,
                                               szKeyDeviceKey, szKeyDeviceID,
szDriverName,
                                               szDriverVersion, szSubSysId, szRevisionId,
-                                              szManufacturer};
+                                              szManufacturer, szChipType, szDACType,
szRevision};
 
     IDxDiagContainerImpl_Container *display_adapter;
     HRESULT hr;
@@ -1603,16 +1638,17 @@
             }
 
             hr = fill_filter_container(subcont, pMoniker);
+            IMoniker_Release(pMoniker);
             if (FAILED(hr))
             {
+                WARN("Skipping invalid filter\n");
                 free_information_tree(subcont);
-                IMoniker_Release(pMoniker);
-                break;
+                hr = S_OK;
+                continue;
             }
 
             add_subcontainer(node, subcont);
             i++;
-            IMoniker_Release(pMoniker);
         }
 
         IEnumMoniker_Release(pEnum);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sun Apr 20 00:20:21 2014
@@ -41,7 +41,7 @@
 reactos/dll/directx/wine/dplay          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dplayx         # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.5.26
-reactos/dll/directx/wine/dxdiagn        # Synced to Wine-1.7.1
+reactos/dll/directx/wine/dxdiagn        # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dxgi           # Synced to Wine-1.7.17
 reactos/dll/directx/wine/msdmo          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/qedit          # Synced to Wine-1.7.17