dxdiagn vendor import Added: trunk/reactos/lib/dxdiagn/ Deleted: trunk/reactos/lib/dxdiagn/Makefile.in Added: trunk/reactos/lib/dxdiagn/dxdiagn.xml Modified: trunk/reactos/lib/dxdiagn/provider.c Modified: trunk/reactos/media/doc/README.WINE _____
Copied: trunk/reactos/lib/dxdiagn (from rev 20181, vendor/wine/dlls/dxdiagn/current) Property changes on: trunk/reactos/lib/dxdiagn ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____
Deleted: trunk/reactos/lib/dxdiagn/Makefile.in --- vendor/wine/dlls/dxdiagn/current/Makefile.in 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/lib/dxdiagn/Makefile.in 2005-12-14 23:09:06 UTC (rev 20182) @@ -1,19 +0,0 @@
-TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = dxdiagn.dll -IMPORTS = version ole32 oleaut32 user32 advapi32 kernel32 -EXTRALIBS = -lstrmiids -ldxguid -luuid $(LIBUNICODE) - -C_SRCS = \ - container.c \ - dxdiag_main.c \ - provider.c \ - regsvr.c - -RC_SRCS = version.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____
Added: trunk/reactos/lib/dxdiagn/dxdiagn.xml --- vendor/wine/dlls/dxdiagn/current/dxdiagn.xml 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/lib/dxdiagn/dxdiagn.xml 2005-12-14 23:09:06 UTC (rev 20182) @@ -0,0 +1,28 @@
+<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="dxdiagn.spec.def" /> + <include base="dxdiagn">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>dxguid</library> + <library>strmiids</library> + <file>container.c</file> + <file>dxdiag_main.c</file> + <file>provider.c</file> + <file>regsvr.c</file> + <file>dxdiagn.spec</file> +</module> Property changes on: trunk/reactos/lib/dxdiagn/dxdiagn.xml ___________________________________________________________________ Name: svn:eol-style + native _____
Modified: trunk/reactos/lib/dxdiagn/provider.c --- vendor/wine/dlls/dxdiagn/current/provider.c 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/lib/dxdiagn/provider.c 2005-12-14 23:09:06 UTC (rev 20182) @@ -1,7 +1,7 @@
/* * IDxDiagProvider Implementation * - * Copyright 2004-2005 Raphael Junqueira + * Copyright 2004 Raphael Junqueira * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,18 +20,9 @@ */
#include "config.h" +#include "dxdiag_private.h" #include "wine/debug.h"
-#define COBJMACROS -#include "dxdiag_private.h" -#include "wine/unicode.h" -#include "winver.h" -#include "objidl.h" -#include "dshow.h" -#include "strmif.h" -#include "vfw.h" -#include "mmddk.h" - WINE_DEFAULT_DEBUG_CHANNEL(dxdiag);
/* IDxDiagProvider IUnknown parts follow: */ @@ -52,28 +43,18 @@
ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(ref before=%lu)\n", This, refCount - 1); - - DXDIAGN_LockModule(); - - return refCount; + TRACE("(%p) : AddRef from %ld\n", This, This->ref); + return ++(This->ref); }
ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(ref before=%lu)\n", This, refCount + 1); - - if (!refCount) { + ULONG ref = --This->ref; + TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); + if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); } - - DXDIAGN_UnlockModule(); - - return refCount; + return ref; }
/* IDxDiagProvider Interface follow: */ @@ -109,12 +90,11 @@ if (FAILED(hr)) { return hr; } - hr = DXDiag_InitRootDXDiagContainer((PDXDIAGCONTAINER)This->pRootContainer); } return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContain er, &IID_IDxDiagContainer, (void**) ppInstance); }
-static const IDxDiagProviderVtbl DxDiagProvider_Vtbl = +IDxDiagProviderVtbl DxDiagProvider_Vtbl = { IDxDiagProviderImpl_QueryInterface, IDxDiagProviderImpl_AddRef, @@ -136,554 +116,4 @@ provider->lpVtbl = &DxDiagProvider_Vtbl; provider->ref = 0; /* will be inited with QueryInterface */ return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); -} - -/** - * @param szFilePath: usually GetSystemDirectoryW - * @param szFileName: name of the dll without path - */ -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}; - VARIANT v; - - WCHAR szFile[512]; - WCHAR szVersion_v[1024]; - DWORD retval, hdl; - LPVOID pVersionInfo; - BOOL boolret; - UINT uiLength; - VS_FIXEDFILEINFO* pFileInfo; - - FIXME("(%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); - hr = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); - boolret = VerQueryValueW(pVersionInfo, (LPWSTR) szSlashSep, (LPVOID) &pFileInfo, &uiLength); - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFile); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szPath, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFileName); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = boolret; - hr = IDxDiagContainerImpl_AddProp(pSubCont, bExists, &v); - VariantClear(&v); - - if (boolret) { - snprintfW(szVersion_v, sizeof(szVersion_v), - szVersionFormat, - HIWORD(pFileInfo->dwFileVersionMS), - LOWORD(pFileInfo->dwFileVersionMS), - HIWORD(pFileInfo->dwFileVersionLS), - LOWORD(pFileInfo->dwFileVersionLS)); - - TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szVersion_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szVersion, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFinal_Retail_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szAttributes, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szLanguageEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateMS; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeHigh, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = pFileInfo->dwFileDateLS; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwFileTimeLow, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE)); - hr = IDxDiagContainerImpl_AddProp(pSubCont, bBeta, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = (0 != ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG)); - hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); - VariantClear(&v); - } - - HeapFree(GetProcessHeap(), 0, pVersionInfo); - - return hr; } - -HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - 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 szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ - /*szWindowsDir*/ - /*szWindowsDir*/ - /*"dwOSMajorVersion"*/ - /*"dwOSMinorVersion"*/ - /*"dwOSBuildNumber"*/ - /*"dwOSPlatformID"*/ - VARIANT v; - - V_VT(&v) = VT_UI4; V_UI4(&v) = 9; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMajor, &v); - VariantClear(&v); - V_VT(&v) = VT_UI4; V_UI4(&v) = 0; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMinor, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLetter_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLetter, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLongEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLongEnglish, &v); - VariantClear(&v); - V_VT(&v) = VT_BOOL; V_BOOL(&v) = FALSE; - hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); - VariantClear(&v); - - return hr; -} - -HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCont) { - 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, (void**) &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, (void**) &pDriversCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); - - */ - return hr; -} - -HRESULT DXDiag_InitDXDiagLogicalDisksContainer(IDxDiagContainer* pSubCont) { - 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, (void**) &pDiskSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, "" , pDiskSubCont); - */ - - /* - * Drivers Cont contains Files Desc Containers - */ - /* - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDriversCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pDeviceSubCont, szDrivers, pDriversCont); - */ - return hr; -} -HRESULT DXDiag_InitDXDiagDirectXFilesContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - /**/ - static const WCHAR ddraw_dll[] = {'d','d','r','a','w','.','d','l','l',0}; - static const WCHAR dplayx_dll[] = {'d','p','l','a','y','x','.','d','l','l',0}; - static const WCHAR dpnet_dll[] = {'d','p','n','e','t','.','d','l','l',0}; - static const WCHAR dinput_dll[] = {'d','i','n','p','u','t','.','d','l','l',0}; - static const WCHAR dinput8_dll[] = {'d','i','n','p','u','t','8','.','d','l','l',0}; - static const WCHAR dsound_dll[] = {'d','s','o','u','n','d','.','d','l','l',0}; - static const WCHAR dswave_dll[] = {'d','s','w','a','v','e','.','d','l','l',0}; - static const WCHAR d3d8_dll[] = {'d','3','d','8','.','d','l','l',0}; - static const WCHAR d3d9_dll[] = {'d','3','d','9','.','d','l','l',0}; - static const WCHAR dmband_dll[] = {'d','m','b','a','n','d','.','d','l','l',0}; - static const WCHAR dmcompos_dll[] = {'d','m','c','o','m','p','o','s','.','d','l','l',0}; - static const WCHAR dmime_dll[] = {'d','m','i','m','e','.','d','l','l',0}; - static const WCHAR dmloader_dll[] = {'d','m','l','o','a','d','e','r','.','d','l','l',0}; - static const WCHAR dmscript_dll[] = {'d','m','s','c','r','i','p','t','.','d','l','l',0}; - static const WCHAR dmstyle_dll[] = {'d','m','s','t','y','l','e','.','d','l','l',0}; - static const WCHAR dmsynth_dll[] = {'d','m','s','y','n','t','h','.','d','l','l',0}; - static const WCHAR dmusic_dll[] = {'d','m','u','s','i','c','.','d','l','l',0}; - static const WCHAR devenum_dll[] = {'d','e','v','e','n','u','m','.','d','l','l',0}; - static const WCHAR quartz_dll[] = {'q','u','a','r','t','z','.','d','l','l',0}; - WCHAR szFilePath[512]; - - hr = GetSystemDirectoryW(szFilePath, MAX_PATH); - if (FAILED(hr)) { return hr; } - szFilePath[MAX_PATH-1]=0; - - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, ddraw_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dplayx_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dpnet_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dinput_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dinput8_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dsound_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dswave_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, d3d8_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, d3d9_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmband_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmcompos_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmime_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmloader_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmscript_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmstyle_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmsynth_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, dmusic_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, devenum_dll); - hr = DXDiag_AddFileDescContainer(pSubCont, szFilePath, quartz_dll); - return hr; -} - -HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) { - 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 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}; - WCHAR szAdapterName[512]; - VARIANT v; - IDxDiagContainer* pDisplayAdapterSubCont = NULL; - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDisplayAdapterSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, szAdapterName, pDisplayAdapterSubCont); - */ - return hr; -} - -HRESULT DXDiag_InitDXDiagDirectSoundContainer(IDxDiagContainer* pSubCont) { - 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, (void**) &pSubSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, DxDiag_SoundDevices, pSubSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubSubCont); - if (FAILED(hr)) { return hr; } - hr = IDxDiagContainerImpl_AddChildContainer(pSubCont, DxDiag_SoundCaptureDevices, pSubSubCont); - - return hr; -} - -HRESULT DXDiag_InitDXDiagDirectMusicContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - return hr; -} -HRESULT DXDiag_InitDXDiagDirectInputContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - return hr; -} -HRESULT DXDiag_InitDXDiagDirectPlayContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - return hr; -} - -struct REG_RF { - DWORD dwVersion; - DWORD dwMerit; - DWORD dwPins; - DWORD dwUnused; -}; -struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ - DWORD dwFlags; - DWORD dwInstances; - DWORD dwMediaTypes; - DWORD dwMediums; - DWORD bCategory; /* is there a category clsid? */ - /* optional: dwOffsetCategoryClsid */ -}; -struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ - DWORD dwUnused; - DWORD dwOffsetMajor; - DWORD dwOffsetMinor; -}; - -HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; - static const WCHAR szName[] = {'s','z','N','a','m','e',0}; - static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; - static const WCHAR szClsidCat[] = {'s','z','C','l','s','i','d','C','a','t',0}; - static const WCHAR szClsidFilter[] = {'s','z','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 dwMerit[] = {'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 wszMeritName[] = {'M','e','r','i','t',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); - FIXME("\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; - FIXME("\tIEnumMoniker_Next(%p, 1, %p)\n", pEnum, pMoniker); - hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void**) &pPropFilterBag); - if (SUCCEEDED(hr)) { - LPBYTE pData = NULL; - LPBYTE pCurrent = NULL; - struct REG_RF* prrf = NULL; - VARIANT v_data; - DWORD it; - DWORD dwNOutputs = 0; - DWORD dwNInputs = 0; - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(wszCatName); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szCatName, &v); - VariantClear(&v); - - V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(wszCatClsid); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidCat, &v); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v); - FIXME("\tName:%s\n", debugstr_w(V_BSTR(&v))); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszClsidName, &v, 0); - FIXME("\tClsid:%s\n", debugstr_w(V_BSTR(&v))); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szClsidFilter, &v); - VariantClear(&v); - - hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); - hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); - prrf = (struct REG_RF*) pData; - pCurrent = pData; - - VariantInit(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = prrf->dwVersion; - hr = IDxDiagContainerImpl_AddProp(pSubCont, szName, &v_data); - VariantClear(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = prrf->dwMerit; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwMerit, &v_data); - VariantClear(&v_data); - - pCurrent += sizeof(struct REG_RF); - for (it = 0; it < prrf->dwPins; ++it) { - struct REG_RFP* prrfp = (struct REG_RFP*) pCurrent; - UINT j; - - if (prrfp->dwFlags & REG_PINFLAG_B_OUTPUT) ++dwNOutputs; - else ++dwNInputs; - - pCurrent += sizeof(struct REG_RFP); - if (prrfp->bCategory) { - pCurrent += sizeof(DWORD); - } - for (j = 0; j < prrfp->dwMediaTypes; ++j) { - struct REG_TYPE* prt = (struct REG_TYPE *)pCurrent; - pCurrent += sizeof(*prt); - } - for (j = 0; j < prrfp->dwMediums; ++j) { - DWORD dwOffset = *(DWORD*) pCurrent; - pCurrent += sizeof(dwOffset); - } - } - - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = dwNInputs; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwInputs, &v_data); - VariantClear(&v_data); - V_VT(&v_data) = VT_UI4; V_UI4(&v_data) = dwNOutputs; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwOutputs, &v_data); - VariantClear(&v_data); - - SafeArrayUnaccessData(V_UNION(&v, parray)); - VariantClear(&v); - } - 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; -} - -HRESULT DXDiag_InitRootDXDiagContainer(IDxDiagContainer* pRootCont) { - HRESULT hr = S_OK; - 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_SystemDevices[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','D','e','v','i','c' ,'e','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 WCHAR DxDiag_DirectXFiles[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','X','F','i','l','e' ,'s',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}; - static const WCHAR DxDiag_DirectSound[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d' ,0}; - static const WCHAR DxDiag_DirectMusic[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','M','u','s','i','c' ,0}; - static const WCHAR DxDiag_DirectInput[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','I','n','p','u','t' ,0}; - static const WCHAR DxDiag_DirectPlay[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','P','l','a','y',0}; - 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}; - IDxDiagContainer* pSubCont = NULL; - - TRACE("(%p)\n", pRootCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagSystemInfoContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_SystemInfo, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagSystemDevicesContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_SystemDevices, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagLogicalDisksContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_LogicalDisks, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectXFilesContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectXFiles, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDisplayContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DisplayDevices, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectSoundContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectSound, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectMusicContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectMusic, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectInputContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectInput, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectPlayContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectPlay, pSubCont); - - hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pSubCont); - if (FAILED(hr)) { return hr; } - hr = DXDiag_InitDXDiagDirectShowFiltersContainer(pSubCont); - hr = IDxDiagContainerImpl_AddChildContainer(pRootCont, DxDiag_DirectShowFilters, pSubCont); - - return hr; -} _____
Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-12-14 23:05:37 UTC (rev 20181) +++ trunk/reactos/media/doc/README.WINE 2005-12-14 23:09:06 UTC (rev 20182) @@ -46,6 +46,7 @@
reactos/lib/dinput8 # Synced to Wine-0_9_3 reactos/lib/dplay # Synced to Wine-0_9_3 reactos/lib/dplayx # Synced to Wine-0_9_3 +reactos/lib/dxdiagn # Synced to Wine-0_9_3 reactos/lib/icmp # Synced to Wine-0_9_3 reactos/lib/imm32 # Synced to Wine-0_9_3 reactos/lib/iphlpapi # Out of sync
-
gvg＠svn.reactos.com