lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-03 09:51:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NEWDEV] CHSourceDlgProc: Don't set CustomSearchPath member to stack allocated buffer (#8447)

Browse Source 
Fixes a crash when installing a driver from custom directory.
Also move the combobox handling code to the PrepareFoldersToScan() and call it instead.

CORE-20409
This commit is contained in:
Adam Słaboń
2025-12-29 21:22:20 +01:00
committed by GitHub
parent f6a86c1ab3
commit 0edffb1eda
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dll/win32/newdev/newdev.c
View File

@@ -473,6 +473,7 @@ PrepareFoldersToScan(
DWORD CustomTextLength = 0;
DWORD LengthNeeded = 0;
LPWSTR Buffer;
INT idx = (INT)SendMessageW(hwndCombo, CB_GETCURSEL, 0, 0);
/* Calculate length needed to store the search paths */
if (IncludeRemovableDevices)
@@ -492,7 +493,8 @@ PrepareFoldersToScan(
}
if (IncludeCustomPath)
{
CustomTextLength = 1 + ComboBox_GetTextLength(hwndCombo);
CustomTextLength = 1 + ((idx != CB_ERR) ?
(INT)SendMessageW(hwndCombo, CB_GETLBTEXTLEN, idx, 0) : ComboBox_GetTextLength(hwndCombo));
LengthNeeded += CustomTextLength;
}
@@ -526,7 +528,9 @@ PrepareFoldersToScan(
}
if (IncludeCustomPath)
{
Buffer += 1 + GetWindowTextW(hwndCombo, Buffer, CustomTextLength);
Buffer += 1 + ((idx != CB_ERR) ?
SendMessageW(hwndCombo, CB_GETLBTEXT, idx, (LPARAM)Buffer) :
GetWindowTextW(hwndCombo, Buffer, CustomTextLength));
}
*Buffer = '\0';

34
dll/win32/newdev/wizard.c
View File

@@ -684,32 +684,23 @@ CHSourceDlgProc(
case IDC_BROWSE:
{
BROWSEINFOW bi = { 0 };
LPITEMIDLIST pidl;
LPITEMIDLIST pidl = NULL;
WCHAR Title[MAX_PATH];
WCHAR CustomSearchPath[MAX_PATH] = { 0 };
INT len, idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_GETCURSEL, 0, 0);
LoadStringW(hDllInstance, IDS_BROWSE_FOR_FOLDER_TITLE, Title, _countof(Title));
if (idx == CB_ERR)
len = GetWindowTextLengthW(GetDlgItem(hwndDlg, IDC_COMBO_PATH));
else
len = (INT)SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_GETLBTEXTLEN, idx, 0);
if (len < _countof(CustomSearchPath))
if (PrepareFoldersToScan(DevInstData,
FALSE,
TRUE,
GetDlgItem(hwndDlg, IDC_COMBO_PATH)))
{
if (idx == CB_ERR)
GetWindowTextW(GetDlgItem(hwndDlg, IDC_COMBO_PATH), CustomSearchPath, _countof(CustomSearchPath));
else
SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_GETLBTEXT, idx, (LPARAM)CustomSearchPath);
bi.hwndOwner = hwndDlg;
bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NONEWFOLDERBUTTON;
bi.lpszTitle = Title;
bi.lpfn = BrowseCallbackProc;
bi.lParam = (LPARAM)DevInstData;
pidl = SHBrowseForFolderW(&bi);
}
DevInstData->CustomSearchPath = CustomSearchPath;
bi.hwndOwner = hwndDlg;
bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NONEWFOLDERBUTTON;
bi.lpszTitle = Title;
bi.lpfn = BrowseCallbackProc;
bi.lParam = (LPARAM)DevInstData;
pidl = SHBrowseForFolderW(&bi);
if (pidl)
{
WCHAR Directory[MAX_PATH];
@@ -717,6 +708,9 @@ CHSourceDlgProc(
if (SHGetPathFromIDListW(pidl, Directory))
{
/* Remove previous item selection */
SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_SETCURSEL, -1, 0);
/* Set the IDC_COMBO_PATH text */
SetWindowTextW(GetDlgItem(hwndDlg, IDC_COMBO_PATH), Directory);
}