diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 5eafefd75d1..e3e318f2ad8 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -162,51 +162,6 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R provider->lpVtbl = &DxDiagProvider_Vtbl; provider->ref = 0; /* will be inited with QueryInterface */ return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); -} - -static inline HRESULT add_prop_str( IDxDiagContainer* cont, LPCWSTR prop, LPCWSTR str ) -{ - HRESULT hr; - VARIANT var; - - V_VT( &var ) = VT_BSTR; - V_BSTR( &var ) = SysAllocString( str ); - hr = IDxDiagContainerImpl_AddProp( cont, prop, &var ); - VariantClear( &var ); - - return hr; -} - -static inline HRESULT add_prop_ui4( IDxDiagContainer* cont, LPCWSTR prop, DWORD data ) -{ - VARIANT var; - - V_VT( &var ) = VT_UI4; - V_UI4( &var ) = data; - return IDxDiagContainerImpl_AddProp( cont, prop, &var ); -} - -static inline HRESULT add_prop_bool( IDxDiagContainer* cont, LPCWSTR prop, BOOL data ) -{ - VARIANT var; - - V_VT( &var ) = VT_BOOL; - V_BOOL( &var ) = data; - return IDxDiagContainerImpl_AddProp( cont, prop, &var ); -} - -static inline HRESULT add_prop_ull_as_str( IDxDiagContainer* cont, LPCWSTR prop, ULONGLONG data ) -{ - HRESULT hr; - VARIANT var; - - V_VT( &var ) = VT_UI8; - V_UI8( &var ) = data; - VariantChangeType( &var, &var, 0, VT_BSTR ); - hr = IDxDiagContainerImpl_AddProp( cont, prop, &var ); - VariantClear( &var ); - - return hr; } static void get_display_device_id(WCHAR *szIdentifierBuffer) @@ -240,537 +195,6 @@ static void get_display_device_id(WCHAR *szIdentifierBuffer) FreeLibrary(d3d9_handle); } -/** - * @param szFilePath: usually GetSystemDirectoryW - * @param szFileName: name of the dll without path - */ -static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCHAR* szFilePath, const WCHAR* szFileName) { - HRESULT hr = S_OK; - /**/ - static const WCHAR szSlashSep[] = {'\\',0}; - static const WCHAR szPath[] = {'s','z','P','a','t','h',0}; - static const WCHAR szName[] = {'s','z','N','a','m','e',0}; - static const WCHAR szVersion[] = {'s','z','V','e','r','s','i','o','n',0}; - static const WCHAR szAttributes[] = {'s','z','A','t','t','r','i','b','u','t','e','s',0}; - static const WCHAR szLanguageEnglish[] = {'s','z','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; - static const WCHAR dwFileTimeHigh[] = {'d','w','F','i','l','e','T','i','m','e','H','i','g','h',0}; - static const WCHAR dwFileTimeLow[] = {'d','w','F','i','l','e','T','i','m','e','L','o','w',0}; - static const WCHAR bBeta[] = {'b','B','e','t','a',0}; - static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; - static const WCHAR bExists[] = {'b','E','x','i','s','t','s',0}; - /** values */ - static const WCHAR szFinal_Retail_v[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; - static const WCHAR szEnglish_v[] = {'E','n','g','l','i','s','h',0}; - static const WCHAR szVersionFormat[] = {'%','u','.','%','0','2','u','.','%','0','4','u','.','%','0','4','u',0}; - - WCHAR szFile[512]; - WCHAR szVersion_v[1024]; - DWORD retval, hdl; - LPVOID pVersionInfo; - BOOL boolret; - UINT uiLength; - VS_FIXEDFILEINFO* pFileInfo; - - TRACE("(%p,%s)\n", pSubCont, debugstr_w(szFileName)); - - lstrcpyW(szFile, szFilePath); - lstrcatW(szFile, szSlashSep); - lstrcatW(szFile, szFileName); - - retval = GetFileVersionInfoSizeW(szFile, &hdl); - pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); - boolret = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); - boolret = VerQueryValueW(pVersionInfo, szSlashSep, (LPVOID) &pFileInfo, &uiLength); - - add_prop_str(pSubCont, szPath, szFile); - add_prop_str(pSubCont, szName, szFileName); - add_prop_bool(pSubCont, bExists, boolret); - - if (boolret) { - snprintfW(szVersion_v, sizeof(szVersion_v)/sizeof(szVersion_v[0]), - szVersionFormat, - HIWORD(pFileInfo->dwFileVersionMS), - LOWORD(pFileInfo->dwFileVersionMS), - HIWORD(pFileInfo->dwFileVersionLS), - LOWORD(pFileInfo->dwFileVersionLS)); - - TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); - - add_prop_str(pSubCont, szVersion, szVersion_v); - add_prop_str(pSubCont, szAttributes, szFinal_Retail_v); - add_prop_str(pSubCont, szLanguageEnglish, szEnglish_v); - add_prop_ui4(pSubCont, dwFileTimeHigh, pFileInfo->dwFileDateMS); - add_prop_ui4(pSubCont, dwFileTimeLow, pFileInfo->dwFileDateLS); - add_prop_bool(pSubCont, bBeta, 0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE)); - add_prop_bool(pSubCont, bDebug, 0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG)); - } - - HeapFree(GetProcessHeap(), 0, pVersionInfo); - - return hr; -} - -static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; - static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i','n','o','r',0}; - static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e','t','t','e','r',0}; - static const WCHAR szDirectXVersionLetter_v[] = {'c',0}; - static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; - static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0}; - static const WCHAR szDirectXVersionEnglish_v[] = {'4','.','0','9','.','0','0','0','0','.','0','9','0','4',0}; - static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; - static const WCHAR szDirectXVersionLongEnglish_v[] = {'=',' ','"','D','i','r','e','c','t','X',' ','9','.','0','c',' ','(','4','.','0','9','.','0','0','0','0','.','0','9','0','4',')',0}; - static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; - static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; - static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; - /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ - static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; - static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; - static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; - static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; - MEMORYSTATUSEX msex; - OSVERSIONINFOW info; - WCHAR buffer[MAX_PATH]; - - add_prop_ui4(pSubCont, dwDirectXVersionMajor, 9); - add_prop_ui4(pSubCont, dwDirectXVersionMinor, 0); - add_prop_str(pSubCont, szDirectXVersionLetter, szDirectXVersionLetter_v); - add_prop_str(pSubCont, szDirectXVersionEnglish, szDirectXVersionEnglish_v); - add_prop_str(pSubCont, szDirectXVersionLongEnglish, szDirectXVersionLongEnglish_v); - add_prop_bool(pSubCont, bDebug, FALSE); - - msex.dwLength = sizeof(msex); - GlobalMemoryStatusEx( &msex ); - add_prop_ull_as_str(pSubCont, ullPhysicalMemory, msex.ullTotalPhys); - add_prop_ull_as_str(pSubCont, ullUsedPageFile, msex.ullTotalPageFile - msex.ullAvailPageFile); - add_prop_ull_as_str(pSubCont, ullAvailPageFile, msex.ullAvailPageFile); - - info.dwOSVersionInfoSize = sizeof(info); - GetVersionExW( &info ); - add_prop_ui4(pSubCont, dwOSMajorVersion, info.dwMajorVersion); - add_prop_ui4(pSubCont, dwOSMinorVersion, info.dwMinorVersion); - add_prop_ui4(pSubCont, dwOSBuildNumber, info.dwBuildNumber); - add_prop_ui4(pSubCont, dwOSPlatformID, info.dwPlatformId); - add_prop_str(pSubCont, szCSDVersion, info.szCSDVersion); - - GetWindowsDirectoryW(buffer, MAX_PATH); - add_prop_str(pSubCont, szWindowsDir, buffer); - - return S_OK; -} - -static HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - /* - static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR szDeviceID[] = {'s','z','D','e','v','i','c','e','I','D',0}; - - static const WCHAR szDrivers[] = {'s','z','D','r','i','v','e','r','s',0}; - - VARIANT v; - IDxDiagContainer* pDeviceSubCont = NULL; - IDxDiagContainer* pDriversCont = NULL; - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDeviceSubCont); - if (FAILED(hr)) { return hr; } - V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); - hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDescription, &v); - VariantClear(&v); - V_VT(pvarProp) = VT_BSTR; V_BSTR(pvarProp) = SysAllocString(property->psz); - hr = IDxDiagContainerImpl_AddProp(pDeviceSubCont, szDeviceID, &v); - VariantClear(&v); - - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "", pDeviceSubCont); - */ - - /* - * Drivers Cont contains Files Desc Containers - */ - /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDriversCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); - - */ - return hr; -} - -static HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - /* - static const WCHAR szDriveLetter[] = {'s','z','D','r','i','v','e','L','e','t','t','e','r',0}; - static const WCHAR szFreeSpace[] = {'s','z','F','r','e','e','S','p','a','c','e',0}; - static const WCHAR szMaxSpace[] = {'s','z','M','a','x','S','p','a','c','e',0}; - static const WCHAR szFileSystem[] = {'s','z','F','i','l','e','S','y','s','t','e','m',0}; - static const WCHAR szModel[] = {'s','z','M','o','d','e','l',0}; - static const WCHAR szPNPDeviceID[] = {'s','z','P','N','P','D','e','v','i','c','e','I','D',0}; - static const WCHAR dwHardDriveIndex[] = {'d','w','H','a','r','d','D','r','i','v','e','I','n','d','e','x',0}; - - static const WCHAR szDrivers[] = {'s','z','D','r','i','v','e','r','s',0}; - - VARIANT v; - IDxDiagContainer* pDiskSubCont = NULL; - IDxDiagContainer* pDriversCont = NULL; - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDiskSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "" , pDiskSubCont); - */ - - /* - * Drivers Cont contains Files Desc Containers - */ - /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, &pDriversCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); - */ - return hr; -} - -static HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) -{ - HRESULT hr = S_OK; - static const WCHAR dlls[][15] = - { - {'d','3','d','8','.','d','l','l',0}, - {'d','3','d','9','.','d','l','l',0}, - {'d','d','r','a','w','.','d','l','l',0}, - {'d','e','v','e','n','u','m','.','d','l','l',0}, - {'d','i','n','p','u','t','8','.','d','l','l',0}, - {'d','i','n','p','u','t','.','d','l','l',0}, - {'d','m','b','a','n','d','.','d','l','l',0}, - {'d','m','c','o','m','p','o','s','.','d','l','l',0}, - {'d','m','i','m','e','.','d','l','l',0}, - {'d','m','l','o','a','d','e','r','.','d','l','l',0}, - {'d','m','s','c','r','i','p','t','.','d','l','l',0}, - {'d','m','s','t','y','l','e','.','d','l','l',0}, - {'d','m','s','y','n','t','h','.','d','l','l',0}, - {'d','m','u','s','i','c','.','d','l','l',0}, - {'d','p','l','a','y','x','.','d','l','l',0}, - {'d','p','n','e','t','.','d','l','l',0}, - {'d','s','o','u','n','d','.','d','l','l',0}, - {'d','s','w','a','v','e','.','d','l','l',0}, - {'d','x','d','i','a','g','n','.','d','l','l',0}, - {'q','u','a','r','t','z','.','d','l','l',0} - }; - WCHAR szFilePath[MAX_PATH]; - INT i; - - GetSystemDirectoryW(szFilePath, MAX_PATH); - - for (i = 0; i < sizeof(dlls) / sizeof(dlls[0]); i++) - { - static const WCHAR szFormat[] = {'%','d',0}; - WCHAR szFileID[5]; - IDxDiagContainer *pDXFileSubCont; - - snprintfW(szFileID, sizeof(szFileID)/sizeof(szFileID[0]), szFormat, i); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pProv, (void**) &pDXFileSubCont); - if (FAILED(hr)) continue; - - if (FAILED(DXDiag_AddFileDescContainer(pDXFileSubCont, szFilePath, dlls[i])) || - FAILED(IDxDiagContainerImpl_AddChildContainer(pSubCont, szFileID, pDXFileSubCont))) - { - IUnknown_Release(pDXFileSubCont); - continue; - } - } - return hr; -} - -static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) -{ - static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR szDeviceName[] = {'s','z','D','e','v','i','c','e','N','a','m','e',0}; - static const WCHAR szKeyDeviceID[] = {'s','z','K','e','y','D','e','v','i','c','e','I','D',0}; - static const WCHAR szKeyDeviceKey[] = {'s','z','K','e','y','D','e','v','i','c','e','K','e','y',0}; - static const WCHAR szVendorId[] = {'s','z','V','e','n','d','o','r','I','d',0}; - static const WCHAR szDeviceId[] = {'s','z','D','e','v','i','c','e','I','d',0}; - static const WCHAR szDeviceIdentifier[] = {'s','z','D','e','v','i','c','e','I','d','e','n','t','i','f','i','e','r',0}; - static const WCHAR dwWidth[] = {'d','w','W','i','d','t','h',0}; - static const WCHAR dwHeight[] = {'d','w','H','e','i','g','h','t',0}; - static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; - static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; - static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; - - static const WCHAR szAdapterID[] = {'0',0}; - static const WCHAR szEmpty[] = {0}; - - HRESULT hr; - IDxDiagContainer *pDisplayAdapterSubCont = NULL; - - IDirectDraw7 *pDirectDraw; - DDSCAPS2 dd_caps; - DISPLAY_DEVICEW disp_dev; - DDSURFACEDESC2 surface_descr; - DWORD tmp; - WCHAR buffer[256]; - - hr = DXDiag_CreateDXDiagContainer( &IID_IDxDiagContainer, pProv, (void**) &pDisplayAdapterSubCont ); - if (FAILED( hr )) return hr; - hr = IDxDiagContainerImpl_AddChildContainer( pSubCont, szAdapterID, pDisplayAdapterSubCont ); - if (FAILED( hr )) return hr; - - disp_dev.cb = sizeof(disp_dev); - if (EnumDisplayDevicesW( NULL, 0, &disp_dev, 0 )) - { - add_prop_str( pDisplayAdapterSubCont, szDeviceName, disp_dev.DeviceName ); - add_prop_str( pDisplayAdapterSubCont, szDescription, disp_dev.DeviceString ); - } - - hr = DirectDrawCreateEx( NULL, (LPVOID *)&pDirectDraw, &IID_IDirectDraw7, NULL); - if (FAILED( hr )) return hr; - - dd_caps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - dd_caps.dwCaps2 = dd_caps.dwCaps3 = dd_caps.dwCaps4 = 0; - hr = IDirectDraw7_GetAvailableVidMem( pDirectDraw, &dd_caps, &tmp, NULL ); - if (SUCCEEDED(hr)) - { - static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; - - snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), mem_fmt, ((float)tmp) / 1000000.0 ); - add_prop_str( pDisplayAdapterSubCont, szDisplayMemoryLocalized, buffer ); - add_prop_str( pDisplayAdapterSubCont, szDisplayMemoryEnglish, buffer ); - } - - surface_descr.dwSize = sizeof(surface_descr); - hr = IDirectDraw7_GetDisplayMode( pDirectDraw, &surface_descr ); - if (SUCCEEDED(hr)) - { - if (surface_descr.dwFlags & DDSD_WIDTH) - add_prop_ui4( pDisplayAdapterSubCont, dwWidth, surface_descr.dwWidth ); - if (surface_descr.dwFlags & DDSD_HEIGHT) - add_prop_ui4( pDisplayAdapterSubCont, dwHeight, surface_descr.dwHeight ); - if (surface_descr.dwFlags & DDSD_PIXELFORMAT) - add_prop_ui4( pDisplayAdapterSubCont, dwBpp, surface_descr.u4.ddpfPixelFormat.u1.dwRGBBitCount ); - } - - get_display_device_id( buffer ); - add_prop_str( pDisplayAdapterSubCont, szDeviceIdentifier, buffer ); - - add_prop_str( pDisplayAdapterSubCont, szVendorId, szEmpty ); - add_prop_str( pDisplayAdapterSubCont, szDeviceId, szEmpty ); - add_prop_str( pDisplayAdapterSubCont, szKeyDeviceKey, szEmpty ); - add_prop_str( pDisplayAdapterSubCont, szKeyDeviceID, szEmpty ); - - IUnknown_Release( pDirectDraw ); - return hr; -} - -static HRESULT DXDiag_InitDXDiagDirectSoundContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; - static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; - IDxDiagContainer* pSubSubCont = NULL; - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pProv, (void**) &pSubSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, DxDiag_SoundDevices, pSubSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pProv, (void**) &pSubSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, DxDiag_SoundCaptureDevices, pSubSubCont); - - return hr; -} - -static HRESULT DXDiag_InitDXDiagDirectMusicContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - return hr; -} - -static HRESULT DXDiag_InitDXDiagDirectInputContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - return hr; -} - -static HRESULT DXDiag_InitDXDiagDirectPlayContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - return hr; -} - -static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont, IDxDiagProvider *pProv) { - HRESULT hr = S_OK; - static const WCHAR szName[] = {'s','z','N','a','m','e',0}; - static const WCHAR szVersionW[] = {'s','z','V','e','r','s','i','o','n',0}; - static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; - static const WCHAR ClsidCatW[] = {'C','l','s','i','d','C','a','t',0}; - static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; - static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; - static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; - static const WCHAR dwMeritW[] = {'d','w','M','e','r','i','t',0}; - /* - static const WCHAR szFileName[] = {'s','z','F','i','l','e','N','a','m','e',0}; - static const WCHAR szFileVersion[] = {'s','z','F','i','l','e','V','e','r','s','i','o','n',0}; - */ - VARIANT v; - - static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; - - static const WCHAR szVersionFormat[] = {'v','%','d',0}; - static const WCHAR szIdFormat[] = {'%','d',0}; - int i = 0; - - - ICreateDevEnum* pCreateDevEnum = NULL; - IEnumMoniker* pEmCat = NULL; - IMoniker* pMCat = NULL; - /** */ - hr = CoCreateInstance(&CLSID_SystemDeviceEnum, - NULL, - CLSCTX_INPROC_SERVER, - &IID_ICreateDevEnum, - (void**) &pCreateDevEnum); - if (FAILED(hr)) return hr; - - hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEmCat, 0); - if (FAILED(hr)) goto out_show_filters; - - VariantInit(&v); - - while (S_OK == IEnumMoniker_Next(pEmCat, 1, &pMCat, NULL)) { - IPropertyBag* pPropBag = NULL; - CLSID clsidCat; - hr = IMoniker_BindToStorage(pMCat, NULL, NULL, &IID_IPropertyBag, (void**) &pPropBag); - if (SUCCEEDED(hr)) { - WCHAR* wszCatName = NULL; - WCHAR* wszCatClsid = NULL; - - hr = IPropertyBag_Read(pPropBag, wszFriendlyName, &v, 0); - wszCatName = SysAllocString(V_BSTR(&v)); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropBag, wszClsidName, &v, 0); - wszCatClsid = SysAllocString(V_BSTR(&v)); - hr = CLSIDFromString(V_UNION(&v, bstrVal), &clsidCat); - VariantClear(&v); - - /* - hr = IPropertyBag_Read(pPropBag, wszMeritName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwMerit, &v); - VariantClear(&v); - */ - - if (SUCCEEDED(hr)) { - IEnumMoniker* pEnum = NULL; - IMoniker* pMoniker = NULL; - hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0); - TRACE("\tClassEnumerator for clsid(%s) pEnum(%p)\n", debugstr_guid(&clsidCat), pEnum); - if (FAILED(hr) || pEnum == NULL) { - goto class_enum_failed; - } - while (NULL != pEnum && S_OK == IEnumMoniker_Next(pEnum, 1, &pMoniker, NULL)) { - IPropertyBag* pPropFilterBag = NULL; - TRACE("\tIEnumMoniker_Next(%p, 1, %p)\n", pEnum, pMoniker); - hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void**) &pPropFilterBag); - if (SUCCEEDED(hr)) { - LPBYTE pData = NULL; - DWORD dwNOutputs = 0; - DWORD dwNInputs = 0; - DWORD dwMerit = 0; - WCHAR bufferW[10]; - IDxDiagContainer *pDShowSubCont = NULL; - IFilterMapper2 *pFileMapper = NULL; - IAMFilterData *pFilterData = NULL; - - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); - if (FAILED(DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pProv, (void**) &pDShowSubCont)) || - FAILED(IDxDiagContainerImpl_AddChildContainer(pSubCont, bufferW, pDShowSubCont))) - { - IPropertyBag_Release(pPropFilterBag); - if (pDShowSubCont) IUnknown_Release(pDShowSubCont); - continue; - } - - bufferW[0] = 0; - hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, szName, &v); - TRACE("\tName:%s\n", debugstr_w(V_BSTR(&v))); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); - TRACE("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, ClsidFilterW, &v); - VariantClear(&v); - - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, - (LPVOID*)&pFileMapper); - if (SUCCEEDED(hr) && - SUCCEEDED(IFilterMapper2_QueryInterface(pFileMapper, &IID_IAMFilterData, (void **)&pFilterData))) - { - DWORD array_size; - REGFILTER2 *pRF; - - if (SUCCEEDED(IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL)) && - SUCCEEDED(SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData))) - { - ULONG j; - array_size = V_UNION(&v, parray)->rgsabound->cElements; - - if (SUCCEEDED(IAMFilterData_ParseFilterData(pFilterData, pData, array_size, (BYTE **)&pRF))) - { - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); - if (pRF->dwVersion == 1) - { - for (j = 0; j < pRF->u.s.cPins; j++) - if (pRF->u.s.rgPins[j].bOutput) - dwNOutputs++; - else - dwNInputs++; - } - else if (pRF->dwVersion == 2) - { - for (j = 0; j < pRF->u.s1.cPins2; j++) - if (pRF->u.s1.rgPins2[j].dwFlags & REG_PINFLAG_B_OUTPUT) - dwNOutputs++; - else - dwNInputs++; - } - - dwMerit = pRF->dwMerit; - CoTaskMemFree(pRF); - } - - SafeArrayUnaccessData(V_UNION(&v, parray)); - VariantClear(&v); - } - IFilterMapper2_Release(pFilterData); - } - if (pFileMapper) IFilterMapper2_Release(pFileMapper); - - add_prop_str(pDShowSubCont, szVersionW, bufferW); - add_prop_str(pDShowSubCont, szCatName, wszCatName); - add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); - add_prop_ui4(pDShowSubCont, dwInputs, dwNInputs); - add_prop_ui4(pDShowSubCont, dwOutputs, dwNOutputs); - add_prop_ui4(pDShowSubCont, dwMeritW, dwMerit); - - i++; - } - IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL; - } - IEnumMoniker_Release(pEnum); pEnum = NULL; - } -class_enum_failed: - SysFreeString(wszCatName); - SysFreeString(wszCatClsid); - IPropertyBag_Release(pPropBag); pPropBag = NULL; - } - IEnumMoniker_Release(pMCat); pMCat = NULL; - } - -out_show_filters: - if (NULL != pEmCat) { IEnumMoniker_Release(pEmCat); pEmCat = NULL; } - if (NULL != pCreateDevEnum) { ICreateDevEnum_Release(pCreateDevEnum); pCreateDevEnum = NULL; } - return hr; -} - static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont, IDxDiagProvider *pProv) { static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; @@ -783,22 +207,18 @@ static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont, IDxDi static const WCHAR DxDiag_DirectShowFilters[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','h','o','w','F','i','l','t','e','r','s',0}; static const WCHAR DxDiag_LogicalDisks[] = {'D','x','D','i','a','g','_','L','o','g','i','c','a','l','D','i','s','k','s',0}; - static const struct + const WCHAR *containers[] = { - const WCHAR *name; - HRESULT (*initfunc)(IDxDiagContainer*, IDxDiagProvider*); - } containers[] = - { - {DxDiag_SystemInfo, DXDiag_InitDXDiagSystemInfoContainer}, - {DxDiag_DisplayDevices, DXDiag_InitDXDiagDisplayContainer}, - {DxDiag_DirectSound, DXDiag_InitDXDiagDirectSoundContainer}, - {DxDiag_DirectMusic, DXDiag_InitDXDiagDirectMusicContainer}, - {DxDiag_DirectInput, DXDiag_InitDXDiagDirectInputContainer}, - {DxDiag_DirectPlay, DXDiag_InitDXDiagDirectPlayContainer}, - {DxDiag_SystemDevices, DXDiag_InitDXDiagSystemDevicesContainer}, - {DxDiag_DirectXFiles, DXDiag_InitDXDiagDirectXFilesContainer}, - {DxDiag_DirectShowFilters, DXDiag_InitDXDiagDirectShowFiltersContainer}, - {DxDiag_LogicalDisks, DXDiag_InitDXDiagLogicalDisksContainer}, + DxDiag_SystemInfo, + DxDiag_DisplayDevices, + DxDiag_DirectSound, + DxDiag_DirectMusic, + DxDiag_DirectInput, + DxDiag_DirectPlay, + DxDiag_SystemDevices, + DxDiag_DirectXFiles, + DxDiag_DirectShowFilters, + DxDiag_LogicalDisks, }; size_t index; @@ -814,15 +234,12 @@ static HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont, IDxDi if (FAILED(hr)) return hr; - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, containers[index].name, pSubCont); + hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, containers[index], pSubCont); if (FAILED(hr)) { IDxDiagContainer_Release(pSubCont); return hr; } - - /* The return value is ignored for now. */ - containers[index].initfunc(pSubCont, pProv); } return S_OK;