[ros-diffs] [reactos] 01/01: [PSAPI][KERNEL32] Convert the PSAPI exports to a static library (#7708)

[Justin Miller]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdda5b93d714adbe828fe…
commit bdda5b93d714adbe828fe18c5cb785ed76f8861f
Author:     Justin Miller <justin.miller(a)reactos.org>
AuthorDate: Sun Mar 9 04:09:59 2025 -0700
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sun Mar 9 04:09:59 2025 -0700
    [PSAPI][KERNEL32] Convert the PSAPI exports to a static library (#7708)
    This behavior is straight out of win7 where this logic was moved to
    KernelBase and friends. Required for thousands of apps. But also just
    preps for the KernelBase sync from Wine-10
    Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
---
 dll/win32/kernel32/CMakeLists.txt |  2 +-
 dll/win32/kernel32/kernel32.spec  | 27 ++++++++++++++
 dll/win32/psapi/CMakeLists.txt    |  8 +++--
 dll/win32/psapi/main.c            | 74 +++++++++++++++++++++++++++++++++++++++
 dll/win32/psapi/psapi.c           | 61 --------------------------------
 5 files changed, 108 insertions(+), 64 deletions(-)
diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index 4661ef9b0cb..b037e697800 100644
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -130,7 +130,7 @@ set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12)
 set_subsystem(kernel32 console)
 ################# END  HACK #################
-target_link_libraries(kernel32 kernel32_vista_static kernel32_shared wine chkstk
${PSEH_LIB})
+target_link_libraries(kernel32 psapi_static kernel32_vista_static kernel32_shared wine
chkstk ${PSEH_LIB})
 add_importlibs(kernel32 ntdll)
 add_pch(kernel32 k32.h SOURCE)
 add_dependencies(kernel32 psdk errcodes asm)
diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec
index 831681d1aaa..149a4f8f7ba 100644
--- a/dll/win32/kernel32/kernel32.spec
+++ b/dll/win32/kernel32/kernel32.spec
@@ -760,6 +760,33 @@
 @ stdcall IsValidLocale(long long)
 @ stdcall -version=0x501-0x502 IsValidUILanguage(long)
 @ stdcall IsWow64Process(ptr ptr)
+@ stdcall -version=0x601+ K32EmptyWorkingSet(long) EmptyWorkingSet
+@ stdcall -version=0x601+ K32EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
+@ stdcall -version=0x601+ K32EnumPageFilesA(ptr ptr) EnumPageFilesA
+@ stdcall -version=0x601+ K32EnumPageFilesW(ptr ptr) EnumPageFilesW
+@ stdcall -version=0x601+ K32EnumProcessModules(long ptr long ptr) EnumProcessModules
+@ stdcall -stub -version=0x601+ K32EnumProcessModulesEx(long ptr long ptr long);
EnumProcessModulesEx
+@ stdcall -version=0x601+ K32EnumProcesses(ptr long ptr) EnumProcesses
+@ stdcall -version=0x601+ K32GetDeviceDriverBaseNameA(ptr ptr long)
GetDeviceDriverBaseNameA
+@ stdcall -version=0x601+ K32GetDeviceDriverBaseNameW(ptr ptr long)
GetDeviceDriverBaseNameW
+@ stdcall -version=0x601+ K32GetDeviceDriverFileNameA(ptr ptr long)
GetDeviceDriverFileNameA
+@ stdcall -version=0x601+ K32GetDeviceDriverFileNameW(ptr ptr long)
GetDeviceDriverFileNameW
+@ stdcall -version=0x601+ K32GetMappedFileNameA(long ptr ptr long) GetMappedFileNameA
+@ stdcall -version=0x601+ K32GetMappedFileNameW(long ptr ptr long) GetMappedFileNameW
+@ stdcall -version=0x601+ K32GetModuleBaseNameA(long long ptr long) GetModuleBaseNameA
+@ stdcall -version=0x601+ K32GetModuleBaseNameW(long long ptr long) GetModuleBaseNameW
+@ stdcall -version=0x601+ K32GetModuleFileNameExA(long long ptr long)
GetModuleFileNameExA
+@ stdcall -version=0x601+ K32GetModuleFileNameExW(long long ptr long)
GetModuleFileNameExW
+@ stdcall -version=0x601+ K32GetModuleInformation(long long ptr long)
GetModuleInformation
+@ stdcall -version=0x601+ K32GetPerformanceInfo(ptr long) GetPerformanceInfo
+@ stdcall -version=0x601+ K32GetProcessImageFileNameA(long ptr long)
GetProcessImageFileNameA
+@ stdcall -version=0x601+ K32GetProcessImageFileNameW(long ptr long)
GetProcessImageFileNameW
+@ stdcall -version=0x601+ K32GetProcessMemoryInfo(long ptr long) GetProcessMemoryInfo
+@ stdcall -version=0x601+ K32GetWsChanges(long ptr long) GetWsChanges
+@ stdcall -stub -version=0x601+ K32GetWsChangesEx(long ptr ptr); GetWsChangesEx
+@ stdcall -version=0x601+ K32InitializeProcessForWsWatch(long)
InitializeProcessForWsWatch
+@ stdcall -version=0x601+ K32QueryWorkingSet(long ptr long) QueryWorkingSet
+@ stdcall -version=0x601+ K32QueryWorkingSetEx(long ptr long) QueryWorkingSetEx
 @ stdcall -version=0x600+ LCIDToLocaleName(long wstr long long)
 @ stdcall LCMapStringA(long long str long ptr long)
 @ stdcall -version=0x600+ LCMapStringEx(long long wstr long ptr long ptr ptr long)
diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt
index 60c1398b70e..8a45c7b5d2e 100644
--- a/dll/win32/psapi/CMakeLists.txt
+++ b/dll/win32/psapi/CMakeLists.txt
@@ -1,13 +1,17 @@
 spec2def(psapi.dll psapi.spec ADD_IMPORTLIB)
+list(APPEND PSAPI_STATIC_SOURCE psapi.c)
+add_library(psapi_static ${PSAPI_STATIC_SOURCE})
+add_dependencies(psapi_static psdk)
+
 list(APPEND SOURCE
-    psapi.c
+    main.c
     psapi.rc
     ${CMAKE_CURRENT_BINARY_DIR}/psapi.def)
 add_library(psapi MODULE ${SOURCE})
 set_module_type(psapi win32dll ENTRYPOINT DllMain 12)
-target_link_libraries(psapi ${PSEH_LIB})
+target_link_libraries(psapi psapi_static ${PSEH_LIB})
 add_importlibs(psapi kernel32 ntdll)
 add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/psapi/main.c b/dll/win32/psapi/main.c
new file mode 100644
index 00000000000..f93f2ca9c93
--- /dev/null
+++ b/dll/win32/psapi/main.c
@@ -0,0 +1,74 @@
+/*
+ * PROJECT:     ReactOS Process Status Helper Library
+ * LICENSE:     MIT (https://spdx.org/licenses/MIT)
+ * PURPOSE:     PSAPI Win2k3 style entrypoint
+ * COPYRIGHT:   Copyright 2013 Pierre Schweitzer <pierre(a)reactos.org>
+ */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+#define NTOS_MODE_USER
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+
+#include <psapi.h>
+
+#define NDEBUG
+#include <debug.h>
+
+static
+VOID
+NTAPI
+PsParseCommandLine(VOID)
+{
+    UNIMPLEMENTED;
+}
+
+static
+VOID
+NTAPI
+PsInitializeAndStartProfile(VOID)
+{
+    UNIMPLEMENTED;
+}
+
+static
+VOID
+NTAPI
+PsStopAndAnalyzeProfile(VOID)
+{
+    UNIMPLEMENTED;
+}
+
+/*
+ * @implemented
+ */
+BOOLEAN
+WINAPI
+DllMain(HINSTANCE hDllHandle,
+        DWORD nReason,
+        LPVOID Reserved)
+{
+    switch(nReason)
+    {
+        case DLL_PROCESS_ATTACH:
+            DisableThreadLibraryCalls(hDllHandle);
+            if (NtCurrentPeb()->ProcessParameters->Flags &
RTL_USER_PROCESS_PARAMETERS_PROFILE_USER)
+            {
+                PsParseCommandLine();
+                PsInitializeAndStartProfile();
+            }
+            break;
+
+        case DLL_PROCESS_DETACH:
+            if (NtCurrentPeb()->ProcessParameters->Flags &
RTL_USER_PROCESS_PARAMETERS_PROFILE_USER)
+            {
+                PsStopAndAnalyzeProfile();
+            }
+            break;
+    }
+    return TRUE;
+}
diff --git a/dll/win32/psapi/psapi.c b/dll/win32/psapi/psapi.c
index c73f3176d3b..bf47f8e2ceb 100644
--- a/dll/win32/psapi/psapi.c
+++ b/dll/win32/psapi/psapi.c
@@ -244,67 +244,6 @@ CallBackConvertToAscii(LPVOID pContext,
     return Ret;
 }
-/*
- * @unimplemented
- */
-static VOID NTAPI
-PsParseCommandLine(VOID)
-{
-    UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-static VOID NTAPI
-PsInitializeAndStartProfile(VOID)
-{
-    UNIMPLEMENTED;
-}
-
-/*
- * @unimplemented
- */
-static VOID NTAPI
-PsStopAndAnalyzeProfile(VOID)
-{
-    UNIMPLEMENTED;
-}
-
-/* PUBLIC *********************************************************************/
-
-/*
- * @implemented
- */
-BOOLEAN
-WINAPI
-DllMain(HINSTANCE hDllHandle,
-        DWORD nReason,
-        LPVOID Reserved)
-{
-    switch(nReason)
-    {
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hDllHandle);
-            if (NtCurrentPeb()->ProcessParameters->Flags &
RTL_USER_PROCESS_PARAMETERS_PROFILE_USER)
-            {
-                PsParseCommandLine();
-                PsInitializeAndStartProfile();
-            }
-            break;
-
-        case DLL_PROCESS_DETACH:
-            if (NtCurrentPeb()->ProcessParameters->Flags &
RTL_USER_PROCESS_PARAMETERS_PROFILE_USER)
-            {
-                PsStopAndAnalyzeProfile();
-            }
-            break;
-    }
-
-    return TRUE;
-}
-
-
 /*
  * @implemented
  */