Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 10:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPENGLCFG] Empty list boxes if registry key is missing (#2750)

Browse source 
If the registry key that holds the names of installed opengl drivers is missing, all list boxes in openglcfg are empty. This is a minor code rearrangement to fix this behavior.

Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito@reactos.org>
This commit is contained in:
Ricardo Hanke 2020-05-14 14:47:48 +02:00 committed by GitHub
parent 64ba6e64c8
commit 0c5f367172
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dll/cpl/openglcfg/general.c
View file

@ -10,20 +10,11 @@ static VOID InitSettings(HWND hWndDlg)
{
HKEY hKeyRenderer;
HKEY hKeyDrivers;
DWORD dwType = 0;
DWORD dwSize = MAX_KEY_LENGTH;
WCHAR szBuffer[MAX_KEY_LENGTH];
WCHAR szBultin[MAX_KEY_LENGTH];
WCHAR szDriver[MAX_KEY_LENGTH];
DWORD dwType = 0;
DWORD dwSize = MAX_KEY_LENGTH;
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KEY_DRIVERS, 0, KEY_READ, &hKeyDrivers) != ERROR_SUCCESS)
return;
if (RegCreateKeyExW(HKEY_CURRENT_USER, KEY_RENDERER, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hKeyRenderer, NULL) != ERROR_SUCCESS)
{
RegCloseKey(hKeyDrivers);
return;
}
LoadString(hApplet, IDS_DEBUG_DNM, (LPTSTR)szBultin, 127);
SendDlgItemMessageW(hWndDlg, IDC_DEBUG_OUTPUT, CB_ADDSTRING, 0, (LPARAM)szBultin);
@ -42,9 +33,14 @@ static VOID InitSettings(HWND hWndDlg)
LoadString(hApplet, IDS_RENDERER_RSWR, (LPTSTR)szBultin, 127);
SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_ADDSTRING, 0, (LPARAM)szBultin);
if (RegCreateKeyExW(HKEY_CURRENT_USER, KEY_RENDERER, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hKeyRenderer, NULL) != ERROR_SUCCESS)
return;
if (RegQueryValueExW(hKeyRenderer, NULL, NULL, &dwType, (LPBYTE)szDriver, &dwSize) != ERROR_SUCCESS || dwSize == sizeof(WCHAR))
SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, RENDERER_DEFAULT, 0);
RegCloseKey(hKeyRenderer);
if (dwType == REG_SZ)
{
DWORD ret;
@ -53,12 +49,14 @@ static VOID InitSettings(HWND hWndDlg)
if (wcsncmp(szBultin, szDriver, MAX_KEY_LENGTH) == 0)
SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, RENDERER_RSWR, 0);
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, KEY_DRIVERS, 0, KEY_READ, &hKeyDrivers) != ERROR_SUCCESS)
return;
ret = RegQueryInfoKeyW(hKeyDrivers, NULL, NULL, NULL, &dwNumDrivers, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (ret != ERROR_SUCCESS || dwNumDrivers == 0)
{
RegCloseKey(hKeyDrivers);
RegCloseKey(hKeyRenderer);
return;
}
@ -90,10 +88,9 @@ static VOID InitSettings(HWND hWndDlg)
if (wcsncmp(szBuffer, szDriver, MAX_KEY_LENGTH) == 0)
SendDlgItemMessageW(hWndDlg, IDC_RENDERER, CB_SETCURSEL, iKey + 2, 0);
}
}
RegCloseKey(hKeyDrivers);
RegCloseKey(hKeyRenderer);
RegCloseKey(hKeyDrivers);
}
return;
}