diff options
Diffstat (limited to 'win32/win32.c')
| -rw-r--r-- | win32/win32.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/win32/win32.c b/win32/win32.c index d583087d42..b9eea70535 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4801,16 +4801,6 @@ Perl_win32_init(int *argcp, char ***argvp) { HMODULE module; - /* When the manifest resource requests Common-Controls v6 then - * user32.dll no longer registers all the Windows classes used for - * standard controls but leaves some of them to be registered by - * comctl32.dll. InitCommonControls() doesn't do anything but calling - * it makes sure comctl32.dll gets loaded into the process and registers - * the standard control classes. Without this even normal Windows APIs - * like MessageBox() can fail under some versions of Windows XP. - */ - InitCommonControls(); - #ifdef SET_INVALID_PARAMETER_HANDLER _invalid_parameter_handler oldHandler, newHandler; newHandler = my_invalid_parameter_handler; @@ -4828,6 +4818,16 @@ Perl_win32_init(int *argcp, char ***argvp) #endif MALLOC_INIT; + /* When the manifest resource requests Common-Controls v6 then + * user32.dll no longer registers all the Windows classes used for + * standard controls but leaves some of them to be registered by + * comctl32.dll. InitCommonControls() doesn't do anything but calling + * it makes sure comctl32.dll gets loaded into the process and registers + * the standard control classes. Without this even normal Windows APIs + * like MessageBox() can fail under some versions of Windows XP. + */ + InitCommonControls(); + module = GetModuleHandle("ntdll.dll"); if (module) { *(FARPROC*)&pfnZwQuerySystemInformation = GetProcAddress(module, "ZwQuerySystemInformation"); |