Module: wine Branch: master Commit: 99b3862e67b0841e2eb4f5f0d099b0403917c581 URL: https://gitlab.winehq.org/wine/wine/-/commit/99b3862e67b0841e2eb4f5f0d099b04...
Author: Rémi Bernon rbernon@codeweavers.com Date: Thu Sep 29 18:03:26 2022 +0200
regedit: Call InitCommonControls after command-line has been processed.
Avoid triggering the load of comctl32 early.
---
programs/regedit/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/programs/regedit/main.c b/programs/regedit/main.c index e776ec9d0f7..b1035629726 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -132,8 +132,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi HACCEL hAccel; BOOL is_wow64;
- InitCommonControls(); - if (ProcessCmdLine(GetCommandLineW())) { return 0; } @@ -161,6 +159,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi Wow64RevertWow64FsRedirection( redir ); }
+ InitCommonControls(); + /* Initialize global strings */ LoadStringW(hInstance, IDS_APP_TITLE, szTitle, ARRAY_SIZE(szTitle)); LoadStringW(hInstance, IDS_REGISTRY_DEFAULT_VALUE, g_pszDefaultValueName, ARRAY_SIZE(g_pszDefaultValueName));