From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/user32/defdlg.c | 4 ++++ dlls/user32/tests/class.c | 2 +- server/class.c | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 1b50893c041..69c573c61c0 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -316,6 +316,8 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar DIALOGINFO *dlgInfo; LRESULT result; + NtUserSetWindowFNID( hwnd, MAKE_FNID(NTUSER_WNDPROC_DIALOG) ); + /* Perform DIALOGINFO initialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; @@ -368,6 +370,8 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar DIALOGINFO *dlgInfo; LRESULT result; + NtUserSetWindowFNID( hwnd, MAKE_FNID(NTUSER_WNDPROC_DIALOG) ); + /* Perform DIALOGINFO initialization if not done */ if(!(dlgInfo = DIALOG_get_info( hwnd, TRUE ))) return 0; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 5588ab781e3..a554891f4a6 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -2529,7 +2529,7 @@ static const struct real_class_test class_tests[] = { "ComboLBox", "ListBox", FALSE, TRUE, TRUE, TRUE, FALSE }, { "MDIClient", "MDIClient", TRUE, TRUE, TRUE, TRUE, FALSE }, { "#32768", "#32768", FALSE, FALSE, TRUE, TRUE, FALSE }, - { "#32770", "#32770", TRUE, TRUE, TRUE, TRUE, TRUE }, + { "#32770", "#32770", TRUE, TRUE, TRUE, TRUE, FALSE }, /* Not all built-in classes set real window class. */ { "Message", NULL, FALSE, FALSE, FALSE, FALSE, FALSE }, }; diff --git a/server/class.c b/server/class.c index 95defe8b9ba..a3e1b85bc80 100644 --- a/server/class.c +++ b/server/class.c @@ -165,6 +165,7 @@ unsigned int get_class_fnid( struct window_class *class, data_size_t *extra_size if ((class->fnid & ~0x7fff) != 0x8000) *private_size = 0; else switch (class->fnid & 0x7fff) { + case NTUSER_WNDPROC_DIALOG: *private_size = 0; break; case NTUSER_WNDPROC_MDICLIENT: *private_size = 0; break; default: *private_size = *extra_size; break; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11044