[PATCH 0/1] MR6119: printdlg: Allow button id psh1 for "Properties" button.
From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55841 --- dlls/comdlg32/printdlg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index aed486a9b09..0eb2f333bd9 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1796,6 +1796,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, } break; + case psh1: case psh2: /* Properties button */ { HANDLE hPrinter; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6119
Dmitry Timoshkov (@dmitry) commented about dlls/comdlg32/printdlg.c:
} break;
+ case psh1: Is it probably worth adding a comment /\* Setup button \*/ ?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76602
On Fri Jul 19 08:12:55 2024 +0000, Dmitry Timoshkov wrote:
Is it probably worth adding a comment /\* Setup button \*/ ? Why "Setup button"? You mean a second "Properties button" comment?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76622
On Fri Jul 19 13:46:48 2024 +0000, Fabian Maurer wrote:
Why "Setup button"? You mean a second "Properties button" comment? Because the PRINT dialog template psh1 is "Setup" button.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76635
On Fri Jul 19 16:04:45 2024 +0000, Dmitry Timoshkov wrote:
Because the PRINT dialog template psh1 is "Setup" button. But is that general? Because in another dialog psh1 is used for "Replace". In this case there is no setup button, and it's treated as properties button
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76649
On Fri Jul 19 19:21:25 2024 +0000, Fabian Maurer wrote:
But is that general? Because in another dialog psh1 is used for "Replace". In this case there is no setup button, and it's treated as properties button Control psh1 has string"Replace" in the Find&Replace dialog. Since you are fixing the bug in Print dialog it's either psh2 ("Properties" in new style dialog) or psh1 ("Setup" in old style dialog).
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76652
On Fri Jul 19 19:56:37 2024 +0000, Dmitry Timoshkov wrote:
Control psh1 has string"Replace" in the Find&Replace dialog. Since you are fixing the bug in Print dialog it's either psh2 ("Properties" in new style dialog) or psh1 ("Setup" in old style dialog). I found the old print dialog in the .rc, you mean this part right? ```PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP``` Is this even still in use? I couldn't find any reference to it.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76653
On Fri Jul 19 20:11:41 2024 +0000, Fabian Maurer wrote:
I found the old print dialog in the .rc, you mean this part right? ```PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP``` Is this even still in use? I couldn't find any reference to it. That's one of the places in Print dialog templates where the control has psh1 id. It's not referenced in the code, and it's a bug that your patch actually fixes.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76654
On Fri Jul 19 20:19:34 2024 +0000, Dmitry Timoshkov wrote:
That's one of the places in Print dialog templates where the control has psh1 id. It's not referenced in the code, and it's a bug that your patch actually fixes. But AFAIK that dialog template is not actually used. In lotus case they have their own template with a "Properties" button with id psh1. So why comment it "Setup"?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76655
On Fri Jul 19 20:24:09 2024 +0000, Fabian Maurer wrote:
But AFAIK that dialog template is not actually used. In lotus case they have their own template with a "Properties" button with id psh1. So why comment it "Setup"? Well, print dialog templates are supposed to be used. Application developers usually take the official dialog template (it's part of the PSDK), modify it (by adding new controls) and pass to PrintDlg() with appropriate flags and a hook procedure that handles additional controls and/or logic.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76657
On Fri Jul 19 20:32:34 2024 +0000, Dmitry Timoshkov wrote:
Well, print dialog templates are supposed to be used. Application developers usually take the official dialog template (it's part of the PSDK), modify it (by adding new controls) and pass to PrintDlg() with appropriate flags and a hook procedure that handles additional controls and/or logic. Ah, and you can pass both kind of templates to the same function here?
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76660
On Fri Jul 19 20:40:39 2024 +0000, Fabian Maurer wrote:
Ah, and you can pass both kind of templates to the same function here? Apparently that's how it's implemented in Wine.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6119#note_76662
participants (3)
-
Dmitry Timoshkov (＠dmitry) -
Fabian Maurer
-
Fabian Maurer (＠DarkShadow44)