From f94159cdb24979f23e116a1df8396435be128d9e Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Mon, 3 Nov 2003 22:15:39 +0000 Subject: [PATCH] Don't get confused if PSN_SETACTIVE returns a positive number that isn't a resource id. --- dlls/comctl32/propsheet.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 04ea6750d2c..94a784d41af 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2028,19 +2028,25 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, index+=skipdir; if (index < 0) { index = 0; - FIXME("Tried to skip before first property sheet page!\n"); + WARN("Tried to skip before first property sheet page!\n"); break; } if (index >= psInfo->nPages) { - FIXME("Tried to skip after last property sheet page!\n"); + WARN("Tried to skip after last property sheet page!\n"); index = psInfo->nPages-1; break; } } else if (result != 0) { - index = PROPSHEET_FindPageByResId(psInfo, result); - continue; + int old_index = index; + index = PROPSHEET_FindPageByResId(psInfo, result); + if(index >= psInfo->nPages) { + index = old_index; + WARN("Tried to skip to nonexistant page by res id\n"); + break; + } + continue; } } /*