Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 14:39:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSAPI][KERNEL32] Convert the PSAPI exports to a static library (#7708)

Browse source 
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@reactos.org>
This commit is contained in:
Justin Miller 2025-03-09 04:09:59 -07:00 committed by GitHub
parent 6dccccc2a3
commit bdda5b93d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 108 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/kernel32/CMakeLists.txt
View file

@ -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)

27
dll/win32/kernel32/kernel32.spec
View file

@ -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)

8
dll/win32/psapi/CMakeLists.txt
View file

@ -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)

74
dll/win32/psapi/main.c Normal file
View file

@ -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@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;
}

61
dll/win32/psapi/psapi.c
View file

@ -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
*/