Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-26 17:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NEWDEV] Fix bad use of PropSheet_SetCurSelByID (#7574)

Browse source 
PropSheet_SetCurSelByID() was badly called in response of PSN_WIZBACK or
PSN_WIZNEXT notifications. See the reference on these notification codes:

https://learn.microsoft.com/en-us/windows/win32/controls/psn-wizback

> Returns 0 to allow the wizard to go to the previous page. Returns -1 to
> prevent the wizard from changing pages. To display a particular page,
> return its dialog resource identifier.
> (...)
> To set the return value, the dialog box procedure for the page must call
> the SetWindowLong function with the DWL_MSGRESULT value and return TRUE.

This bug sometimes causes the wrong page to appear (e.g. "Previous" in
IDD_NODRIVER should come back in IDD_CHSOURCE, but goes to IDD_WELCOME).
This commit is contained in:
Denis Robert 2024-12-23 14:24:21 +01:00 committed by GitHub
parent 0743faf2e3
commit 6f60301d25
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/newdev/wizard.c
View file

@ -545,9 +545,9 @@ WelcomeDlgProc(
if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) if (SendDlgItemMessage(hwndDlg, IDC_RADIO_AUTO, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED)
{ {
if (PrepareFoldersToScan(DevInstData, TRUE, FALSE, NULL)) if (PrepareFoldersToScan(DevInstData, TRUE, FALSE, NULL))
PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_SEARCHDRV);
else else
PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_INSTALLFAILED);
} }
return TRUE; return TRUE;
@ -759,11 +759,11 @@ CHSourceDlgProc(
IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH), IsDlgButtonChecked(hwndDlg, IDC_CHECK_PATH),
GetDlgItem(hwndDlg, IDC_COMBO_PATH))) GetDlgItem(hwndDlg, IDC_COMBO_PATH)))
{ {
PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SEARCHDRV); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_SEARCHDRV);
} }
else else
{ {
PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_INSTALLFAILED); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_INSTALLFAILED);
} }
} }
else else
@ -1059,7 +1059,7 @@ NoDriverDlgProc(
hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL);
ShowWindow(hwndControl, SW_SHOW); ShowWindow(hwndControl, SW_SHOW);
EnableWindow(hwndControl, TRUE); EnableWindow(hwndControl, TRUE);
PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_CHSOURCE); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_CHSOURCE);
return TRUE; return TRUE;
case PSN_WIZFINISH: case PSN_WIZFINISH: