ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

devenum: Scan special device categories more often.

This commit is contained in:
Maarten Lankhorst 2010-01-30 16:21:19 +01:00 committed by Alexandre Julliard
parent 201c9a14bf
commit 737ed17f1b
1 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/devenum/createdevenum.c
View File

@ -481,8 +481,6 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS)
{
if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) ||
IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) ||
IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) ||
@ -498,12 +496,11 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
return S_FALSE; return S_FALSE;
} }
} }
else else if (RegOpenKeyW(hbasekey, wszRegKey, &hkey) != ERROR_SUCCESS)
{ {
FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass)); FIXME("Category %s not found\n", debugstr_guid(clsidDeviceClass));
return S_FALSE; return S_FALSE;
} }
}
return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker); return DEVENUM_IEnumMoniker_Construct(hkey, ppEnumMoniker);
} }
@ -556,6 +553,12 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory)
return res; return res;
} }
static HANDLE DEVENUM_populate_handle;
static const WCHAR DEVENUM_populate_handle_nameW[] =
{'_','_','W','I','N','E','_',
'D','e','v','e','n','u','m','_',
'P','o','p','u','l','a','t','e',0};
/********************************************************************** /**********************************************************************
* DEVENUM_CreateSpecialCategories (INTERNAL) * DEVENUM_CreateSpecialCategories (INTERNAL)
* *
@ -571,6 +574,35 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
IFilterMapper2 * pMapper = NULL; IFilterMapper2 * pMapper = NULL;
REGFILTER2 rf2; REGFILTER2 rf2;
REGFILTERPINS2 rfp2; REGFILTERPINS2 rfp2;
WCHAR path[MAX_PATH];
HKEY basekey;
if (DEVENUM_populate_handle)
return S_OK;
DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW);
if (GetLastError() == ERROR_ALREADY_EXISTS)
{
/* Webcams can take some time to scan if the driver is badly written and it enables them,
* so have a 10 s timeout here
*/
if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT)
WARN("Waiting for object timed out\n");
TRACE("No need to rescan\n");
return S_OK;
}
TRACE("Scanning for devices\n");
/* Since devices can change between session, for example because you just plugged in a webcam
* or switched from pulseaudio to alsa, delete all old devices first
*/
if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH)))
RegDeleteTreeW(basekey, path);
if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH)))
RegDeleteTreeW(basekey, path);
if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH)))
RegDeleteTreeW(basekey, path);
if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH)))
RegDeleteTreeW(basekey, path);
rf2.dwVersion = 2; rf2.dwVersion = 2;
rf2.dwMerit = MERIT_PREFERRED; rf2.dwMerit = MERIT_PREFERRED;
@ -814,5 +846,6 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
if (pMapper) if (pMapper)
IFilterMapper2_Release(pMapper); IFilterMapper2_Release(pMapper);
SetEvent(DEVENUM_populate_handle);
return res; return res;
} }