Improve startup, Fix delayload version check, Update delayload imports, Remove legacy imports

Author: dmex

ProcessHacker/ProcessHacker.vcxproj

@@ -106,14 +106,14 @@
       <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;shlwapi.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
       <MinimumRequiredVersion>6.01</MinimumRequiredVersion>
       <AdditionalLibraryDirectories>$(SolutionDir)phlib\bin\$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>ProcessHacker.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;shlwapi.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);$(ExternalCompilerOptions)</PreprocessorDefinitions>
@@ -138,14 +138,14 @@
       <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;shlwapi.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
       <MinimumRequiredVersion>6.01</MinimumRequiredVersion>
       <AdditionalLibraryDirectories>$(SolutionDir)phlib\bin\$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>ProcessHacker.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;shlwapi.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <ResourceCompile>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);$(ExternalCompilerOptions)</PreprocessorDefinitions>
@@ -175,7 +175,7 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;shlwapi.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -184,7 +184,7 @@
       <MinimumRequiredVersion>6.01</MinimumRequiredVersion>
       <AdditionalLibraryDirectories>$(SolutionDir)phlib\bin\$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>ProcessHacker.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;shlwapi.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <ResourceCompile>
@@ -213,7 +213,7 @@
       <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>aclui.lib;comctl32.lib;iphlpapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;shlwapi.lib;userenv.lib;uxtheme.lib;version.lib;wbemuuid.lib;windowscodecs.lib;winsta.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -222,7 +222,7 @@
       <MinimumRequiredVersion>6.01</MinimumRequiredVersion>
       <AdditionalLibraryDirectories>$(SolutionDir)phlib\bin\$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>ProcessHacker.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>advapi32.dll;aclui.dll;comdlg32.dll;comctl32.dll;gdi32.dll;iphlpapi.dll;oleaut32.dll;ole32.dll;shell32.dll;shlwapi.dll;userenv.dll;user32.dll;uxtheme.dll;version.dll;winsta.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <ResourceCompile>

ProcessHacker/mainwnd.c

@@ -606,43 +606,34 @@ VOID PhMwpOnCommand(
         break;
     case ID_HACKER_RUN:
         {
-            if (RunFileDlg)
-            {
-                SelectedRunAsMode = 0;
-                RunFileDlg(PhMainWndHandle, NULL, NULL, NULL, NULL, RFF_OPTRUNAS);
-            }
+            SelectedRunAsMode = 0;
+            PhShowRunFileDialog(PhMainWndHandle, NULL, NULL, NULL, NULL, RFF_OPTRUNAS);
         }
         break;
     case ID_HACKER_RUNASADMINISTRATOR:
         {
-            if (RunFileDlg)
-            {
-                SelectedRunAsMode = RUNAS_MODE_ADMIN;
-                RunFileDlg(
-                    PhMainWndHandle,
-                    NULL,
-                    NULL,
-                    NULL,
-                    L"Type the name of a program that will be opened under alternate credentials.",
-                    0
-                    );
-            }
+            SelectedRunAsMode = RUNAS_MODE_ADMIN;
+            PhShowRunFileDialog(
+                PhMainWndHandle,
+                NULL,
+                NULL,
+                NULL,
+                L"Type the name of a program that will be opened under alternate credentials.",
+                0
+                );
         }
         break;
     case ID_HACKER_RUNASLIMITEDUSER:
         {
-            if (RunFileDlg)
-            {
-                SelectedRunAsMode = RUNAS_MODE_LIMITED;
-                RunFileDlg(
-                    PhMainWndHandle,
-                    NULL,
-                    NULL,
-                    NULL,
-                    L"Type the name of a program that will be opened under standard user privileges.",
-                    0
-                    );
-            }
+            SelectedRunAsMode = RUNAS_MODE_LIMITED;
+            PhShowRunFileDialog(
+                PhMainWndHandle,
+                NULL,
+                NULL,
+                NULL,
+                L"Type the name of a program that will be opened under standard user privileges.",
+                0
+                );
         }
         break;
     case ID_HACKER_RUNAS:

ProcessHacker/procprv.c

@@ -864,9 +864,9 @@ VOID PhpProcessQueryStage1(
     }
 
     // Immersive
-    if (processHandleLimited && IsImmersiveProcess_I && !processItem->IsSubsystemProcess)
+    if (processHandleLimited && WINDOWS_HAS_IMMERSIVE && IsImmersiveProcess && !processItem->IsSubsystemProcess)
     {
-        Data->IsImmersive = !!IsImmersiveProcess_I(processHandleLimited);
+        Data->IsImmersive = !!IsImmersiveProcess(processHandleLimited);
     }
 
     // Package full name
@@ -2350,11 +2350,11 @@ VOID PhProcessProviderUpdate(
             }
 
             // Immersive
-            if (processItem->QueryHandle && IsImmersiveProcess_I)
+            if (processItem->QueryHandle && WINDOWS_HAS_IMMERSIVE && IsImmersiveProcess)
             {
                 BOOLEAN isImmersive;
 
-                isImmersive = !!IsImmersiveProcess_I(processItem->QueryHandle);
+                isImmersive = !!IsImmersiveProcess(processItem->QueryHandle);
 
                 if (processItem->IsImmersive != isImmersive)
                 {

ProcessHacker/runas.c

@@ -855,8 +855,8 @@ INT_PTR CALLBACK PhpRunAsDlgProc(
 
                 if (SendMessage(context->ProgramComboBoxWindowHandle, CB_GETCOMBOBOXINFO, 0, (LPARAM)&info))
                 {
-                    if (SHAutoComplete_I)
-                        SHAutoComplete_I(info.hwndItem, SHACF_DEFAULT);
+                    if (SHAutoComplete)
+                        SHAutoComplete(info.hwndItem, SHACF_DEFAULT);
                 }
             }
 

phlib/apiimport.c

@@ -62,6 +62,3 @@ PH_DEFINE_IMPORT(L"ntdll.dll", NtQueryInformationEnlistment);
 PH_DEFINE_IMPORT(L"ntdll.dll", NtQueryInformationResourceManager);
 PH_DEFINE_IMPORT(L"ntdll.dll", NtQueryInformationTransaction);
 PH_DEFINE_IMPORT(L"ntdll.dll", NtQueryInformationTransactionManager);
-PH_DEFINE_IMPORT(L"shell32.dll", SHCreateShellItem);
-PH_DEFINE_IMPORT(L"shell32.dll", SHOpenFolderAndSelectItems);
-PH_DEFINE_IMPORT(L"shell32.dll", SHParseDisplayName);

phlib/guisup.c

@@ -53,10 +53,6 @@ typedef struct _PH_WINDOW_PROPERTY_CONTEXT
     PVOID Context;
 } PH_WINDOW_PROPERTY_CONTEXT, *PPH_WINDOW_PROPERTY_CONTEXT;
 
-_IsImmersiveProcess IsImmersiveProcess_I = NULL;
-_RunFileDlg RunFileDlg = NULL;
-_SHAutoComplete SHAutoComplete_I = NULL;
-
 HFONT PhApplicationFont = NULL;
 HFONT PhTreeWindowFont = NULL;
 PH_INTEGER_PAIR PhSmallIconSize = { 16, 16 };
@@ -76,8 +72,6 @@ VOID PhGuiSupportInitialization(
     )
 {
     HDC hdc;
-    PVOID shell32Handle;
-    PVOID shlwapiHandle;
 
     WindowCallbackHashTable = PhCreateHashtable(
         sizeof(PH_PLUGIN_WINDOW_CALLBACK_REGISTRATION),
@@ -102,14 +96,6 @@ VOID PhGuiSupportInitialization(
         PhGlobalDpi = GetDeviceCaps(hdc, LOGPIXELSY);
         ReleaseDC(NULL, hdc);
     }
-
-    shell32Handle = LoadLibrary(L"shell32.dll");
-    shlwapiHandle = LoadLibrary(L"shlwapi.dll");
-
-    if (WINDOWS_HAS_IMMERSIVE)
-        IsImmersiveProcess_I = PhGetDllProcedureAddress(L"user32.dll", "IsImmersiveProcess", 0);
-    RunFileDlg = PhGetDllBaseProcedureAddress(shell32Handle, NULL, 61);
-    SHAutoComplete_I = PhGetDllBaseProcedureAddress(shlwapiHandle, "SHAutoComplete", 0);
 }
 
 VOID PhSetControlTheme(
@@ -1497,8 +1483,8 @@ HWND PhGetProcessMainWindowEx(
     else
         PhOpenProcess(&processHandle, PROCESS_QUERY_LIMITED_INFORMATION, ProcessId);
 
-    if (processHandle && IsImmersiveProcess_I)
-        context.IsImmersive = IsImmersiveProcess_I(processHandle);
+    if (processHandle && WINDOWS_HAS_IMMERSIVE && IsImmersiveProcess)
+        context.IsImmersive = IsImmersiveProcess(processHandle);
 
     PhEnumChildWindows(NULL, 0x800, PhpGetProcessMainWindowEnumWindowsProc, &context);
 
@@ -1676,3 +1662,43 @@ VOID PhWindowNotifyTopMostEvent(
 
     PhReleaseQueuedLockExclusive(&WindowCallbackListLock);
 }
+
+BOOLEAN PhShowRunFileDialog(
+    _In_ HWND WindowHandle,
+    _In_opt_ HICON WindowIcon,
+    _In_opt_ PWSTR WorkingDirectory,
+    _In_opt_ PWSTR WindowTitle,
+    _In_opt_ PWSTR WindowDescription,
+    _In_ ULONG Flags
+    )
+{
+    BOOL (WINAPI *RunFileDlg_I)(
+        _In_ HWND hwndOwner,
+        _In_opt_ HICON hIcon,
+        _In_opt_ LPCWSTR lpszDirectory,
+        _In_opt_ LPCWSTR lpszTitle,
+        _In_opt_ LPCWSTR lpszDescription,
+        _In_ ULONG uFlags
+        );
+    BOOLEAN result = FALSE;
+    PVOID shell32Handle;
+
+    if (shell32Handle = LoadLibrary(L"shell32.dll"))
+    {
+        if (RunFileDlg_I = PhGetDllBaseProcedureAddress(shell32Handle, NULL, 61))
+        {
+            result = !!RunFileDlg_I(
+                WindowHandle,
+                WindowIcon,
+                WorkingDirectory,
+                WindowTitle,
+                WindowDescription,
+                Flags
+                );
+        }
+
+        FreeLibrary(shell32Handle);
+    }
+
+    return result;
+}

phlib/include/apiimport.h

@@ -35,42 +35,11 @@ typedef NTSTATUS (NTAPI *_NtQueryInformationTransactionManager)(
     _Out_opt_ PULONG ReturnLength
     );
 
-// shell32
-
-#if defined(_M_IX86)
-#define __unaligned
-#endif
-
-typedef HRESULT (WINAPI *_SHCreateShellItem)(
-    _In_opt_ const struct _ITEMIDLIST __unaligned *pidlParent,
-    _In_opt_ struct IShellFolder *psfParent,
-    _In_ const struct _ITEMIDLIST __unaligned *pidl,
-    _Out_ struct IShellItem **ppsi
-    );
-
-typedef HRESULT (WINAPI *_SHOpenFolderAndSelectItems)(
-    _In_ const struct _ITEMIDLIST __unaligned *pidlFolder,
-    _In_ UINT cidl,
-    _In_reads_opt_(cidl) const struct _ITEMIDLIST __unaligned **apidl,
-    _In_ ULONG dwFlags
-    );
-
-typedef HRESULT (WINAPI *_SHParseDisplayName)(
-    _In_ LPCWSTR pszName,
-    _In_opt_ struct IBindCtx *pbc,
-    _Out_ const struct _ITEMIDLIST __unaligned **ppidl,
-    _In_ ULONG sfgaoIn,
-    _Out_ ULONG *psfgaoOut
-    );
-
 #define PH_DECLARE_IMPORT(Name) _##Name Name##_Import(VOID)
 
 PH_DECLARE_IMPORT(NtQueryInformationEnlistment);
 PH_DECLARE_IMPORT(NtQueryInformationResourceManager);
 PH_DECLARE_IMPORT(NtQueryInformationTransaction);
 PH_DECLARE_IMPORT(NtQueryInformationTransactionManager);
-PH_DECLARE_IMPORT(SHCreateShellItem);
-PH_DECLARE_IMPORT(SHOpenFolderAndSelectItems);
-PH_DECLARE_IMPORT(SHParseDisplayName);
 
 #endif

phlib/include/guisup.h

@@ -11,10 +11,6 @@ extern "C" {
 
 // guisup
 
-typedef BOOL (WINAPI *_IsImmersiveProcess)(
-    _In_ HANDLE hProcess
-    );
-
 #define RFF_NOBROWSE 0x0001
 #define RFF_NODEFAULT 0x0002
 #define RFF_CALCDIRECTORY 0x0004
@@ -43,24 +39,6 @@ typedef LPNMRUNFILEDLGW LPNMRUNFILEDLG;
 
 typedef HANDLE HTHEME;
 
-typedef BOOL (WINAPI *_RunFileDlg)(
-    _In_ HWND hwndOwner,
-    _In_opt_ HICON hIcon,
-    _In_opt_ LPCWSTR lpszDirectory,
-    _In_opt_ LPCWSTR lpszTitle,
-    _In_opt_ LPCWSTR lpszDescription,
-    _In_ ULONG uFlags
-    );
-
-typedef HRESULT (WINAPI *_SHAutoComplete)(
-    _In_ HWND hwndEdit,
-    _In_ ULONG dwFlags
-    );
-
-extern _IsImmersiveProcess IsImmersiveProcess_I;
-extern _RunFileDlg RunFileDlg;
-extern _SHAutoComplete SHAutoComplete_I;
-
 extern PH_INTEGER_PAIR PhSmallIconSize;
 extern PH_INTEGER_PAIR PhLargeIconSize;
 
@@ -905,6 +883,18 @@ PhWindowNotifyTopMostEvent(
     _In_ BOOLEAN TopMost
     );
 
+PHLIBAPI
+BOOLEAN
+NTAPI
+PhShowRunFileDialog(
+    _In_ HWND WindowHandle,
+    _In_opt_ HICON WindowIcon,
+    _In_opt_ PWSTR WorkingDirectory,
+    _In_opt_ PWSTR WindowTitle,
+    _In_opt_ PWSTR WindowDescription,
+    _In_ ULONG Flags
+    );
+
 // theme support (theme.c)
 
 PHLIBAPI extern HFONT PhApplicationFont; // phapppub