lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-30 14:34:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DESK] The DisplayClassInstaller must create a new DeviceX subkey for each new display devices

Browse Source 
This should fix CORE-16615
This commit is contained in:
Eric Kohl
2020-01-06 22:38:53 +01:00
parent 611d925d32
commit b00a1f3e76
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dll/cpl/desk/classinst.c
View File

@@ -23,6 +23,7 @@ DisplayClassInstaller(
HINF hInf = INVALID_HANDLE_VALUE;
TCHAR SectionName[MAX_PATH];
TCHAR ServiceName[MAX_SERVICE_NAME_LEN];
TCHAR DeviceName[12];
SP_DRVINFO_DETAIL_DATA DriverInfoDetailData;
HKEY hDriverKey = INVALID_HANDLE_VALUE; /* SetupDiOpenDevRegKey returns INVALID_HANDLE_VALUE in case of error! */
HKEY hSettingsKey = NULL;
@@ -30,6 +31,7 @@ DisplayClassInstaller(
HKEY hServiceKey = NULL;
HKEY hDeviceSubKey = NULL;
DWORD disposition, cchMax, cbData;
WORD wIndex;
BOOL result;
LONG rc;
HRESULT hr;
@@ -183,21 +185,33 @@ DisplayClassInstaller(
goto cleanup;
}
/* Create a Device0 subkey (FIXME: do a loop to find a free number?) */
rc = RegCreateKeyEx(
hServiceKey, _T("Device0"), 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL,
&hDeviceSubKey, &disposition);
if (rc != ERROR_SUCCESS)
/* Create a new DeviceX subkey */
for (wIndex = 0; wIndex < 9999; wIndex++)
{
DPRINT("RegCreateKeyEx() failed with error 0x%lx\n", rc);
goto cleanup;
}
if (disposition != REG_CREATED_NEW_KEY)
{
rc = ERROR_GEN_FAILURE;
DPRINT("RegCreateKeyEx() failed\n");
goto cleanup;
_stprintf(DeviceName, _T("Device%hu"), wIndex);
rc = RegCreateKeyEx(
hServiceKey, DeviceName, 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL,
&hDeviceSubKey, &disposition);
if (rc != ERROR_SUCCESS)
{
DPRINT("RegCreateKeyEx() failed with error 0x%lx\n", rc);
goto cleanup;
}
if (disposition == REG_CREATED_NEW_KEY)
break;
if (wIndex == 9999)
{
rc = ERROR_GEN_FAILURE;
DPRINT("RegCreateKeyEx() failed\n");
goto cleanup;
}
RegCloseKey(hDeviceSubKey);
hDeviceSubKey = NULL;
}
/* Install SoftwareSettings section */