[PATCH 0/1] MR6146: comctl32: Create all prop sheet pages on initialization.

[Jacob Czekalla (＠JacobCzekalla)]

Fixes bug 54861. The UK Kalender program was crashing when a new event was created as stated in the bug report. The fix is to create all the property sheet pages from the beginning instead of when they are selected.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6146

[PATCH 1/1] comctl32: Create all prop sheet pages on initialization.

[Jacob Czekalla]

From: Jacob Czekalla <jczekalla(a)codeweavers.com>

---
 dlls/comctl32/propsheet.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index b530a1a8094..5b3d4d4562d 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3591,6 +3591,14 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
       PROPSHEET_CreateTabControl(hwnd, psInfo);
 
+      for(int index = 0; index < psInfo->nPages;)
+      {
+        if(!PROPSHEET_CreatePage(hwnd, index, psInfo, psInfo->proppage[index].hpage))
+          PROPSHEET_RemovePage(hwnd, index, NULL);
+        else
+          index++;
+      }
+
       PROPSHEET_LoadWizardBitmaps(psInfo);
 
       if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6146

[PATCH 1/1] comctl32: Create all prop sheet pages on initialization.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147304

Your paranoid android.


=== debian11 (32 bit report) ===

comctl32:
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s

=== debian11b (64 bit WoW report) ===

comctl32:
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s
propsheet.c:121: Test failed: caption: Properties for %s

[Nikolay Sivov (＠nsivov)]

Is this testable? For example, does PSM_INDEXTOPAGE work from PSCB_INITIALIZED? That's a random suggestion, after looking at our implementation.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6146#note_76919