Module: wine Branch: master Commit: 0487c826fb8433cdede71f27af71c43fe7445a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0487c826fb8433cdede71f27a... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 19 13:47:37 2021 +0100 user32: Move register_builtin_classes call to GetDesktopWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 1 - dlls/user32/win.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 06b02adeab5..a1a64f42b6f 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -98,7 +98,6 @@ static const struct user_driver_funcs *load_driver(void) __wine_set_user_driver( &driver, WINE_GDI_DRIVER_VERSION ); } - register_builtin_classes(); return USER_Driver; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9fd5a9aa5e6..221607b3169 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -252,6 +252,7 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, else assert( full_parent == thread_info->top_window ); if (full_parent && !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); + register_builtin_classes(); } else /* HWND_MESSAGE parent */ { @@ -2282,6 +2283,7 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->top_window || !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); + register_builtin_classes(); return thread_info->top_window; }