wine-commits January 2021

wine-commits@winehq.org

2 participants
472 discussions

Rémi Bernon : widl: Support WinRT exclusiveto attribute parsing.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 73e0f5e212188714835c1d3eea02c08ffe71a0bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=73e0f5e212188714835c1d3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 15:36:30 2021 +0100 widl: Support WinRT exclusiveto attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 2f5f55905c5..7a811d537d1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -358,6 +358,7 @@ static const struct keyword attr_keywords[] = {"encode", tENCODE, 0}, {"endpoint", tENDPOINT, 0}, {"entry", tENTRY, 0}, + {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, {"force_allocate", tFORCEALLOCATE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4ce84cc2440..351bbd12107 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -196,6 +196,7 @@ static typelib_t *current_typelib; %token tDLLNAME tDONTFREE tDOUBLE tDUAL %token tENABLEALLOCATE tENCODE tENDPOINT %token tENTRY tENUM tERRORSTATUST +%token tEXCLUSIVETO %token tEXPLICITHANDLE tEXTERN %token tFALSE %token tFASTCALL tFAULTSTATUS @@ -561,6 +562,7 @@ attribute: { $$ = NULL; } | tENCODE { $$ = make_attr(ATTR_ENCODE); } | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY, $3); } + | tEXCLUSIVETO '(' decl_spec ')' { $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } @@ -2223,6 +2225,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_ENCODE */ { 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "encode" }, /* ATTR_ENDPOINT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, /* ATTR_ENTRY */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 6c130d4701e..fbaabfbc8c3 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -103,6 +103,7 @@ enum attr_type ATTR_ENCODE, ATTR_ENDPOINT, ATTR_ENTRY, + ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS, ATTR_FORCEALLOCATE,

1 0

Rémi Bernon : widl: Support WinRT mta threading attribute parsing.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 1abdd8c89a97f15ffee87526c67ef898f1c2b3e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1abdd8c89a97f15ffee87526… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 15:36:29 2021 +0100 widl: Support WinRT mta threading attribute parsing. As an alias to free-threaded model. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 01c6f800a08..2f5f55905c5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -385,6 +385,7 @@ static const struct keyword attr_keywords[] = {"marshaling_behavior", tMARSHALINGBEHAVIOR, 1}, {"maybe", tMAYBE, 0}, {"message", tMESSAGE, 0}, + {"mta" , tMTA, 0}, {"neutral", tNEUTRAL, 0}, {"nocode", tNOCODE, 0}, {"nonbrowsable", tNONBROWSABLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 48f180cdb49..4ce84cc2440 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -222,6 +222,7 @@ static typelib_t *current_typelib; %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE +%token tMTA %token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE @@ -1154,6 +1155,7 @@ threading_type: | tSINGLE { $$ = THREADING_SINGLE; } | tFREE { $$ = THREADING_FREE; } | tBOTH { $$ = THREADING_BOTH; } + | tMTA { $$ = THREADING_FREE; } ; pointer_type:

1 0

Zhiyi Zhang : wined3d: Support multiple outputs.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 98f490bdfcfaa4624ea56aaa6fb23c9143a32880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f490bdfcfaa4624ea56aaa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jan 25 22:22:19 2021 +0800 wined3d: Support multiple outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 5 ++-- dlls/d3d9/tests/device.c | 5 ++-- dlls/dxgi/device.c | 16 +---------- dlls/dxgi/swapchain.c | 20 +------------ dlls/dxgi/tests/dxgi.c | 26 ++--------------- dlls/wined3d/directx.c | 65 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_main.c | 4 +-- dlls/wined3d/wined3d_private.h | 2 -- 8 files changed, 60 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98f490bdfcfaa4624ea5…

1 0

Rémi Bernon : d3d11: Capture and restore pixel shader state.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 3904390ec58c020f2b3284024c10c3d228ec8548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3904390ec58c020f2b328402… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:29 2021 +0100 d3d11: Capture and restore pixel shader state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 7 +++ dlls/d3d11/device.c | 21 ++++++++ dlls/d3d11/tests/d3d11.c | 123 +++++++++++++++++++++++++++++++-------------- 3 files changed, 112 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3904390ec58c020f2b32…

1 0

Rémi Bernon : d3d11: Capture and restore geometry shader state.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: c119aa39903a280a385850a5b47733d549c203e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c119aa39903a280a385850a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:28 2021 +0100 d3d11: Capture and restore geometry shader state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 7 +++ dlls/d3d11/device.c | 21 +++++++ dlls/d3d11/tests/d3d11.c | 136 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 141 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c119aa39903a280a3858…

1 0

Rémi Bernon : d3d11: Capture and restore vertex shader state.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 2213e5a489618dd4d8b8582115187b852f4e38e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2213e5a489618dd4d8b85821… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:27 2021 +0100 d3d11: Capture and restore vertex shader state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 7 +++ dlls/d3d11/device.c | 47 +++++++++++++++++++ dlls/d3d11/tests/d3d11.c | 114 +++++++++++++++++++++++++++++++++++++-------- 3 files changed, 149 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2213e5a489618dd4d8b8…

1 0

Rémi Bernon : d3d11: Add initial implementation of SwapDeviceContextState.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: b85af44374eac736ad91331ee50a3697f8c1b20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b85af44374eac736ad91331e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:26 2021 +0100 d3d11: Add initial implementation of SwapDeviceContextState. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 1 + dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 31 +++++++++++++- dlls/d3d11/tests/d3d11.c | 102 +++++++++++++++++++++++++++++++++++++-------- 4 files changed, 116 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b85af44374eac736ad91…

1 0

Rémi Bernon : d3d11: Add initial implementation of CreateDeviceContextState.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 846276f3caf5325297eeeb722c592c5311b86bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=846276f3caf5325297eeeb72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:25 2021 +0100 d3d11: Add initial implementation of CreateDeviceContextState. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 12 ++++ dlls/d3d11/device.c | 142 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++------- 3 files changed, 206 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=846276f3caf5325297ee…

1 0

Alexandre Julliard : server: Get rid of the exe_file parameter in the new_process request.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 5ff2b7d98fc7fc892ca1a4171a0caab0f65a4e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff2b7d98fc7fc892ca1a417… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 16:38:38 2021 +0100 server: Get rid of the exe_file parameter in the new_process request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 1 - include/wine/server_protocol.h | 4 +--- server/process.c | 10 ---------- server/process.h | 1 - server/protocol.def | 1 - server/request.h | 11 +++++------ server/trace.c | 1 - 7 files changed, 6 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 57bb8002dfa..b8bbdaadbce 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -946,7 +946,6 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ req->inherit_all = !!(process_flags & PROCESS_CREATE_FLAGS_INHERIT_HANDLES); req->create_flags = params->DebugFlags; /* hack: creation flags stored in DebugFlags for now */ req->socket_fd = socketfd[1]; - req->exe_file = wine_server_obj_handle( file_handle ); req->access = process_access; req->cpu = pe_info.cpu; req->info_size = startup_info_size; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f070c604fdd..5201be51172 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -794,7 +794,6 @@ struct new_process_request int inherit_all; unsigned int create_flags; int socket_fd; - obj_handle_t exe_file; unsigned int access; client_cpu_t cpu; data_size_t info_size; @@ -803,7 +802,6 @@ struct new_process_request /* VARARG(handles,uints,handles_size); */ /* VARARG(info,startup_info,info_size); */ /* VARARG(env,unicode_str); */ - char __pad_52[4]; }; struct new_process_reply { @@ -6191,7 +6189,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 654 +#define SERVER_PROTOCOL_VERSION 655 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 4a366b4d3b0..3dabe0e6cfa 100644 --- a/server/process.c +++ b/server/process.c @@ -532,7 +532,6 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; process->idle_event = NULL; - process->exe_file = NULL; process->peb = 0; process->ldt_copy = 0; process->dir_cache = NULL; @@ -642,7 +641,6 @@ static void process_destroy( struct object *obj ) if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); - if (process->exe_file) release_object( process->exe_file ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); free( process->dir_cache ); @@ -912,9 +910,7 @@ static void process_killed( struct process *process ) close_process_handles( process ); cancel_process_asyncs( process ); if (process->idle_event) release_object( process->idle_event ); - if (process->exe_file) release_object( process->exe_file ); process->idle_event = NULL; - process->exe_file = NULL; assert( !process->console ); while ((ptr = list_head( &process->rawinput_devices ))) @@ -1237,10 +1233,6 @@ DECL_HANDLER(new_process) process->startup_info = (struct startup_info *)grab_object( info ); - if (req->exe_file && - !(process->exe_file = get_file_obj( current->process, req->exe_file, FILE_READ_DATA ))) - goto done; - if (parent->job && !(req->create_flags & CREATE_BREAKAWAY_FROM_JOB) && !(parent->job->limit_flags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)) @@ -1384,8 +1376,6 @@ DECL_HANDLER(init_process_done) process->ldt_copy = req->ldt_copy; process->start_time = current_time; current->entry_point = req->entry; - if (process->exe_file) release_object( process->exe_file ); - process->exe_file = NULL; init_process_tracing( process ); generate_startup_debug_events( process, req->entry ); diff --git a/server/process.h b/server/process.h index 374eda65b6b..9e765e16010 100644 --- a/server/process.h +++ b/server/process.h @@ -84,7 +84,6 @@ struct process enum startup_state startup_state; /* startup state */ struct startup_info *startup_info; /* startup info while init is in progress */ struct event *idle_event; /* event for input idle */ - struct file *exe_file; /* file handle for main exe (during startup only) */ obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ struct token *token; /* security token associated with this process */ diff --git a/server/protocol.def b/server/protocol.def index bac6b58e215..668da523690 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -808,7 +808,6 @@ typedef struct int inherit_all; /* inherit all handles from parent */ unsigned int create_flags; /* creation flags */ int socket_fd; /* file descriptor for process socket */ - obj_handle_t exe_file; /* file handle for main exe */ unsigned int access; /* access rights for process object */ client_cpu_t cpu; /* CPU that the new process will use */ data_size_t info_size; /* size of startup info */ diff --git a/server/request.h b/server/request.h index 972db53a889..e913615238b 100644 --- a/server/request.h +++ b/server/request.h @@ -710,12 +710,11 @@ C_ASSERT( FIELD_OFFSET(struct new_process_request, parent_process) == 16 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, inherit_all) == 20 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, create_flags) == 24 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, socket_fd) == 28 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, exe_file) == 32 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, access) == 36 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, cpu) == 40 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, info_size) == 44 ); -C_ASSERT( FIELD_OFFSET(struct new_process_request, handles_size) == 48 ); -C_ASSERT( sizeof(struct new_process_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, access) == 32 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, cpu) == 36 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, info_size) == 40 ); +C_ASSERT( FIELD_OFFSET(struct new_process_request, handles_size) == 44 ); +C_ASSERT( sizeof(struct new_process_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, info) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 ); diff --git a/server/trace.c b/server/trace.c index 750b83281c8..f1f47f9ea31 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1314,7 +1314,6 @@ static void dump_new_process_request( const struct new_process_request *req ) fprintf( stderr, ", inherit_all=%d", req->inherit_all ); fprintf( stderr, ", create_flags=%08x", req->create_flags ); fprintf( stderr, ", socket_fd=%d", req->socket_fd ); - fprintf( stderr, ", exe_file=%04x", req->exe_file ); fprintf( stderr, ", access=%08x", req->access ); dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", info_size=%u", req->info_size );

1 0

Alexandre Julliard : ntdll: Create a SEC_IMAGE view also for .so builtins.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: ced3892c65b33149a490b2c2191098c0c6aa1eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced3892c65b33149a490b2c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 11:55:37 2021 +0100 ntdll: Create a SEC_IMAGE view also for .so builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 47 +++++++++++++++++++++++------------------- include/wine/server_protocol.h | 3 ++- server/mapping.c | 30 ++++++++++++++++++++++++++- server/protocol.def | 3 ++- server/trace.c | 1 + 7 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5e2d5aeff7c..8caddb19abf 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1028,7 +1028,7 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_inf dlclose( handle ); return STATUS_NO_MEMORY; } - virtual_create_builtin_view( module ); + virtual_create_builtin_view( module, image_info ); *ret_module = module; return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index f8f50d0ab27..1d6ba95d2a1 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -179,7 +179,7 @@ extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_create_builtin_view( void *module ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e96bda722f6..c1e79a210f4 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2483,20 +2483,18 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_create_builtin_view */ -NTSTATUS virtual_create_builtin_view( void *module ) +NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) { NTSTATUS status; sigset_t sigset; IMAGE_DOS_HEADER *dos = module; IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)((char *)dos + dos->e_lfanew); - SIZE_T size = nt->OptionalHeader.SizeOfImage; + SIZE_T size = info->map_size; IMAGE_SECTION_HEADER *sec; struct file_view *view; - void *base; + void *base = wine_server_get_ptr( info->base ); int i; - size = ROUND_SIZE( module, size ); - base = ROUND_ADDR( module, page_mask ); server_enter_uninterrupted_section( &virtual_mutex, &sigset ); status = create_view( &view, base, size, SEC_IMAGE | SEC_FILE | VPROT_SYSTEM | VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); @@ -2517,10 +2515,25 @@ NTSTATUS virtual_create_builtin_view( void *module ) if (sec[i].Characteristics & IMAGE_SCN_MEM_WRITE) flags |= VPROT_WRITE; set_page_vprot( (char *)base + sec[i].VirtualAddress, sec[i].Misc.VirtualSize, flags ); } - VIRTUAL_DEBUG_DUMP_VIEW( view ); - if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; + + SERVER_START_REQ( map_view ) + { + req->base = wine_server_client_ptr( view->base ); + req->size = size; + wine_server_add_data( req, info, sizeof(*info) ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status >= 0) + { + VIRTUAL_DEBUG_DUMP_VIEW( view ); + if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; + } + else delete_view( view ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return status; } @@ -4065,22 +4078,14 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((view = find_view( addr, 0 )) && !is_view_valloc( view )) { - if (!(view->protect & VPROT_SYSTEM)) + SERVER_START_REQ( unmap_view ) { - SERVER_START_REQ( unmap_view ) - { - req->base = wine_server_client_ptr( view->base ); - status = wine_server_call( req ); - } - SERVER_END_REQ; - if (!status) delete_view( view ); - else FIXME( "failed to unmap %p %x\n", view->base, status ); - } - else - { - delete_view( view ); - status = STATUS_SUCCESS; + req->base = wine_server_client_ptr( view->base ); + status = wine_server_call( req ); } + SERVER_END_REQ; + if (!status) delete_view( view ); + else FIXME( "failed to unmap %p %x\n", view->base, status ); } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); return status; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0dd5803a79e..f070c604fdd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1903,6 +1903,7 @@ struct map_view_request client_ptr_t base; mem_size_t size; file_pos_t start; + /* VARARG(image,pe_image_info); */ }; struct map_view_reply { @@ -6190,7 +6191,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 653 +#define SERVER_PROTOCOL_VERSION 654 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 4e38e8e40da..9c51aa3bec7 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -316,6 +316,21 @@ static struct memory_view *find_mapped_view( struct process *process, client_ptr return NULL; } +/* add a view to the process list */ +static void add_process_view( struct process *process, struct memory_view *view ) +{ + if (view->flags & SEC_IMAGE) + { + if (!is_process_init_done( process ) && !(view->image.image_charact & IMAGE_FILE_DLL)) + { + /* main exe */ + list_add_head( &process->views, &view->entry ); + return; + } + } + list_add_tail( &process->views, &view->entry ); +} + static void free_memory_view( struct memory_view *view ) { if (view->fd) release_object( view->fd ); @@ -1097,6 +1112,19 @@ DECL_HANDLER(map_view) return; } + if (!req->mapping) /* image mapping for a .so dll */ + { + if (!(view = mem_alloc( sizeof(*view) ))) return; + memset( view, 0, sizeof(*view) ); + view->base = req->base; + view->size = req->size; + view->start = req->start; + view->flags = SEC_IMAGE; + memcpy( &view->image, get_req_data(), min( sizeof(view->image), get_req_data_size() )); + add_process_view( current->process, view ); + return; + } + if (!(mapping = get_mapping_obj( current->process, req->mapping, req->access ))) return; if (mapping->flags & SEC_IMAGE) @@ -1129,7 +1157,7 @@ DECL_HANDLER(map_view) view->image = mapping->image; if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); } - list_add_tail( &current->process->views, &view->entry ); + add_process_view( current->process, view ); } done: diff --git a/server/protocol.def b/server/protocol.def index e6c23aa77b0..bac6b58e215 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1515,11 +1515,12 @@ enum server_fd_type /* Add a memory view in the current process */ @REQ(map_view) - obj_handle_t mapping; /* file mapping handle */ + obj_handle_t mapping; /* file mapping handle, or 0 for .so builtin */ unsigned int access; /* wanted access rights */ client_ptr_t base; /* view base address (page-aligned) */ mem_size_t size; /* view size */ file_pos_t start; /* start offset in mapping */ + VARARG(image,pe_image_info);/* image info for .so builtins */ @END diff --git a/server/trace.c b/server/trace.c index 4c1ff57186b..750b83281c8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2107,6 +2107,7 @@ static void dump_map_view_request( const struct map_view_request *req ) dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); dump_uint64( ", start=", &req->start ); + dump_varargs_pe_image_info( ", image=", cur_size ); } static void dump_unmap_view_request( const struct unmap_view_request *req )

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2021