Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:23:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MMSYS]

Browse source 
- install software bus pnp enumerator only once

svn path=/trunk/; revision=66605
This commit is contained in:
Johannes Anderwald 2015-03-08 08:28:12 +00:00
parent 97bb83fcd9
commit d2e31d5fde
1 changed files with 60 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

71
reactos/dll/cpl/mmsys/mmsys.c
View file

@ -15,6 +15,7 @@
#include <shlwapi.h> #include <shlwapi.h>
#include <debug.h> #include <debug.h>
#include <swenum.h>
#include <newdev.h> #include <newdev.h>
#include <initguid.h> #include <initguid.h>
#include <devguid.h> #include <devguid.h>
@ -337,6 +338,51 @@ InstallSystemSoundScheme()
RegCloseKey(hKey); RegCloseKey(hKey);
} }
BOOL
IsSoftwareBusPnpEnumeratorInstalled()
{
HDEVINFO hDevInfo;
SP_DEVICE_INTERFACE_DATA DeviceInterfaceData;
GUID SWBusGuid = {STATIC_BUSID_SoftwareDeviceEnumerator};
PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData;
HANDLE hDevice;
hDevInfo = SetupDiGetClassDevsW(&SWBusGuid, NULL, NULL, DIGCF_DEVICEINTERFACE| DIGCF_PRESENT);
if (!hDevInfo)
{
// failed
return FALSE;
}
DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
if (!SetupDiEnumDeviceInterfaces(hDevInfo, NULL, &SWBusGuid, 0, &DeviceInterfaceData))
{
// failed
SetupDiDestroyDeviceInfoList(hDevInfo);
return FALSE;
}
DeviceInterfaceDetailData = (PSP_DEVICE_INTERFACE_DETAIL_DATA_W)HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W));
if (!DeviceInterfaceDetailData)
{
// failed
SetupDiDestroyDeviceInfoList(hDevInfo);
return FALSE;
}
DeviceInterfaceDetailData->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W);
if (!SetupDiGetDeviceInterfaceDetailW(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData,MAX_PATH * sizeof(WCHAR) + sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W), NULL, NULL))
{
// failed
HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData);
SetupDiDestroyDeviceInfoList(hDevInfo);
return FALSE;
}
HeapFree(GetProcessHeap(), 0, DeviceInterfaceDetailData);
SetupDiDestroyDeviceInfoList(hDevInfo);
return TRUE;
}
DWORD DWORD
InstallSoftwareBusPnpEnumerator(LPWSTR InfPath, LPCWSTR HardwareIdList) InstallSoftwareBusPnpEnumerator(LPWSTR InfPath, LPCWSTR HardwareIdList)
{ {
@ -484,20 +530,23 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData)
SetupTermDefaultQueueCallback(Context); SetupTermDefaultQueueCallback(Context);
SetupCloseInfFile(hInf); SetupCloseInfFile(hInf);
Length = GetWindowsDirectoryW(szBuffer, MAX_PATH); if (!IsSoftwareBusPnpEnumeratorInstalled())
if (!Length || Length >= MAX_PATH - 14)
{ {
return ERROR_GEN_FAILURE; Length = GetWindowsDirectoryW(szBuffer, MAX_PATH);
} if (!Length || Length >= MAX_PATH - 14)
{
return ERROR_GEN_FAILURE;
}
pBuffer = PathAddBackslashW(szBuffer); pBuffer = PathAddBackslashW(szBuffer);
if (!pBuffer) if (!pBuffer)
{ {
return ERROR_GEN_FAILURE; return ERROR_GEN_FAILURE;
} }
wcscpy(pBuffer, L"inf\\machine.inf"); wcscpy(pBuffer, L"inf\\machine.inf");
InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM"); InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM");
}
hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
if (!hSCManager) if (!hSCManager)