diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 7c5cf1e010..c49672fc97 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3413,6 +3413,9 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, PropSheetInfoStr); + if (!psInfo) + return FALSE; + /* No default handler, forward notification to active page */ if (psInfo->activeValid && psInfo->active_page != -1) { @@ -3448,6 +3451,9 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheetInfoStr); HWND hwndPage = 0; + if (!psInfo) + return FALSE; + if (psInfo->activeValid && psInfo->active_page != -1) hwndPage = psInfo->proppage[psInfo->active_page].hwndPage; @@ -3509,6 +3515,9 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, PropSheetInfoStr); + if (!psInfo) + return FALSE; + psInfo->restartWindows = TRUE; return TRUE; } @@ -3518,6 +3527,9 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, PropSheetInfoStr); + if (!psInfo) + return FALSE; + psInfo->rebootSystem = TRUE; return TRUE; }