Jacek Caban : devenum: Moved test for special category GUID to separated function.
Alexandre Julliard
julliard at winehq.org
Wed Jan 8 13:41:34 CST 2014
Module: wine
Branch: master
Commit: 6ce17c1fa4a38f180c10db5db60ae7897e2dcd69
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce17c1fa4a38f180c10db5db60ae7897e2dcd69
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Jan 8 14:12:00 2014 +0100
devenum: Moved test for special category GUID to separated function.
---
dlls/devenum/createdevenum.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c
index b7e288b..58fe7a4 100644
--- a/dlls/devenum/createdevenum.c
+++ b/dlls/devenum/createdevenum.c
@@ -107,12 +107,17 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface)
return 1; /* non-heap based object */
}
+static BOOL IsSpecialCategory(const CLSID *clsid)
+{
+ return IsEqualGUID(clsid, &CLSID_AudioRendererCategory) ||
+ IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) ||
+ IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) ||
+ IsEqualGUID(clsid, &CLSID_MidiRendererCategory);
+}
+
HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen)
{
- if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) ||
- IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) ||
- IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) ||
- IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory))
+ if (IsSpecialCategory(clsidDeviceClass))
{
*pBaseKey = HKEY_CURRENT_USER;
strcpyW(wszRegKeyName, wszActiveMovieKey);
@@ -482,10 +487,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
if (FAILED(hr))
return hr;
- if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) ||
- IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) ||
- IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) ||
- IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory))
+ if (IsSpecialCategory(clsidDeviceClass))
{
hr = DEVENUM_CreateSpecialCategories();
if (FAILED(hr))
More information about the wine-cvs
mailing list