Module: wine Branch: master Commit: 1d368b3789c41612c07f78d4d5b41b13baca6c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d368b3789c41612c07f78d4d5b41b1...
Author: Alexandre Julliard julliard@winehq.org Date: Fri May 12 15:36:13 2023 +0200
server: Move the Wine-specific flags out of the image_flags field.
---
dlls/ntdll/unix/loader.c | 13 +++++-------- dlls/ntdll/unix/virtual.c | 2 +- include/wine/server_protocol.h | 8 ++++---- include/winternl.h | 5 ----- server/mapping.c | 8 ++++---- server/protocol.def | 6 +++--- 6 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 893f2566ed9..61743df7556 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -732,7 +732,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i ULONGLONG res_end = pe_info->base + pe_info->map_size; char preloader_reserve[64], socket_env[64];
- if (pe_info->image_flags & IMAGE_FLAGS_WineFakeDll) res_start = res_end = 0; + if (pe_info->wine_fakedll) res_start = res_end = 0; if (pe_info->image_flags & IMAGE_FLAGS_ComPlusNativeReady) machine = native_machine;
signal( SIGPIPE, SIG_DFL ); @@ -1131,12 +1131,12 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)module; const IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((const BYTE *)dos + dos->e_lfanew);
+ memset( info, 0, sizeof(*info) ); info->base = nt->OptionalHeader.ImageBase; info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; info->map_size = nt->OptionalHeader.SizeOfImage; info->stack_size = nt->OptionalHeader.SizeOfStackReserve; info->stack_commit = nt->OptionalHeader.SizeOfStackCommit; - info->zerobits = 0; info->subsystem = nt->OptionalHeader.Subsystem; info->subsystem_minor = nt->OptionalHeader.MinorSubsystemVersion; info->subsystem_major = nt->OptionalHeader.MajorSubsystemVersion; @@ -1146,13 +1146,10 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) info->dll_charact = nt->OptionalHeader.DllCharacteristics; info->machine = nt->FileHeader.Machine; info->contains_code = TRUE; - info->image_flags = IMAGE_FLAGS_WineBuiltin; - info->loader_flags = 0; + info->wine_builtin = TRUE; info->header_size = nt->OptionalHeader.SizeOfHeaders; info->file_size = nt->OptionalHeader.SizeOfImage; info->checksum = nt->OptionalHeader.CheckSum; - info->dbg_offset = 0; - info->dbg_size = 0; }
@@ -1573,12 +1570,12 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename,
if (loadorder == LO_DISABLED) return STATUS_DLL_NOT_FOUND;
- if (image_info->image_flags & IMAGE_FLAGS_WineBuiltin) + if (image_info->wine_builtin) { if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; loadorder = LO_BUILTIN_NATIVE; /* load builtin, then fallback to the file we found */ } - else if (image_info->image_flags & IMAGE_FLAGS_WineFakeDll) + else if (image_info->wine_fakedll) { TRACE( "%s is a fake Wine dll\n", debugstr_w(filename) ); if (loadorder == LO_NATIVE) return STATUS_DLL_NOT_FOUND; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index db9d7f1e323..b33b45ad07f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3042,7 +3042,7 @@ NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size *size = 0; filename = (WCHAR *)(image_info + 1);
- if (!(image_info->image_flags & IMAGE_FLAGS_WineBuiltin)) /* ignore non-builtins */ + if (!image_info->wine_builtin) /* ignore non-builtins */ { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_w(filename) ); status = STATUS_DLL_NOT_FOUND; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1c54d47a1a6..e9307cef1c9 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -834,7 +834,9 @@ typedef struct unsigned short image_charact; unsigned short dll_charact; unsigned short machine; - unsigned char contains_code; + unsigned char contains_code : 1; + unsigned char wine_builtin : 1; + unsigned char wine_fakedll : 1; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -849,8 +851,6 @@ typedef struct #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 #define IMAGE_FLAGS_ComPlusPrefer32bit 0x20 -#define IMAGE_FLAGS_WineBuiltin 0x40 -#define IMAGE_FLAGS_WineFakeDll 0x80
struct rawinput_device { @@ -6393,7 +6393,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 765 +#define SERVER_PROTOCOL_VERSION 766
/* ### protocol_version end ### */
diff --git a/include/winternl.h b/include/winternl.h index 4061843c4c7..df0f8dc1f84 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3251,12 +3251,7 @@ typedef struct _SECTION_IMAGE_INFORMATION { UCHAR ImageMappedFlat : 1; UCHAR BaseBelow4gb : 1; UCHAR ComPlusPrefer32bit : 1; -#ifdef __WINESRC__ /* Wine extensions */ - UCHAR WineBuiltin : 1; - UCHAR WineFakeDll : 1; -#else UCHAR Reserved : 2; -#endif } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; ULONG LoaderFlags; diff --git a/server/mapping.c b/server/mapping.c index bdfeef81da4..e0f4ad62f6e 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -803,10 +803,10 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.zerobits = 0; /* FIXME */ mapping->image.file_size = file_size; mapping->image.loader_flags = clr_va && clr_size; - if (mz_size == sizeof(mz) && !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineBuiltin; - else if (mz_size == sizeof(mz) && !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) )) - mapping->image.image_flags |= IMAGE_FLAGS_WineFakeDll; + mapping->image.wine_builtin = (mz_size == sizeof(mz) && + !memcmp( mz.buffer, builtin_signature, sizeof(builtin_signature) )); + mapping->image.wine_fakedll = (mz_size == sizeof(mz) && + !memcmp( mz.buffer, fakedll_signature, sizeof(fakedll_signature) ));
/* load the section headers */
diff --git a/server/protocol.def b/server/protocol.def index 26a26375069..1adda93b801 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -850,7 +850,9 @@ typedef struct unsigned short image_charact; unsigned short dll_charact; unsigned short machine; - unsigned char contains_code; + unsigned char contains_code : 1; + unsigned char wine_builtin : 1; + unsigned char wine_fakedll : 1; unsigned char image_flags; unsigned int loader_flags; unsigned int header_size; @@ -865,8 +867,6 @@ typedef struct #define IMAGE_FLAGS_ImageMappedFlat 0x08 #define IMAGE_FLAGS_BaseBelow4gb 0x10 #define IMAGE_FLAGS_ComPlusPrefer32bit 0x20 -#define IMAGE_FLAGS_WineBuiltin 0x40 -#define IMAGE_FLAGS_WineFakeDll 0x80
struct rawinput_device {