Alexandre Julliard : ntdll: Rename the SYSTEM_MODULE and SYSTEM_MODULE_INFORMATION structures.
Alexandre Julliard
julliard at winehq.org
Tue Jul 27 15:51:00 CDT 2021
Module: wine
Branch: master
Commit: eb6fcd3cb9265de0ccf5e9cc767992f5939325c3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb6fcd3cb9265de0ccf5e9cc767992f5939325c3
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jul 27 16:38:45 2021 +0200
ntdll: Rename the SYSTEM_MODULE and SYSTEM_MODULE_INFORMATION structures.
To be consistent with the _EX version.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/loader.c | 4 ++--
dlls/ntdll/tests/info.c | 6 +++---
dlls/ntdll/unix/system.c | 8 ++++----
include/winternl.h | 14 +++++++-------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 3339596944a..2b840a864a6 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3119,10 +3119,10 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count
* LdrQueryProcessModuleInformation
*
*/
-NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi,
+NTSTATUS WINAPI LdrQueryProcessModuleInformation(RTL_PROCESS_MODULES *smi,
ULONG buf_size, ULONG* req_size)
{
- SYSTEM_MODULE* sm = &smi->Modules[0];
+ RTL_PROCESS_MODULE_INFORMATION *sm = &smi->Modules[0];
ULONG size = sizeof(ULONG);
NTSTATUS nts = STATUS_SUCCESS;
ANSI_STRING str;
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index c7c849d2537..ccce197206b 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -635,7 +635,7 @@ static void test_query_procperf(void)
static void test_query_module(void)
{
const RTL_PROCESS_MODULE_INFORMATION_EX *infoex;
- SYSTEM_MODULE_INFORMATION *info;
+ RTL_PROCESS_MODULES *info;
NTSTATUS status;
ULONG size, i;
char *buffer;
@@ -652,7 +652,7 @@ static void test_query_module(void)
for (i = 0; i < info->ModulesCount; i++)
{
- const SYSTEM_MODULE *module = &info->Modules[i];
+ RTL_PROCESS_MODULE_INFORMATION *module = &info->Modules[i];
ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
@@ -678,7 +678,7 @@ static void test_query_module(void)
infoex = (const void *)buffer;
for (i = 0; infoex->NextOffset; i++)
{
- const SYSTEM_MODULE *module = &infoex->BaseInfo;
+ const RTL_PROCESS_MODULE_INFORMATION *module = &infoex->BaseInfo;
ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index fcc0fb6677e..94961ed524e 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -2450,15 +2450,15 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
};
ULONG i;
- SYSTEM_MODULE_INFORMATION *smi = info;
+ RTL_PROCESS_MODULES *smi = info;
- len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] );
+ len = offsetof( RTL_PROCESS_MODULES, Modules[ARRAY_SIZE(fake_modules)] );
if (len <= size)
{
memset( smi, 0, len );
for (i = 0; i < ARRAY_SIZE(fake_modules); i++)
{
- SYSTEM_MODULE *sm = &smi->Modules[i];
+ RTL_PROCESS_MODULE_INFORMATION *sm = &smi->Modules[i];
sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i;
sm->ImageSize = 0x200000;
sm->LoadOrderIndex = i;
@@ -2814,7 +2814,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
memset( info, 0, len );
for (i = 0; i < ARRAY_SIZE(fake_modules); i++)
{
- SYSTEM_MODULE *sm = &module_info[i].BaseInfo;
+ RTL_PROCESS_MODULE_INFORMATION *sm = &module_info[i].BaseInfo;
sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i;
sm->ImageSize = 0x200000;
sm->LoadOrderIndex = i;
diff --git a/include/winternl.h b/include/winternl.h
index 20905486766..7d732d895d9 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -3391,7 +3391,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT
/* FIXME: to be checked */
#define MAXIMUM_FILENAME_LENGTH 256
-typedef struct _SYSTEM_MODULE
+typedef struct _RTL_PROCESS_MODULE_INFORMATION
{
PVOID Section; /* 00/00 */
PVOID MappedBaseAddress; /* 04/08 */
@@ -3403,13 +3403,13 @@ typedef struct _SYSTEM_MODULE
WORD LoadCount; /* 18/24 */
WORD NameOffset; /* 1a/26 */
BYTE Name[MAXIMUM_FILENAME_LENGTH]; /* 1c/28 */
-} SYSTEM_MODULE, *PSYSTEM_MODULE;
+} RTL_PROCESS_MODULE_INFORMATION, *PRTL_PROCESS_MODULE_INFORMATION;
-typedef struct _SYSTEM_MODULE_INFORMATION
+typedef struct _RTL_PROCESS_MODULES
{
ULONG ModulesCount;
- SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */
-} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
+ RTL_PROCESS_MODULE_INFORMATION Modules[1]; /* FIXME: should be Modules[0] */
+} RTL_PROCESS_MODULES, *PRTL_PROCESS_MODULES;
#define PROCESS_CREATE_FLAGS_BREAKAWAY 0x00000001
#define PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT 0x00000002
@@ -3426,7 +3426,7 @@ typedef struct _SYSTEM_MODULE_INFORMATION
typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX
{
USHORT NextOffset;
- SYSTEM_MODULE BaseInfo;
+ RTL_PROCESS_MODULE_INFORMATION BaseInfo;
ULONG ImageCheckSum;
ULONG TimeDateStamp;
void *DefaultBase;
@@ -3779,7 +3779,7 @@ NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMOD
NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*);
IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR);
NTSYSAPI NTSTATUS WINAPI LdrQueryImageFileExecutionOptions(const UNICODE_STRING*,LPCWSTR,ULONG,void*,ULONG,ULONG*);
-NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*);
+NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(RTL_PROCESS_MODULES*, ULONG, ULONG*);
NTSYSAPI NTSTATUS WINAPI LdrRegisterDllNotification(ULONG,PLDR_DLL_NOTIFICATION_FUNCTION,void*,void**);
NTSYSAPI NTSTATUS WINAPI LdrRemoveDllDirectory(void*);
NTSYSAPI NTSTATUS WINAPI LdrSetDefaultDllDirectories(ULONG);
More information about the wine-cvs
mailing list