[janderwald] 46648: [DEVENUM] - Extend device enumerator to support class enumerators of device interfaces
Author: janderwald Date: Thu Apr 1 21:48:49 2010 New Revision: 46648
URL: http://svn.reactos.org/svn/reactos?rev=46648&view=rev Log: [DEVENUM] - Extend device enumerator to support class enumerators of device interfaces
Modified: trunk/reactos/dll/directx/devenum/createdevenum.c trunk/reactos/dll/directx/devenum/devenum_private.h trunk/reactos/dll/directx/devenum/mediacatenum.c
Modified: trunk/reactos/dll/directx/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/created... ============================================================================== --- trunk/reactos/dll/directx/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/createdevenum.c [iso-8859-1] Thu Apr 1 21:48:49 2010 @@ -48,6 +48,7 @@
#include "wine/debug.h" #include "mmddk.h" +#include <regstr.h>
WINE_DEFAULT_DEBUG_CHANNEL(devenum);
@@ -124,6 +125,7 @@ WCHAR wszRegKey[MAX_PATH]; HKEY hkey; HKEY hbasekey; + BOOL bInterface = FALSE; CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
TRACE("(%p)->(%s, %p, %lx)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); @@ -174,12 +176,23 @@ } else { - FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); - return S_FALSE; + wcscpy(wszRegKey, REGSTR_PATH_DEVICE_CLASSES); + wcscat(wszRegKey, L"\"); + + if (!StringFromGUID2(clsidDeviceClass, wszRegKey + wcslen(wszRegKey), MAX_PATH - CLSID_STR_LEN)) + return E_OUTOFMEMORY; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegKey, 0, KEY_READ, &hkey) != ERROR_SUCCESS) + { + FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); + return S_FALSE; + } + + bInterface = TRUE; } }
- return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker); + return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker, bInterface); }
/**********************************************************************
Modified: trunk/reactos/dll/directx/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenum... ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/devenum_private.h [iso-8859-1] Thu Apr 1 21:48:49 2010 @@ -71,6 +71,7 @@ LONG ref; DWORD index; HKEY hkey; + BOOL bInterface; } EnumMonikerImpl;
typedef struct @@ -79,10 +80,11 @@
LONG ref; HKEY hkey; + BOOL bInterface; } MediaCatMoniker;
MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void); -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker); +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker, BOOL bInterface); HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( ICreateDevEnum * iface, REFCLSID clsidDeviceClass,
Modified: trunk/reactos/dll/directx/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/mediaca... ============================================================================== --- trunk/reactos/dll/directx/devenum/mediacatenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/mediacatenum.c [iso-8859-1] Thu Apr 1 21:48:49 2010 @@ -42,6 +42,7 @@ IPropertyBagVtbl *lpVtbl; LONG ref; HKEY hkey; + BOOL bInterface; } RegPropBagImpl;
@@ -108,13 +109,31 @@ RegPropBagImpl *This = (RegPropBagImpl *)iface; HRESULT res = S_OK; LONG reswin32; + WCHAR buffer[MAX_PATH]; + HKEY hkey; + LPCOLESTR pszName;
TRACE("(%p)->(%s, %p, %p)\n", This, debugstr_w(pszPropName), pVar, pErrorLog);
if (!pszPropName || !pVar) return E_POINTER;
- reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, NULL, NULL, &received); + hkey = This->hkey; + pszName = pszPropName; + if (This->bInterface) + { + buffer[0] = 0; + received = sizeof(buffer)/sizeof(WCHAR); + reswin32 = RegEnumKeyEx(This->hkey, 0, buffer, &received, NULL, NULL, NULL, NULL); + + reswin32 = RegOpenKeyExW(This->hkey, buffer, 0, KEY_READ, &hkey); + + if (!wcsicmp(pszPropName, L"DevicePath")) + pszName = L"SymbolicLink"; + + } + + reswin32 = RegQueryValueExW(hkey, pszName, NULL, NULL, NULL, &received); res = HRESULT_FROM_WIN32(reswin32);
if (SUCCEEDED(res)) @@ -122,7 +141,7 @@ pData = HeapAlloc(GetProcessHeap(), 0, received);
/* work around a GCC bug that occurs here unless we use the reswin32 variable as well */ - reswin32 = RegQueryValueExW(This->hkey, pszPropName, NULL, &type, pData, &received); + reswin32 = RegQueryValueExW(hkey, pszName, NULL, &type, pData, &received); res = HRESULT_FROM_WIN32(reswin32); }
@@ -201,6 +220,9 @@ if (pData) HeapFree(GetProcessHeap(), 0, pData);
+ if (This->bInterface) + RegCloseKey(hkey); + TRACE("<- %lx\n", res); return res; } @@ -270,7 +292,7 @@ DEVENUM_IPropertyBag_Write };
-static HRESULT DEVENUM_IPropertyBag_Construct(HANDLE hkey, IPropertyBag **ppBag) +static HRESULT DEVENUM_IPropertyBag_Construct(HANDLE hkey, IPropertyBag **ppBag, BOOL bInterface) { RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl)); if (!rpb) @@ -278,6 +300,8 @@ rpb->lpVtbl = &IPropertyBag_Vtbl; rpb->ref = 1; rpb->hkey = hkey; + rpb->bInterface = bInterface; + *ppBag = (IPropertyBag*)rpb; DEVENUM_LockModule(); return S_OK; @@ -393,6 +417,7 @@ { IUnknown * pObj = NULL; IPropertyBag * pProp = NULL; + IPersistPropertyBag * pBag; CLSID clsID; VARIANT var; HRESULT res = E_FAIL; @@ -430,6 +455,15 @@
if (pObj!=NULL) { + if (This->bInterface) + { + res = IUnknown_QueryInterface(pObj, &IID_IPersistPropertyBag, (void**)&pBag); + if (SUCCEEDED(res)) + { + res = IPersistPropertyBag_Load(pBag, pProp, NULL); /* FIXME */ + IPersistPropertyBag_Release(pBag); + } + } /* get the requested interface from the loaded class */ res= IUnknown_QueryInterface(pObj,riidResult,ppvResult); } @@ -463,7 +497,7 @@ { HANDLE hkey; DuplicateHandle(GetCurrentProcess(), This->hkey, GetCurrentProcess(), &hkey, 0, 0, DUPLICATE_SAME_ACCESS); - return DEVENUM_IPropertyBag_Construct(hkey, (IPropertyBag**)ppvObj); + return DEVENUM_IPropertyBag_Construct(hkey, (IPropertyBag**)ppvObj, This->bInterface); }
return MK_E_NOSTORAGE; @@ -679,6 +713,7 @@ pMoniker->lpVtbl = &IMoniker_Vtbl; pMoniker->ref = 0; pMoniker->hkey = NULL; + pMoniker->bInterface = FALSE;
DEVENUM_IMediaCatMoniker_AddRef((LPMONIKER)pMoniker);
@@ -764,6 +799,7 @@ if (!pMoniker) return E_OUTOFMEMORY;
+ pMoniker->bInterface = This->bInterface; if (RegOpenKeyW(This->hkey, buffer, &pMoniker->hkey) != ERROR_SUCCESS) { DEVENUM_IMediaCatMoniker_Release((LPMONIKER)pMoniker); @@ -829,7 +865,7 @@ DEVENUM_IEnumMoniker_Clone };
-HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker, BOOL bInterface) { EnumMonikerImpl * pEnumMoniker = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); if (!pEnumMoniker) @@ -839,6 +875,7 @@ pEnumMoniker->ref = 1; pEnumMoniker->index = 0; pEnumMoniker->hkey = hkey; + pEnumMoniker->bInterface = bInterface;
*ppEnumMoniker = (IEnumMoniker *)pEnumMoniker;
-
janderwald＠svn.reactos.org