[PATCH v6 2/2] comctl32/propsheet: Create pages with PSP_PREMATURE on initialization.

[Jacob Czekalla]

From: Jacob Czekalla

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54861
---
 dlls/comctl32/propsheet.c       | 8 ++++++++
 dlls/comctl32/tests/propsheet.c | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index b530a1a8094..230c3218510 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3625,6 +3625,14 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
                          psInfo->ppshheader.pszCaption);
       }

+      for (int index = 0; index < psInfo->nPages;)
+      {
+        DWORD premature = HPSP_get_flags(psInfo->proppage[index].hpage) & PSP_PREMATURE;
+        if (premature && !PROPSHEET_CreatePage(hwnd, index, psInfo, psInfo->proppage[index].hpage))
+          PROPSHEET_RemovePage(hwnd, index, NULL);
+        else
+          index++;
+      }

if (psInfo->useCallback)
              (*(psInfo->ppshheader.pfnCallback))(hwnd, PSCB_INITIALIZED, 0);
diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c
index fb89397f132..00734b35db8 100644
--- a/dlls/comctl32/tests/propsheet.c
+++ b/dlls/comctl32/tests/propsheet.c
@@ -1423,9 +1423,9 @@ static void test_init_page_creation(void)
     {
         page = (HWND)SendMessageA(hp, PSM_INDEXTOHWND, p, 0);
         if(p == 2)
-            todo_wine ok(page == NULL, "Page %d created.\n", p);
+            ok(page == NULL, "Page %d created.\n", p);
         else
-            todo_wine ok(page != NULL, "Page %d not created.\n", p);
+            ok(page != NULL, "Page %d not created.\n", p);
     }

DestroyWindow(hp);