January 2021 - wine-commits

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

Alexandre Julliard : ntdll: Fill the image information data also for .so builtins.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 6b90b96e2181385d7ff01b408eb95d246e5a0bde URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b90b96e2181385d7ff01b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 26 11:55:02 2021 +0100 ntdll: Fill the image information data also for .so builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 955b1817ac3..5e2d5aeff7c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -945,10 +945,43 @@ static void load_libwine(void) } +/*********************************************************************** + * fill_builtin_image_info + */ +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); + + info->base = nt->OptionalHeader.ImageBase; + info->entry_point = info->base + 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; + info->osversion_major = nt->OptionalHeader.MajorOperatingSystemVersion; + info->osversion_minor = nt->OptionalHeader.MinorOperatingSystemVersion; + info->image_charact = nt->FileHeader.Characteristics; + 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->header_size = nt->OptionalHeader.SizeOfHeaders; + info->file_size = nt->OptionalHeader.SizeOfImage; + info->checksum = nt->OptionalHeader.CheckSum; + info->cpu = client_cpu; + info->__pad = 0; +} + + /*********************************************************************** * dlopen_dll */ -static NTSTATUS dlopen_dll( const char *so_name, void **ret_module ) +static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_info_t *image_info ) { struct builtin_module *builtin; void *module, *handle; @@ -988,6 +1021,8 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module ) return STATUS_INVALID_IMAGE_FORMAT; } + fill_builtin_image_info( module, image_info ); + if (add_builtin_module( module, handle, NULL )) { dlclose( handle ); @@ -998,6 +1033,7 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module ) return STATUS_SUCCESS; already_loaded: + fill_builtin_image_info( builtin->module, image_info ); *ret_module = builtin->module; dlclose( handle ); return STATUS_SUCCESS; @@ -1060,6 +1096,7 @@ done: static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) { static const WCHAR soW[] = {'.','s','o',0}; + pe_image_info_t info; char *unix_name; NTSTATUS status; DWORD len; @@ -1070,7 +1107,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) len = nt_name->Length / sizeof(WCHAR); if (len > 3 && !wcsicmp( nt_name->Buffer + len - 3, soW )) nt_name->Length -= 3 * sizeof(WCHAR); - status = dlopen_dll( unix_name, module ); + status = dlopen_dll( unix_name, module, &info ); free( unix_name ); return status; } @@ -1223,10 +1260,11 @@ static NTSTATUS open_builtin_file( char *name, HANDLE *mapping, void **module, { if (check_library_arch( fd )) { - if (!dlopen_dll( name, module )) + pe_image_info_t info; + + if (!dlopen_dll( name, module, &info )) { - memset( image_info, 0, sizeof(*image_info) ); - image_info->u.ImageFlags = IMAGE_FLAGS_WineBuiltin; + virtual_fill_image_information( &info, image_info ); status = STATUS_SUCCESS; } else

1 0

Alexandre Julliard : ntdll: Set the environment size in the process parameters.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: dc90fe9a947cb04d2ea80acd0770514845e93989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc90fe9a947cb04d2ea80acd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 13 15:23:28 2021 +0100 ntdll: Set the environment size in the process parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50405 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 25 +++++++++++++------- dlls/ntdll/tests/env.c | 64 +++++++++++++++++++++++++++++++++++++++----------- include/winternl.h | 5 ++++ 3 files changed, 71 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc90fe9a947cb04d2ea8…

1 0

Jacek Caban : winebuild: Make mingw a separated platform from msvc.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: ea5e89a545c1a846911e02c73d629246d040e1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea5e89a545c1a846911e02c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 25 15:24:23 2021 +0100 winebuild: Make mingw a separated platform from msvc. Based on winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 6 ++++++ tools/winebuild/import.c | 6 +++--- tools/winebuild/main.c | 21 +++++++++++---------- tools/winebuild/relay.c | 2 +- tools/winebuild/res32.c | 2 +- tools/winebuild/spec32.c | 14 +++++++------- tools/winebuild/utils.c | 15 ++++++++++++--- 7 files changed, 41 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea5e89a545c1a846911e…

1 0

Zebediah Figura : winegstreamer: Don't force query_function() onto a Wine thread.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 6e21a8cc31fb0ccffad004d0b2cd721e5aa41c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e21a8cc31fb0ccffad004d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:07 2021 -0600 winegstreamer: Don't force query_function() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 4b22c445798..6c5877ce785 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -147,19 +147,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) call_cb(&cbdata); } -gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) -{ - struct cb_data cbdata = { QUERY_FUNCTION }; - - cbdata.u.query_function_data.pad = pad; - cbdata.u.query_function_data.parent = parent; - cbdata.u.query_function_data.query = query; - - call_cb(&cbdata); - - return cbdata.u.query_function_data.ret; -} - gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) { struct cb_data cbdata = { ACTIVATE_MODE }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index c7c559c664c..f063a0a2a7b 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -31,7 +31,6 @@ typedef enum { enum CB_TYPE { EXISTING_NEW_PAD, - QUERY_FUNCTION, ACTIVATE_MODE, REQUEST_BUFFER_SRC, REMOVED_DECODED_PAD, @@ -117,7 +116,6 @@ void perform_cb_gstdemux(struct cb_data *data) DECLSPEC_HIDDEN; void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; -gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a6ecaafd81b..5181d0951d5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1516,7 +1516,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); - gst_pad_set_query_function(This->my_src, query_function_wrapper); + gst_pad_set_query_function(This->my_src, query_function); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); @@ -2434,12 +2434,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) existing_new_pad(data->element, data->pad, data->user); break; } - case QUERY_FUNCTION: - { - struct query_function_data *data = &cbdata->u.query_function_data; - cbdata->u.query_function_data.ret = query_function(data->pad, data->parent, data->query); - break; - } case ACTIVATE_MODE: { struct activate_mode_data *data = &cbdata->u.activate_mode_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debugging functions in query_function().
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: e9a1366028ef4aff3899884aa7b0f391eb808c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a1366028ef4aff3899884a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:06 2021 -0600 winegstreamer: Avoid using Wine debugging functions in query_function(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b6c92e4807c..a6ecaafd81b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1321,7 +1321,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) struct parser *This = gst_pad_get_element_private(pad); GstFormat format; - TRACE("filter %p, type %s.\n", This, GST_QUERY_TYPE_NAME(query)); + GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query)); switch (GST_QUERY_TYPE(query)) { case GST_QUERY_DURATION: @@ -1341,7 +1341,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_seeking (query, &format, NULL, NULL, NULL); if (format != GST_FORMAT_BYTES) { - WARN("Cannot seek using format \"%s\".\n", gst_format_get_name(format)); + GST_WARNING("Cannot seek using format \"%s\".", gst_format_get_name(format)); return FALSE; } gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, This->filesize); @@ -1352,7 +1352,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_add_scheduling_mode(query, GST_PAD_MODE_PULL); return TRUE; default: - WARN("Unhandled query type %s.\n", GST_QUERY_TYPE_NAME(query)); + GST_WARNING("Unhandled query type %s.", GST_QUERY_TYPE_NAME(query)); return FALSE; } }

1 0

Zebediah Figura : winegstreamer: Don't force event_src() onto a Wine thread.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 1655dd4593d8be39d9f4058d157c6c682903a33a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1655dd4593d8be39d9f4058d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:05 2021 -0600 winegstreamer: Don't force event_src() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index ce7c0de4e1a..4b22c445798 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -190,19 +190,6 @@ GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 return cbdata.u.getrange_data.ret; } -gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) -{ - struct cb_data cbdata = { EVENT_SRC }; - - cbdata.u.event_src_data.pad = pad; - cbdata.u.event_src_data.parent = parent; - cbdata.u.event_src_data.event = event; - - call_cb(&cbdata); - - return cbdata.u.event_src_data.ret; -} - void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { REMOVED_DECODED_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 29aa2bd662c..c7c559c664c 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -34,7 +34,6 @@ enum CB_TYPE { QUERY_FUNCTION, ACTIVATE_MODE, REQUEST_BUFFER_SRC, - EVENT_SRC, REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, @@ -121,7 +120,6 @@ void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLS gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; -gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3efec0f5295..b6c92e4807c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1518,7 +1518,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_pad_set_getrange_function(This->my_src, request_buffer_src_wrapper); gst_pad_set_query_function(This->my_src, query_function_wrapper); gst_pad_set_activatemode_function(This->my_src, activate_mode_wrapper); - gst_pad_set_event_function(This->my_src, event_src_wrapper); + gst_pad_set_event_function(This->my_src, event_src); gst_pad_set_element_private (This->my_src, This); This->start = This->nextofs = This->nextpullofs = This->stop = 0; @@ -2453,12 +2453,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) data->ofs, data->len, data->buf); break; } - case EVENT_SRC: - { - struct event_src_data *data = &cbdata->u.event_src_data; - cbdata->u.event_src_data.ret = event_src(data->pad, data->parent, data->event); - break; - } case REMOVED_DECODED_PAD: { struct pad_removed_data *data = &cbdata->u.pad_removed_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debugging functions in event_src().
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 3ed270206a918a4fc15fc80c0d4807e0d635d112 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed270206a918a4fc15fc80c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:04 2021 -0600 winegstreamer: Avoid using Wine debugging functions in event_src(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 68459a5133c..3efec0f5295 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -622,7 +622,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) if (seek_format != GST_FORMAT_BYTES) { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(seek_format)); + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(seek_format)); return FALSE; } @@ -657,7 +657,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) struct parser *This = gst_pad_get_element_private(pad); gboolean ret = TRUE; - TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); + GST_LOG("filter %p, type \"%s\".", This, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -672,7 +672,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) break; default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); ret = FALSE; break; }

1 0

Zebediah Figura : winegstreamer: Don't force event_sink() onto a Wine thread.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 72a05ba397a3e650b5f3874076f8ecc3fd2b5c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a05ba397a3e650b5f38740… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:03 2021 -0600 winegstreamer: Don't force event_sink() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index 5b163e40201..ce7c0de4e1a 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -203,19 +203,6 @@ gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) return cbdata.u.event_src_data.ret; } -gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) -{ - struct cb_data cbdata = { EVENT_SINK }; - - cbdata.u.event_sink_data.pad = pad; - cbdata.u.event_sink_data.parent = parent; - cbdata.u.event_sink_data.event = event; - - call_cb(&cbdata); - - return cbdata.u.event_sink_data.ret; -} - void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { REMOVED_DECODED_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 2de829f72e3..29aa2bd662c 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -35,7 +35,6 @@ enum CB_TYPE { ACTIVATE_MODE, REQUEST_BUFFER_SRC, EVENT_SRC, - EVENT_SINK, REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, @@ -95,12 +94,6 @@ struct cb_data { GstEvent *event; gboolean ret; } event_src_data; - struct event_sink_data { - GstPad *pad; - GstObject *parent; - GstEvent *event; - gboolean ret; - } event_sink_data; struct pad_removed_data { GstElement *element; GstPad *pad; @@ -129,7 +122,6 @@ gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; -gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8ded4aeef31..68459a5133c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2379,7 +2379,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin); gst_pad_set_chain_function(pin->my_sink, got_data_sink); - gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); + gst_pad_set_event_function(pin->my_sink, event_sink); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); filter->sources[filter->source_count++] = pin; @@ -2459,12 +2459,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.event_src_data.ret = event_src(data->pad, data->parent, data->event); break; } - case EVENT_SINK: - { - struct event_sink_data *data = &cbdata->u.event_sink_data; - cbdata->u.event_sink_data.ret = event_sink(data->pad, data->parent, data->event); - break; - } case REMOVED_DECODED_PAD: { struct pad_removed_data *data = &cbdata->u.pad_removed_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in event_sink().
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 16898714b15abe2a17476433a486558abbc95f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16898714b15abe2a17476433… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 25 23:29:02 2021 -0600 winegstreamer: Avoid using Wine debug functions in event_sink(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5401d942a41..8ded4aeef31 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -705,7 +705,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) struct parser_source *pin = gst_pad_get_element_private(pad); struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - TRACE("pin %p, type \"%s\".\n", pin, GST_EVENT_TYPE_NAME(event)); + GST_LOG("pin %p, type \"%s\".", pin, GST_EVENT_TYPE_NAME(event)); switch (event->type) { @@ -719,7 +719,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) if (segment->format != GST_FORMAT_TIME) { - FIXME("Unhandled format \"%s\".\n", gst_format_get_name(segment->format)); + GST_FIXME("Unhandled format \"%s\".", gst_format_get_name(segment->format)); break; } @@ -798,7 +798,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + GST_WARNING("Ignoring \"%s\" event.", GST_EVENT_TYPE_NAME(event)); } gst_event_unref(event); return TRUE;

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.168.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: c681a0732fc3c6466b228417bb5e0d518d26b819 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c681a0732fc3c6466b228417… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jan 25 07:16:35 2021 -0800 winevulkan: Update to VK spec version 1.2.168. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++++++++++++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 63 ++++++++++++++++++++++++++++------------- 4 files changed, 82 insertions(+), 22 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f4c5065ccd9..6aa126c7169 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.166" +VK_XML_VERSION = "1.2.168" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 0ea713be6cf..9aec8b1e856 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3231,6 +3231,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR: + { + const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR *in = (const VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR *)in_header; + VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->shaderZeroInitializeWorkgroupMemory = in->shaderZeroInitializeWorkgroupMemory; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT: { const VkPhysicalDeviceRobustness2FeaturesEXT *in = (const VkPhysicalDeviceRobustness2FeaturesEXT *)in_header; @@ -3265,6 +3281,25 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR: + { + const VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *in = (const VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *)in_header; + VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->workgroupMemoryExplicitLayout = in->workgroupMemoryExplicitLayout; + out->workgroupMemoryExplicitLayoutScalarBlockLayout = in->workgroupMemoryExplicitLayoutScalarBlockLayout; + out->workgroupMemoryExplicitLayout8BitAccess = in->workgroupMemoryExplicitLayout8BitAccess; + out->workgroupMemoryExplicitLayout16BitAccess = in->workgroupMemoryExplicitLayout16BitAccess; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT: { const VkPhysicalDevice4444FormatsFeaturesEXT *in = (const VkPhysicalDevice4444FormatsFeaturesEXT *)in_header; @@ -7177,6 +7212,8 @@ static const char * const vk_device_extensions[] = "VK_KHR_uniform_buffer_standard_layout", "VK_KHR_variable_pointers", "VK_KHR_vulkan_memory_model", + "VK_KHR_workgroup_memory_explicit_layout", + "VK_KHR_zero_initialize_workgroup_memory", "VK_NV_clip_space_w_scaling", "VK_NV_compute_shader_derivatives", "VK_NV_cooperative_matrix", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 3cee1b05713..e502d0139e8 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.166" + "api_version": "1.2.168" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index baf5a1829d5..dedfb3f2984 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -397,6 +397,8 @@ #define VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME "VK_NV_device_diagnostics_config" #define VK_QCOM_render_pass_store_ops_SPEC_VERSION 2 #define VK_QCOM_render_pass_store_ops_EXTENSION_NAME "VK_QCOM_render_pass_store_ops" +#define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION 1 +#define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_EXTENSION_NAME "VK_KHR_zero_initialize_workgroup_memory" #define VK_NV_FRAGMENT_SHADING_RATE_ENUMS_SPEC_VERSION 1 #define VK_NV_FRAGMENT_SHADING_RATE_ENUMS_EXTENSION_NAME "VK_NV_fragment_shading_rate_enums" #define VK_EXT_FRAGMENT_DENSITY_MAP_2_SPEC_VERSION 1 @@ -405,6 +407,8 @@ #define VK_QCOM_rotated_copy_commands_EXTENSION_NAME "VK_QCOM_rotated_copy_commands" #define VK_EXT_IMAGE_ROBUSTNESS_SPEC_VERSION 1 #define VK_EXT_IMAGE_ROBUSTNESS_EXTENSION_NAME "VK_EXT_image_robustness" +#define VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_SPEC_VERSION 1 +#define VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME "VK_KHR_workgroup_memory_explicit_layout" #define VK_KHR_COPY_COMMANDS_2_SPEC_VERSION 1 #define VK_KHR_COPY_COMMANDS_2_EXTENSION_NAME "VK_KHR_copy_commands2" #define VK_EXT_4444_FORMATS_SPEC_VERSION 1 @@ -426,7 +430,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_VERSION(1, 2, 0) -#define VK_HEADER_VERSION 166 +#define VK_HEADER_VERSION 168 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; @@ -3133,6 +3137,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CREATION_CACHE_CONTROL_FEATURES_EXT = 1000297000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DIAGNOSTICS_CONFIG_FEATURES_NV = 1000300000, VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV = 1000300001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES_KHR = 1000325000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_FEATURES_NV = 1000326001, VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_ENUM_STATE_CREATE_INFO_NV = 1000326002, @@ -3140,6 +3145,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_PROPERTIES_EXT = 1000332001, VK_STRUCTURE_TYPE_COPY_COMMAND_TRANSFORM_INFO_QCOM = 1000333000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ROBUSTNESS_FEATURES_EXT = 1000335000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_FEATURES_KHR = 1000336000, VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR = 1000337000, VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR = 1000337001, VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR = 1000337002, @@ -4934,12 +4940,22 @@ typedef struct VkPhysicalDeviceVulkanMemoryModelFeatures } VkPhysicalDeviceVulkanMemoryModelFeatures; typedef VkPhysicalDeviceVulkanMemoryModelFeatures VkPhysicalDeviceVulkanMemoryModelFeaturesKHR; -typedef struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT +typedef struct VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR { VkStructureType sType; void *pNext; - VkBool32 ycbcrImageArrays; -} VkPhysicalDeviceYcbcrImageArraysFeaturesEXT; + VkBool32 workgroupMemoryExplicitLayout; + VkBool32 workgroupMemoryExplicitLayoutScalarBlockLayout; + VkBool32 workgroupMemoryExplicitLayout8BitAccess; + VkBool32 workgroupMemoryExplicitLayout16BitAccess; +} VkPhysicalDeviceWorkgroupMemoryExplicitLayoutFeaturesKHR; + +typedef struct VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR +{ + VkStructureType sType; + void *pNext; + VkBool32 shaderZeroInitializeWorkgroupMemory; +} VkPhysicalDeviceZeroInitializeWorkgroupMemoryFeaturesKHR; typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT { @@ -6184,14 +6200,24 @@ typedef struct VkPhysicalDeviceVulkan12Properties VkSampleCountFlags framebufferIntegerColorSampleCounts; } VkPhysicalDeviceVulkan12Properties; -typedef struct VkPipelineCacheCreateInfo +typedef struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT { VkStructureType sType; - const void *pNext; - VkPipelineCacheCreateFlags flags; - size_t initialDataSize; - const void *pInitialData; -} VkPipelineCacheCreateInfo; + void *pNext; + VkBool32 ycbcrImageArrays; +} VkPhysicalDeviceYcbcrImageArraysFeaturesEXT; + +typedef struct VkPipelineColorBlendAttachmentState +{ + VkBool32 blendEnable; + VkBlendFactor srcColorBlendFactor; + VkBlendFactor dstColorBlendFactor; + VkBlendOp colorBlendOp; + VkBlendFactor srcAlphaBlendFactor; + VkBlendFactor dstAlphaBlendFactor; + VkBlendOp alphaBlendOp; + VkColorComponentFlags colorWriteMask; +} VkPipelineColorBlendAttachmentState; typedef struct VkPipelineCoverageModulationStateCreateInfoNV { @@ -7046,17 +7072,14 @@ typedef struct VkPhysicalDeviceVulkan11Properties VkDeviceSize WINE_VK_ALIGN(8) maxMemoryAllocationSize; } VkPhysicalDeviceVulkan11Properties; -typedef struct VkPipelineColorBlendAttachmentState +typedef struct VkPipelineCacheCreateInfo { - VkBool32 blendEnable; - VkBlendFactor srcColorBlendFactor; - VkBlendFactor dstColorBlendFactor; - VkBlendOp colorBlendOp; - VkBlendFactor srcAlphaBlendFactor; - VkBlendFactor dstAlphaBlendFactor; - VkBlendOp alphaBlendOp; - VkColorComponentFlags colorWriteMask; -} VkPipelineColorBlendAttachmentState; + VkStructureType sType; + const void *pNext; + VkPipelineCacheCreateFlags flags; + size_t initialDataSize; + const void *pInitialData; +} VkPipelineCacheCreateInfo; typedef struct VkPipelineCoverageToColorStateCreateInfoNV {

1 0

Liam Middlebrook : winevulkan: Skip commands which are declared but not defined.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: wine Branch: master Commit: 60eff6d65a51b5fd52d0b22754c88976a244917e URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eff6d65a51b5fd52d0b227… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Jan 25 07:16:34 2021 -0800 winevulkan: Skip commands which are declared but not defined. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 40978a8fc7a..f4c5065ccd9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2936,7 +2936,13 @@ class VkRegistry(object): commands = ext.findall("require/command") for command in commands: cmd_name = command.attrib["name"] - self.funcs[cmd_name].extensions.append(ext_name) + # Need to verify that the command is defined, and otherwise skip it. + # vkCreateScreenSurfaceQNX is declared in <extensions> but not defined in + # <commands>. A command without a definition cannot be enabled, so it's valid for + # the XML file to handle this, but because of the manner in which we parse the XML + # file we pre-populate from <commands> before we check if a command is enabled. + if cmd_name in self.funcs: + self.funcs[cmd_name].extensions.append(ext_name) # Some extensions are not ready or have numbers reserved as a place holder. if ext.attrib["supported"] == "disabled":

1 0

Zebediah Figura : vkd3d-shader: Preserve some tokens verbatim for the assembler.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: vkd3d Branch: master Commit: 3b132ec5ea8c4df6983e5c874e1081ac9cbbc0e6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b132ec5ea8c4df6983e5c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 25 11:23:58 2021 -0600 vkd3d-shader: Preserve some tokens verbatim for the assembler. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index c17b9d6..82b6492 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -104,6 +104,10 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>">>"=? {return T_TEXT;} <INITIAL>[-+*/%&|^]= {return T_TEXT;} + /* Native doesn't preserve these tokens when running the preprocessor on its + * own, but there's no good reason to emulate that difference yet. */ +<INITIAL>[pv]s\.[123]\.[0-4x] {return T_TEXT;} + <INCLUDE,LINE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;}

1 0

Zebediah Figura : vkd3d-shader: Add predefined macros to the macro list.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: vkd3d Branch: master Commit: 275f949a19a3a7d52ce81d8e5409a8f61152ca8a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=275f949a19a3a7d52ce81d8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 25 11:23:57 2021 -0600 vkd3d-shader: Add predefined macros to the macro list. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.h | 2 ++ libs/vkd3d-shader/preproc.l | 31 +++++++++++++++++++++++++------ libs/vkd3d-shader/preproc.y | 4 ++-- tests/hlsl_d3d12.c | 10 +++++----- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index eff70f6..15d173a 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -130,6 +130,8 @@ struct preproc_ctx bool error; }; +bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, char **arg_names, + size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) DECLSPEC_HIDDEN; void preproc_close_include(struct preproc_ctx *ctx, const struct vkd3d_shader_code *code) DECLSPEC_HIDDEN; struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *name) DECLSPEC_HIDDEN; void preproc_free_macro(struct preproc_macro *macro) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 0ce75f0..c17b9d6 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -717,8 +717,9 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, { static const struct vkd3d_shader_preprocess_info default_preprocess_info = {0}; struct preproc_ctx ctx = {0}; - char *source_name; + char *source_name = NULL; void *output_code; + unsigned int i; vkd3d_string_buffer_init(&ctx.buffer); rb_init(&ctx.macros, preproc_macro_compare); @@ -727,18 +728,30 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, ctx.message_context = message_context; if (!(source_name = vkd3d_strdup(compile_info->source_name ? compile_info->source_name : "<anonymous>"))) + goto fail; + + for (i = 0; i < ctx.preprocess_info->macro_count; ++i) { - vkd3d_string_buffer_cleanup(&ctx.buffer); - return VKD3D_ERROR_OUT_OF_MEMORY; + const struct vkd3d_shader_location loc = {.source_name = source_name}; + struct vkd3d_string_buffer body; + char *name; + + vkd3d_string_buffer_init(&body); + vkd3d_string_buffer_printf(&body, "%s", ctx.preprocess_info->macros[i].value); + if (!(name = vkd3d_strdup(ctx.preprocess_info->macros[i].name))) + goto fail; + if (!preproc_add_macro(&ctx, &loc, name, NULL, 0, &loc, &body)) + { + vkd3d_free(name); + goto fail; + } } yylex_init_extra(&ctx, &ctx.scanner); if (!preproc_push_include(&ctx, source_name, &compile_info->source)) { yylex_destroy(ctx.scanner); - vkd3d_free(source_name); - vkd3d_string_buffer_cleanup(&ctx.buffer); - return VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; } preproc_yyparse(ctx.scanner, &ctx); @@ -789,4 +802,10 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, vkd3d_string_buffer_trace(&ctx.buffer); vkd3d_string_buffer_cleanup(&ctx.buffer); return VKD3D_OK; + +fail: + rb_destroy(&ctx.macros, preproc_macro_rb_free, NULL); + vkd3d_free(source_name); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_OUT_OF_MEMORY; } diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 01437b2..ac6f647 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -83,8 +83,8 @@ struct preproc_macro *preproc_find_macro(struct preproc_ctx *ctx, const char *na return NULL; } -static bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, - char **arg_names, size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) +bool preproc_add_macro(struct preproc_ctx *ctx, const struct vkd3d_shader_location *loc, char *name, char **arg_names, + size_t arg_count, const struct vkd3d_shader_location *body_loc, struct vkd3d_string_buffer *body) { struct preproc_macro *macro; unsigned int i; diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 837476d..da8e0ea 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -358,7 +358,7 @@ static void test_preprocess(void) macros[0].Definition = "value"; macros[1].Name = NULL; macros[1].Definition = NULL; - todo check_preprocess("KEY", macros, NULL, "value", "KEY"); + check_preprocess("KEY", macros, NULL, "value", "KEY"); check_preprocess("#undef KEY\nKEY", macros, NULL, "KEY", "value"); @@ -367,7 +367,7 @@ static void test_preprocess(void) macros[0].Name = "KEY"; macros[0].Definition = NULL; - todo check_preprocess("KEY", macros, NULL, NULL, "KEY"); + check_preprocess("KEY", macros, NULL, NULL, "KEY"); macros[0].Name = "0"; macros[0].Definition = "value"; @@ -383,19 +383,19 @@ static void test_preprocess(void) macros[1].Definition = "value2"; macros[2].Name = NULL; macros[2].Definition = NULL; - todo check_preprocess("KEY", macros, NULL, "value2", NULL); + check_preprocess("KEY", macros, NULL, "value2", NULL); macros[0].Name = "KEY"; macros[0].Definition = "KEY2"; macros[1].Name = "KEY2"; macros[1].Definition = "value"; - todo check_preprocess("KEY", macros, NULL, "value", NULL); + check_preprocess("KEY", macros, NULL, "value", NULL); macros[0].Name = "KEY2"; macros[0].Definition = "value"; macros[1].Name = "KEY"; macros[1].Definition = "KEY2"; - todo check_preprocess("KEY", macros, NULL, "value", NULL); + check_preprocess("KEY", macros, NULL, "value", NULL); check_preprocess(test_include_top, NULL, &test_include, "pass", "fail"); ok(!refcount_file1, "Got %d references to file1.\n", refcount_file1);

1 0

Zebediah Figura : vkd3d-shader: Parse #line directives.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: vkd3d Branch: master Commit: 160db8306f2a2cb86c3df973cfdb5c4b5c4751df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=160db8306f2a2cb86c3df97… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 25 11:23:56 2021 -0600 vkd3d-shader: Parse #line directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++------ libs/vkd3d-shader/preproc.y | 12 ++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 1bf14ff..0ce75f0 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -52,6 +52,7 @@ static void update_location(struct preproc_ctx *ctx); %s ERROR %s INCLUDE +%s LINE NEWLINE \r?\n WS [ \t] @@ -91,9 +92,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} -<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} -<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>0[0-7]*[ul]{0,2} {return T_INTEGER;} +<INITIAL,LINE>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL>## {return T_CONCAT;} @@ -103,7 +104,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>">>"=? {return T_TEXT;} <INITIAL>[-+*/%&|^]= {return T_TEXT;} -<INCLUDE>\"[^"]*\" {return T_STRING;} +<INCLUDE,LINE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} /* C strings (including escaped quotes). */ @@ -131,6 +132,12 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_INCLUDE; } + if (!strcmp(p, "line")) + { + BEGIN(LINE); + return T_LINE; + } + if (!strcmp(p, "define")) return T_DEFINE; if (!strcmp(p, "elif")) @@ -155,8 +162,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* return T_TEXT; } -<INITIAL,INCLUDE>\\{NEWLINE} {} -<INITIAL,INCLUDE,ERROR>{NEWLINE} { +<INITIAL,INCLUDE,LINE>\\{NEWLINE} {} +<INITIAL,INCLUDE,ERROR,LINE>{NEWLINE} { BEGIN(INITIAL); return T_NEWLINE; } @@ -371,6 +378,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) case T_IFDEF: case T_IFNDEF: case T_INCLUDE: + case T_LINE: case T_PRAGMA: case T_UNDEF: ctx->current_directive = token; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 7a99543..01437b2 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -327,6 +327,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_IFDEF "#ifdef" %token T_IFNDEF "#ifndef" %token T_INCLUDE "#include" +%token T_LINE "#line" %token T_PRAGMA "#pragma" %token T_UNDEF "#undef" @@ -671,6 +672,17 @@ directive } vkd3d_free($2); } + | T_LINE T_INTEGER T_NEWLINE + { + FIXME("#line directive.\n"); + vkd3d_free($2); + } + | T_LINE T_INTEGER T_STRING T_NEWLINE + { + FIXME("#line directive.\n"); + vkd3d_free($2); + vkd3d_free($3); + } primary_expr : T_INTEGER

1 0

Francois Gouget : testbot/TestWTBS: Allow checking the content of patches.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: tools Branch: master Commit: 4565c96149b43ff1cba49c31dd4693f115946d1e URL: https://source.winehq.org/git/tools.git/?a=commit;h=4565c96149b43ff1cba49c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 26 04:38:49 2021 +0100 testbot/TestWTBS: Allow checking the content of patches. This is useful for checking that the TestBot assembled all the expected parts of a patch series, particularly when multiple patch series are pending. For instance: ----- TestWTBS ----- a patch.Grep WTBS [12]/4 a patch.GrepV WTBS [34]/4 ---- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 52 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 58cbf30..d0e7cab 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -384,6 +384,12 @@ sub LoadTestInfo($) $TestInfo->{$TaskType}->{"$LogType.$GrepType"} = [ $Array ]; } } + + my $Array = $TestInfo->{patch}->{$GrepType}; + next if (!defined $Array); + next if (ref($Array) eq "ARRAY"); + fail("patch.$GrepType should be an array (a lines)"); + $TestInfo->{patch}->{$GrepType} = [ $Array ]; } # Automatically check webpatch.Status in simple cases @@ -643,18 +649,18 @@ sub CheckLogErrors($$$) } } -sub GrepTaskLog($$$$) +sub GrepFile($$$$;$) { - my ($Task, $LogName, $TaskInfo, $LogType) = @_; + my ($Key, $Dir, $FileName, $GrepInfo, $GrepPrefix) = @_; - my @Grep = @{$TaskInfo->{"$LogType.Grep"} || []}; - my @GrepV = @{$TaskInfo->{"$LogType.GrepV"} || []}; + my @Grep = @{$GrepInfo->{"${GrepPrefix}Grep"} || []}; + my @GrepV = @{$GrepInfo->{"${GrepPrefix}GrepV"} || []}; return if (!@Grep and !@GrepV); - if (open(my $LogFile, "<", $Task->GetDir() ."/$LogName")) + if (open(my $Fh, "<", "$Dir/$FileName")) { my $LineNo; - foreach my $Line (<$LogFile>) + foreach my $Line (<$Fh>) { $LineNo++; my $i = 0; @@ -662,7 +668,7 @@ sub GrepTaskLog($$$$) { if ($Line =~ /$GrepV[$i]/) { - fail(TaskKeyStr($Task) ."/$LogName:$LineNo should not match $GrepV[$i]"); + fail("$Key/$FileName:$LineNo should not match $GrepV[$i]"); splice @GrepV, $i, 1; next; } @@ -680,14 +686,21 @@ sub GrepTaskLog($$$$) } last if (!@Grep and !@GrepV); } - close($LogFile); + close($Fh); } foreach my $RegExp (@Grep) { - fail(TaskKeyStr($Task) ."/$LogName should match $RegExp"); + fail("$Key/$FileName should match $RegExp"); } } +sub GrepTaskLog($$$$) +{ + my ($Task, $LogName, $GrepInfo, $GrepPrefix) = @_; + + return GrepFile(TaskKeyStr($Task), $Task->GetDir(), $LogName, $GrepInfo, $GrepPrefix); +} + =pod =item <job.Status> @@ -769,7 +782,7 @@ sub CheckTask($$$$) CheckLogErrors($LogInfo, $TaskInfo->{"$LogType.errors"}, TaskKeyStr($Task) ."/$LogName"); } - GrepTaskLog($Task, $LogName, $TaskInfo, $LogType); + GrepTaskLog($Task, $LogName, $TaskInfo, "$LogType."); } if ($Task->Status eq "completed" and CheckValue($TaskInfo->{TestFailures})) { @@ -850,6 +863,21 @@ space-separated list on the VMs matching the specified category. For instance: p win.TestUnits cabinet:extract cabinet:fdi +=item <patch.Grep> +=item <patch.GrepV> + +Verifies the presence or absence of specific regular expressions in the +job's patch file. Multiple regular expressions can be specified so this uses +the array type of line ('a'). + +For instance: +a patch.Grep WTBS [12]/4 +a patch.GrepV WTBS [34]/4 + +Assuming that the WTBS patch series contains specific strings that allow +identifying each part, this checks that the job's patch contains parts 1 and 2 +but not parts 3 and 4. + =cut sub CheckJobTree($;$) @@ -876,6 +904,10 @@ sub CheckJobTree($;$) $TestInfo = LoadTestInfo($Step->GetFullFileName()); return if (!$TestInfo); + if ($TestInfo->{patch}) + { + GrepFile($Job->Id, $Job->GetDir(), "patch.diff", $TestInfo->{patch}); + } } my $TaskType = $Step->Type eq "build" ? "build" :

1 0

Francois Gouget : testbot/LogUtils: Ignore end-of-line spaces when matching error lines.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: tools Branch: master Commit: 4f207778973fde274422943653301087e7d8b459 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4f207778973fde274422943… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 26 04:38:47 2021 +0100 testbot/LogUtils: Ignore end-of-line spaces when matching error lines. End-of-line spaces should be rare but more importantly they don't materially change the error line and can make it hard to match errors in TestWTBS. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7971435..7786494 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1115,8 +1115,11 @@ sub _GetLineKey($) my ($Line) = @_; return undef if (!defined $Line); + # Remove end-of-line spaces + $Line =~ s/ +$//; + # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/ + $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block):)/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/

1 0

Francois Gouget : testbot/TestWTBS: Check the result and error emails.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: tools Branch: master Commit: 394be2d89578ad17cfc972ad691f00260866d6f8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=394be2d89578ad17cfc972a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 26 04:38:44 2021 +0100 testbot/TestWTBS: Check the result and error emails. When a job completes the TestBot sends an email with the results and another with a summary of the errors in case of new failures. This patch allows checking that these emails did get sent if appropriate and seem to contain the expected data. For this the emails should be saved to a file in mbox format and that file passed to TestWTBS using the --mbox option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 187 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 175 insertions(+), 12 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 0980081..58cbf30 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -107,6 +107,7 @@ sub check_opt_val($$) } my $OptJobs; +my $OptMbox; while (@ARGV) { my $Arg = shift @ARGV; @@ -114,6 +115,10 @@ while (@ARGV) { $OptJobs = check_opt_val($Arg, $OptJobs); } + elsif ($Arg eq "--mbox") + { + $OptMbox = check_opt_val($Arg, $OptMbox); + } elsif ($Arg eq "--help") { $Usage = 0; @@ -156,7 +161,7 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [--jobs RANGES] [--help]\n"; + print "Usage: $name0 [--jobs RANGES] [--mbox FILE] [--help]\n"; print "\n"; print "Tests the Patches subject parser.\n"; print "\n"; @@ -166,6 +171,7 @@ if (defined $Usage) print " these jobs to be ignored. Each range is either a single job id,\n"; print " or of the form 'FIRST..LAST' where FIRST and LAST are either the\n"; print " empty string or a job id.\n"; + print " --mbox FILE Check the TestBot's emails in this mbox-format file.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -417,6 +423,114 @@ sub GetReportTestUnits($) } +# +# Load the TestBot emails +# + +my %Emails; + +sub CloseEmail($) +{ + my ($State) = @_; + + # Avoid undefined values to simplify diagnostic messages + $State->{HasFailedEmail} ||= 0; + $State->{HasResEmail} ||= 0; + + if (!$State->{JobId}) + { + foreach my $Field ("HasFailedEmail", "HasResEmail") + { + next if (!$State->{$Field}); + fail("Unexpected $Field property found on line $State->{$Field}"); + } + foreach my $Hash ("FailedVMs", "ResVMs") + { + next if (!$State->{$Hash}); + my $Lines = join(" ", map { "$_:$State->{$Hash}->{$_}" } sort keys %{$State->{$Hash}}); + fail("Unexpected $Hash property found on lines: $Lines"); + } + } + else + { + my $Email = $Emails{$State->{JobId}}; + $Emails{$State->{JobId}} = $Email = {} if (!$Email); + + $Email->{HasFailedEmail} ||= $State->{HasFailedEmail}; + $Email->{FailedVMs} ||= $State->{FailedVMs}; + + $Email->{HasResEmail} ||= $State->{HasResEmail}; + $Email->{ResVMs} ||= $State->{ResVMs}; + } +} + +sub LoadMbox($) +{ + my ($MboxFilename) = @_; + + if (open(my $MboxFh, "<", $MboxFilename)) + { + my ($State, $LineNo, $Empty); + foreach my $Line (<$MboxFh>) + { + chomp $Line; + $LineNo++; + if ($Line eq "") + { + $Empty = 1; + next; + } + if ($Line =~ m~^From ~) + { + CloseEmail($State); + $State = {}; + } + elsif ($Line =~ /^Subject: TestBot job (\d+) results:/) + { + $State->{JobId} = $1; + $State->{JobIdLine} = $LineNo; + $State->{HasResEmail} = $LineNo; + } + elsif ($Line =~ /JobDetails.pl\?Key=(\d+)$/) + { + my $JobId = $1; + if (defined $State->{JobId}) + { + is($JobId, $State->{JobId}, "Check mbox job ids on lines $LineNo and $State->{JobIdLine}"); + } + else + { + $State->{JobId} = $JobId; + $State->{JobIdLine} = $LineNo; + } + } + elsif ($Line =~ /^Content-Disposition: attachment; filename=([^-]+)-/) + { + my $VM = $1; + # This could match attachments in other emails + $State->{ResVMs}->{$VM}++ if ($State->{HasResEmail}); + } + elsif ($Line =~ /I found new failures/) + { + $State->{HasFailedEmail} = $LineNo; + } + elsif ($Line =~ /^=== (\w+) $.*$ ===$/) + { + my $VM = $1; + $State->{FailedVMs}->{$VM}++; + } + $Empty = undef; + } + CloseEmail($State); + close($MboxFh); + } + else + { + fail("Could not open $MboxFilename for reading: $!"); + } +} + + # # Verify the Jobs and Tasks # @@ -627,11 +741,12 @@ sub CheckTask($$$$) $TestUnits->{$TaskType}->{"*skipped*"} = 1; } - my $ReportCount = 0; + my ($ReportCount, $NewFailures) = (0, 0); foreach my $LogName (@{GetLogFileNames($Task->GetDir())}) { my $LogPath = $Task->GetDir() ."/$LogName"; my $LogInfo = LoadLogErrors($LogPath); + $NewFailures += $LogInfo->{NewCount} || 0; my $LogType = "log"; if ($LogName =~ /\.report$/) @@ -662,6 +777,7 @@ sub CheckTask($$$$) # was run, i.e. $ReportCount, or take it as is if no report is available. is($Task->TestFailures, $TaskInfo->{TestFailures} * ($ReportCount || 1), "Check Failures of task ". TaskKeyStr($Task)); } + return $NewFailures; } =pod @@ -687,13 +803,13 @@ sub CheckJob($$) $Remarks =~ s/^\[\Q$PatchesMailingList\E\] //; is($Remarks, $JobInfo->{Remarks}, "Check Remarks for job ". $Job->Id); } - if (CheckValue($JobInfo->{Status})) + if (CheckValue($TestInfo->{patch}->{Disposition})) { - is($Job->Status, $JobInfo->{Status}, "Check Status for job ". $Job->Id); + fail("The '$TestInfo->{patch}->{Disposition}' patch disposition is incompatible with job ". $Job->Id); } - elsif (CheckValue($TestInfo->{patch}->{Disposition})) + elsif (CheckValue($JobInfo->{Status})) { - fail("The '$TestInfo->{patch}->{Disposition}' patch disposition is incompatible with job ". $Job->Id); + is($Job->Status, $JobInfo->{Status}, "Check Status for job ". $Job->Id); } } @@ -741,12 +857,15 @@ sub CheckJobTree($;$) my ($Job, $TestInfo) = @_; return if (!IsJobInRange($Job)); - return if ($CheckedJobs{$Job->Id}); - $CheckedJobs{$Job->Id} = 1; + my $JobId = $Job->Id; # Simplify use in strings + return if ($CheckedJobs{$JobId}); + $CheckedJobs{$JobId} = 1; - my $HasTask; + my ($HasTask, $HasNewFailures); my $TestUnits = { wine => {} }; + my $Email = $Emails{$JobId}; + my %FailedVMs; my $Steps = $Job->Steps; foreach my $Step (sort { $a->No <=> $b->No } @{$Job->Steps->GetItems()}) { @@ -766,7 +885,22 @@ sub CheckJobTree($;$) foreach my $Task (sort { $a->No <=> $b->No } @{$Step->Tasks->GetItems()}) { $HasTask->{$TaskType} = 1; - CheckTask($Task, $TaskType, $TestInfo, $TestUnits); + my $NewFailures = CheckTask($Task, $TaskType, $TestInfo, $TestUnits); + if ($NewFailures) + { + $FailedVMs{$Task->VM->Name}++; + $HasNewFailures = 1; + } + + if ($Emails{$JobId}) + { + my $VMName = $Task->VM->Name; + if ($Task->Status !~ /^(?:canceled|skipped)$/ and $Email->{HasResEmail}) + { + ok($Email->{ResVMs}->{$VMName}, "Expecting $VMName logs / reports in the job $JobId results email"); + } + } + if ($TaskType =~ /^win(?:32|64)$/) { my $TestUnit = $Step->FileName; @@ -776,6 +910,22 @@ sub CheckJobTree($;$) } } } + if ($Email->{HasFailedEmail}) + { + foreach my $VMName (sort keys %FailedVMs) + { + # The emails count each VM once per task report containing a new error + # while CheckJobTree counts them only once per task. + ok(($Email->{FailedVMs}->{$VMName} || 0) >= $FailedVMs{$VMName}, + "Check for $VMName logs / reports in the job $JobId new failures email") + or diag("Expected at least $FailedVMs{$VMName} $VMName instance in the email, got $Email->{FailedVMs}->{$VMName}"); + delete $Email->{FailedVMs}->{$VMName}; + } + foreach my $VMName (sort keys %{$Email->{FailedVMs}}) + { + fail("New failure email for job $JobId reported an extra VM: $VMName"); + } + } CheckJob($Job, $TestInfo); # Ignore manually submitted jobs because they allow the developer to pick @@ -790,7 +940,7 @@ sub CheckJobTree($;$) if (CheckValue($TypeInfo->{HasTask})) { $HasTask->{$Type} ||= 0; - is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job ". $Job->Id); + is($HasTask->{$Type}, $TypeInfo->{HasTask}, "Check the presence of $Type tasks for job $JobId"); } next if ($TestUnits->{$Type}->{"*skipped*"}); @@ -798,11 +948,18 @@ sub CheckJobTree($;$) { foreach my $TestUnit (split / +/, $TypeInfo->{TestUnits}) { - ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job ". $Job->Id) + ok($TestUnits->{$Type}->{$TestUnit}, "Check that $TestUnit was tested by $Type VMs for job $JobId") or diag("TestUnits=", join(" ", sort keys %{$TestUnits->{$Type}})); } } } + + if ($OptMbox) + { + my $Email = $Emails{$JobId}; + ok($Email->{HasResEmail}, "Looking for results email for job $JobId"); + is(!!$Email->{HasFailedEmail}, !!($Job->Status ne "completed" or $HasNewFailures), "Check presence of a new failures email for job $JobId"); + } } } @@ -986,6 +1143,12 @@ if (!$HasBaseVM->{build}) delete $HasBaseVM->{win64}; } +if (defined $OptMbox) +{ + print "***** Loading emails *****\n"; + LoadMbox($OptMbox); +} + print "***** Checking Patches *****\n"; CheckPatches();

1 0

Francois Gouget : testbot/PatchUtils: Always track modified paths, if only for deletions.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: tools Branch: master Commit: df7d79368824ec6888d141721691a5fd8cbf0a9b URL: https://source.winehq.org/git/tools.git/?a=commit;h=df7d79368824ec6888d1417… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 25 15:39:05 2021 +0100 testbot/PatchUtils: Always track modified paths, if only for deletions. We track all deleted and (re)added files. Global files and scripts should be no exception even if they are unlikely to be deleted / (re)added. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 974ff8e..5588df2 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -138,9 +138,9 @@ sub _LoadWineFiles() # These paths are too generic to be proof that this is a Wine patch. my $AmbiguousPathsRe = join('|', 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment + 'aclocal\.m4$', + 'configure$', + 'configure\.ac$', 'include/Makefile\.in$', 'include/config\.h\.in$', 'po/', @@ -313,42 +313,50 @@ sub GetPatchImpacts($) my ($Path, $Change); while (my $Line = <$fh>) { - if ($Line =~ m=^--- \w+/(?:aclocal\.m4|configure\.ac)$=) + if ($Line =~ m=^--- \w+/(aclocal\.m4|configure\.ac)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{Autoconf} = 1; } - elsif ($Line =~ m=^--- \w+/tools/make_makefiles$=) + elsif ($Line =~ m=^--- \w+/(tools/make_makefiles)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeMakefiles} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/server/protocol\.def$=) + elsif ($Line =~ m=^--- \w+/(server/protocol\.def)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + elsif ($Line =~ m=^--- \w+/(dlls/dsound/make_fir)$=) { + $Path = $1; $Impacts->{MakeFir} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + elsif ($Line =~ m=^--- \w+/(dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { + $Path = $1; $Impacts->{MakeErrors} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) + elsif ($Line =~ m=^--- \w+/(dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=) + elsif ($Line =~ m=^--- \w+/(dlls/winevulkan/make_vulkan)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{IsWinePatch} = 1; } - elsif ($Line =~ m=^--- \w+/tools/make_unicode$=) + elsif ($Line =~ m=^--- \w+/(tools/make_unicode)$=) { + $Path = $1; $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; $Impacts->{IsWinePatch} = 1; }

1 0

Francois Gouget : winetest/dissect: Minor tweaks to match the TestBot parser.
by Alexandre Julliard 26 Jan '21

26 Jan '21

Module: tools Branch: master Commit: 88067fd0902473fe33417779ef7b55e676e87ba5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=88067fd0902473fe3341777… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 25 15:26:43 2021 +0100 winetest/dissect: Minor tweaks to match the TestBot parser. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 8f30ccd..c62f914 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -591,7 +591,7 @@ sub close_test_unit($) $line =~ /^Test output:/ or mydie "no test header: $line"; while ($line = <IN>) { $unitsize += length($line); - next if ($line =~ /^\s*$/); + next if ($line =~ /^\s*$/); # empty lines have no impact chomp $line; $line =~ s/\r+$//; if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%) @@ -697,8 +697,8 @@ while ($line = <IN>) { # There may be more than one summary line due to child processes $pids{$l_pid || 0} = 1; $s_total += $l_total; - $s_todo += $l_todo; $s_failures += $l_failures; + $s_todo += $l_todo; $s_skipped += $l_skipped; add_test_line($class, escapeHTML($line)); }

1 0

Zebediah Figura : wined3d: Make adapter_gl_clear_uav() static.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 2d6462cdee2bd87a49382794e5a554f33c367f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6462cdee2bd87a49382794… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 24 14:29:27 2021 -0600 wined3d: Make adapter_gl_clear_uav() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b6be5854714..d9f70049e6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5012,7 +5012,7 @@ static void adapter_gl_flush_context(struct wined3d_context *context) context_gl->gl_info->gl_ops.gl.p_glFlush(); } -void adapter_gl_clear_uav(struct wined3d_context *context, +static void adapter_gl_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value));

1 0

Nikolay Sivov : mfmediaengine: Return current session time in GetCurrentTime().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 3f00fbc2e9dc412a1504861ba1946f6b06444166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f00fbc2e9dc412a1504861b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 25 17:53:10 2021 +0300 mfmediaengine: Return current session time in GetCurrentTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 55585b8b826..5981548c9f8 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -99,6 +99,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; + IMFClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -774,6 +775,8 @@ static void free_media_engine(struct media_engine *engine) { if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); + if (engine->clock) + IMFClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -987,9 +990,22 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + LONGLONG clocktime; + double ret = 0.0; + MFTIME systime; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + { + /* Assume 100ns clock. */ + ret = (double)clocktime / 10000000.0; + } + LeaveCriticalSection(&engine->cs); + + return ret; } static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) @@ -1644,6 +1660,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + return hr; + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) return hr;

1 0

Henri Verbeet : wined3d: Trace the available Vulkan extensions.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 53916000f8d1ae64343c52da9b05c96d12a2271a URL: https://source.winehq.org/git/wine.git/?a=commit;h=53916000f8d1ae64343c52da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 15:53:15 2021 +0100 wined3d: Trace the available Vulkan extensions. Like we do for OpenGL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9a226edc65a..d2ac652ab62 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1853,6 +1853,12 @@ static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, goto done; } + TRACE("Vulkan instance extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0; i < ARRAY_SIZE(vulkan_instance_extensions); ++i) { if (vulkan_instance_extensions[i].core_since_version <= vk_info->api_version) @@ -2207,6 +2213,12 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk goto done; } + TRACE("Vulkan device extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) { if (info[i].core_since_version <= vk_info->api_version)

1 0

Vijay Kiran Kamuju : uiautomationcore: Add stub UiaRegisterProviderCallback function.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 8f0349f25b9cd44631178eb46d52c1e12dd69bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f0349f25b9cd44631178eb4… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jan 17 18:43:09 2021 +0100 uiautomationcore: Add stub UiaRegisterProviderCallback function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50508 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 5 +++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index f0d8247724d..77460aa174c 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -94,6 +94,11 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN return S_OK; } +void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) +{ + FIXME("(%p): stub\n", callback); +} + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { FIXME("(%p, %p): stub\n", hwnd, provider); diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 53ef893064c..5da89c3451c 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -91,7 +91,7 @@ #@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent #@ stub UiaRaiseTextEditTextChangedEvent -@ stub UiaRegisterProviderCallback +@ stdcall UiaRegisterProviderCallback(ptr) @ stub UiaRemoveEvent @ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 0acdc29e0eb..de486710158 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -52,11 +52,21 @@ enum AutomationIdentifierType AutomationIdentifierType_Style }; +enum ProviderType +{ + ProviderType_BaseHwnd, + ProviderType_Proxy, + ProviderType_NonClientArea, +}; + +typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType); + HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); +void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov);

1 0

Akihiro Sagawa : comdlg32: Set DEFAULT_CHARSET if CF_NOSCRIPTSEL is set.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 89ded8c8e145d9d1010078c17c44a2f5e5df1010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ded8c8e145d9d1010078c1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 23 00:28:14 2021 +0900 comdlg32: Set DEFAULT_CHARSET if CF_NOSCRIPTSEL is set. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 13 +++++++++---- dlls/comdlg32/tests/fontdlg.c | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index a518c78fb17..e2c8eb2b3ad 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1032,11 +1032,16 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO get_dialog_font_point_size(hDlg, lpcf); /* charset */ - i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0); - if (i!=CB_ERR) - lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); - else + if (lpcf->Flags & CF_NOSCRIPTSEL) lpxx->lfCharSet = DEFAULT_CHARSET; + else + { + i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0); + if (i!=CB_ERR) + lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0); + else + lpxx->lfCharSet = DEFAULT_CHARSET; + } lpxx->lfStrikeOut=IsDlgButtonChecked(hDlg,chx1); lpxx->lfUnderline=IsDlgButtonChecked(hDlg,chx2); lpxx->lfWidth=lpxx->lfOrientation=lpxx->lfEscapement=0; diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index e8f184c4ed8..2836ba1e9ef 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -116,7 +116,7 @@ static void test_ChooseFontA(void) cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_SCREENFONTS|CF_NOSCRIPTSEL; ret = ChooseFontA(&cfa); ok(ret == TRUE, "ChooseFontA returned FALSE\n"); - todo_wine ok(lfa.lfCharSet == DEFAULT_CHARSET, "Expected DEFAULT_CHARSET, got %i\n", lfa.lfCharSet); + ok(lfa.lfCharSet == DEFAULT_CHARSET, "Expected DEFAULT_CHARSET, got %i\n", lfa.lfCharSet); printer_ic = get_printer_ic(); if (!printer_ic)

1 0

Akihiro Sagawa : comdlg32/tests: Add a test for CF_NOSCRIPTSEL.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: ee3a315385bf7c38d77a2f48d3fc72d0d1f0a992 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee3a315385bf7c38d77a2f48… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 23 00:28:11 2021 +0900 comdlg32/tests: Add a test for CF_NOSCRIPTSEL. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/fontdlg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index 090053522dd..e8f184c4ed8 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -110,8 +110,14 @@ static void test_ChooseFontA(void) ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); + ok(lfa.lfCharSet == SYMBOL_CHARSET, "Expected SYMBOL_CHARSET, got %i\n", lfa.lfCharSet); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); + cfa.Flags = CF_ENABLEHOOK|CF_INITTOLOGFONTSTRUCT|CF_SCREENFONTS|CF_NOSCRIPTSEL; + ret = ChooseFontA(&cfa); + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); + todo_wine ok(lfa.lfCharSet == DEFAULT_CHARSET, "Expected DEFAULT_CHARSET, got %i\n", lfa.lfCharSet); + printer_ic = get_printer_ic(); if (!printer_ic) skip("can't get a DC for a local printer\n");

1 0

Zebediah Figura : ntdll/tests: Add an alignment helper.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 6ebf5ed093015143a58f21db9f2ae07ac5987aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebf5ed093015143a58f21db… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 21:51:58 2021 -0600 ntdll/tests: Add an alignment helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 4865a0a8e51..d476bd65a81 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -325,6 +325,11 @@ static WCHAR *get_params_string( RTL_USER_PROCESS_PARAMETERS *params, UNICODE_ST return (WCHAR *)((char *)params + (UINT_PTR)str->Buffer); } +static UINT_PTR align(UINT_PTR size, unsigned int alignment) +{ + return (size + (alignment - 1)) & ~(alignment - 1); +} + static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UNICODE_STRING *str, const UNICODE_STRING *expect, UINT_PTR pos ) { @@ -341,9 +346,9 @@ static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UN ok_(__FILE__,line)( str->Buffer == NULL, "buffer not null %p\n", str->Buffer ); return pos; } - ok_(__FILE__,line)( (UINT_PTR)str->Buffer == ((pos + sizeof(void*) - 1) & ~(sizeof(void *) - 1)) || + ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)) || (!expect && (UINT_PTR)str->Buffer == pos) || /* initial params are not aligned */ - broken( (UINT_PTR)str->Buffer == ((pos + 3) & ~3) ), "wrong buffer %lx/%lx\n", + broken( (UINT_PTR)str->Buffer == align(pos, 4) ), "wrong buffer %lx/%lx\n", (UINT_PTR)str->Buffer, pos ); if (str->Length < str->MaximumLength) { @@ -424,7 +429,7 @@ static void test_process_params(void) pos = check_string( params, &params->Desktop, &empty_str, pos ); pos = check_string( params, &params->ShellInfo, &empty_str, pos ); pos = check_string( params, &params->RuntimeInfo, &null_str, pos ); - pos = (pos + 3) & ~3; + pos = align(pos, 4); ok( pos == params->Size || pos + 4 == params->Size, "wrong pos %lx/%x\n", pos, params->Size ); pos = params->Size; @@ -437,8 +442,8 @@ static void test_process_params(void) while (*str) str += lstrlenW(str) + 1; str++; pos += (str - params->Environment) * sizeof(WCHAR); - ok( ((pos + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) == size || - broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); + ok( align(pos, sizeof(void *)) == size || + broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params ); @@ -478,7 +483,7 @@ static void test_process_params(void) pos = check_string( params, &params->Desktop, &dummy, pos ); pos = check_string( params, &params->ShellInfo, &dummy, pos ); pos = check_string( params, &params->RuntimeInfo, &dummy, pos ); - pos = (pos + 3) & ~3; + pos = align(pos, 4); ok( pos == params->Size || pos + 4 == params->Size, "wrong pos %lx/%x\n", pos, params->Size ); pos = params->Size; @@ -491,8 +496,8 @@ static void test_process_params(void) while (*str) str += lstrlenW(str) + 1; str++; pos += (str - params->Environment) * sizeof(WCHAR); - ok( ((pos + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) == size || - broken( ((pos + 3) & ~3) == size ), "wrong size %lx/%lx\n", pos, size ); + ok( align(pos, sizeof(void *)) == size || + broken( align(pos, 4) == size ), "wrong size %lx/%lx\n", pos, size ); } else ok( broken(TRUE), "environment not inside block\n" ); /* <= win2k3 */ pRtlDestroyProcessParameters( params );

1 0

Paul Gofman : msvcrt: Add -norelay flag to lldiv definition in spec files.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 9be8c5255bb2c02467373bf373b6eefcfb0337ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be8c5255bb2c02467373bf3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 22 01:48:35 2021 +0300 msvcrt: Add -norelay flag to lldiv definition in spec files. lldiv returns lldiv_t structure (which includes two int64). In such case the address of return structure is implicitly passed as the first parameter. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec index c81c3d42127..584e61dd652 100644 --- a/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec +++ b/dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec @@ -22,7 +22,7 @@ @ cdecl labs(long) ucrtbase.labs @ cdecl -ret64 ldiv(long long) ucrtbase.ldiv @ cdecl -ret64 llabs(int64) ucrtbase.llabs -@ cdecl lldiv(int64 int64) ucrtbase.lldiv +@ cdecl -norelay lldiv(int64 int64) ucrtbase.lldiv @ cdecl qsort(ptr long long ptr) ucrtbase.qsort @ cdecl qsort_s(ptr long long ptr ptr) ucrtbase.qsort_s @ cdecl rand() ucrtbase.rand diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b15a6219c52..6af92d7ea6f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1733,7 +1733,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index c4782b5977b..45d8e2b3507 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2091,7 +2091,7 @@ @ cdecl ldexp(double long) @ cdecl -ret64 ldiv(long long) @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl localeconv() @ cdecl log(double) @ cdecl -arch=!i386 logf(float) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b8ba61a2e8c..91be9c65d2d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2247,7 +2247,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b99bb2ee614..f5d6cde1cac 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1910,7 +1910,7 @@ @ cdecl lgammaf(float) msvcr120.lgammaf @ cdecl lgammal(double) msvcr120.lgammal @ cdecl -ret64 llabs(int64) msvcr120.llabs -@ cdecl lldiv(int64 int64) msvcr120.lldiv +@ cdecl -norelay lldiv(int64 int64) msvcr120.lldiv @ cdecl -ret64 llrint(double) msvcr120.llrint @ cdecl -ret64 llrintf(float) msvcr120.llrintf @ cdecl -ret64 llrintl(double) msvcr120.llrintl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b1d6cf992b4..0a8d74521f5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2381,7 +2381,7 @@ @ cdecl lgammaf(float) @ cdecl lgammal(double) lgamma @ cdecl -ret64 llabs(int64) -@ cdecl lldiv(int64 int64) +@ cdecl -norelay lldiv(int64 int64) @ cdecl -ret64 llrint(double) @ cdecl -ret64 llrintf(float) @ cdecl -ret64 llrintl(double) llrint

1 0

Piotr Caban : crypt32: Also import user/admin defined root certificates on macOS.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: c53d6a4a7cd2237afe293594d97e6906acb3cc70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c53d6a4a7cd2237afe293594… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 25 14:52:20 2021 +0100 crypt32: Also import user/admin defined root certificates on macOS. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/unixlib.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 035f2d936bb..0c2370968e9 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -580,26 +580,35 @@ static void load_root_certs(void) DWORD i; #ifdef HAVE_SECURITY_SECURITY_H + const SecTrustSettingsDomain domains[] = { + kSecTrustSettingsDomainSystem, + kSecTrustSettingsDomainAdmin, + kSecTrustSettingsDomainUser + }; OSStatus status; - CFArrayRef rootCerts; + CFArrayRef certs; + DWORD domain; - status = SecTrustCopyAnchorCertificates(&rootCerts); - if (status == noErr) + for (domain = 0; domain < ARRAY_SIZE(domains); domain++) { - for (i = 0; i < CFArrayGetCount(rootCerts); i++) + status = SecTrustSettingsCopyCertificates(domains[domain], &certs); + if (status == noErr) { - SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(rootCerts, i); - CFDataRef certData; - if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + for (i = 0; i < CFArrayGetCount(certs); i++) { - BYTE *data = add_cert( CFDataGetLength(certData) ); - if (data) memcpy( data, CFDataGetBytePtr(certData), CFDataGetLength(certData) ); - CFRelease(certData); + SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(certs, i); + CFDataRef certData; + if ((status = SecKeychainItemExport(cert, kSecFormatX509Cert, 0, NULL, &certData)) == noErr) + { + BYTE *data = add_cert( CFDataGetLength(certData) ); + if (data) memcpy( data, CFDataGetBytePtr(certData), CFDataGetLength(certData) ); + CFRelease(certData); + } + else + WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); } - else - WARN("could not export certificate %d to X509 format: 0x%08x\n", i, (unsigned int)status); + CFRelease(certs); } - CFRelease(rootCerts); } #endif

1 0

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

25 Jan '21

Module: wine Branch: master Commit: 2129e335f271b1d0123be85faaf86b685c8e734c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2129e335f271b1d0123be85f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 25 12:35:29 2021 +0100 widl: Support WinRT marshaling_behavior 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 | 4 ++++ tools/widl/parser.y | 18 ++++++++++++++++-- tools/widl/widltypes.h | 9 +++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 9dce03577c6..01c6f800a08 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -320,6 +320,7 @@ static const struct keyword keywords[] = { static const struct keyword attr_keywords[] = { {"aggregatable", tAGGREGATABLE, 0}, + {"agile", tAGILE, 1}, {"all_nodes", tALLNODES, 0}, {"allocate", tALLOCATE, 0}, {"annotation", tANNOTATION, 0}, @@ -381,12 +382,14 @@ static const struct keyword attr_keywords[] = {"length_is", tLENGTHIS, 0}, {"licensed", tLICENSED, 0}, {"local", tLOCAL, 0}, + {"marshaling_behavior", tMARSHALINGBEHAVIOR, 1}, {"maybe", tMAYBE, 0}, {"message", tMESSAGE, 0}, {"neutral", tNEUTRAL, 0}, {"nocode", tNOCODE, 0}, {"nonbrowsable", tNONBROWSABLE, 0}, {"noncreatable", tNONCREATABLE, 0}, + {"none", tNONE, 1}, {"nonextensible", tNONEXTENSIBLE, 0}, {"notify", tNOTIFY, 0}, {"notify_flag", tNOTIFYFLAG, 0}, @@ -416,6 +419,7 @@ static const struct keyword attr_keywords[] = {"single_node", tSINGLENODE, 0}, {"size_is", tSIZEIS, 0}, {"source", tSOURCE, 0}, + {"standard", tSTANDARD, 1}, {"strict_context_handle", tSTRICTCONTEXTHANDLE, 0}, {"string", tSTRING, 0}, {"switch_is", tSWITCHIS, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b729d772fcd..48f180cdb49 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -174,7 +174,9 @@ static typelib_t *current_typelib; %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND %token ELLIPSIS -%token tAGGREGATABLE tALLNODES tALLOCATE tANNOTATION +%token tAGGREGATABLE +%token tAGILE +%token tALLNODES tALLOCATE tANNOTATION %token tAPICONTRACT %token tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT @@ -216,12 +218,14 @@ static typelib_t *current_typelib; %token tLENGTHIS tLIBRARY %token tLICENSED tLOCAL %token tLONG +%token tMARSHALINGBEHAVIOR %token tMAYBE tMESSAGE %token tMETHODS %token tMODULE %token tNAMESPACE %token tNOCODE tNONBROWSABLE %token tNONCREATABLE +%token tNONE %token tNONEXTENSIBLE %token tNOTIFY tNOTIFYFLAG %token tNULL @@ -247,6 +251,7 @@ static typelib_t *current_typelib; %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE +%token tSTANDARD %token tSTATIC %token tSTDCALL %token tSTRICTCONTEXTHANDLE @@ -299,7 +304,7 @@ static typelib_t *current_typelib; %type <type> coclass coclasshdr coclassdef %type <type> apicontract %type <num> contract_ver -%type <num> pointer_type threading_type version +%type <num> pointer_type threading_type marshaling_behavior version %type <str> libraryhdr callconv cppquote importlib import t_ident %type <uuid> uuid_string %type <import> import_start @@ -505,6 +510,12 @@ str_list: aSTRING { $$ = append_str( NULL, $1 ); } | str_list ',' aSTRING { $$ = append_str( $1, $3 ); } ; +marshaling_behavior: + tAGILE { $$ = MARSHALING_AGILE; } + | tNONE { $$ = MARSHALING_NONE; } + | tSTANDARD { $$ = MARSHALING_STANDARD; } + ; + contract_ver: aNUM { $$ = MAKEVERSION(0, $1); } | aNUM '.' aNUM { $$ = MAKEVERSION($3, $1); } @@ -572,6 +583,8 @@ attribute: { $$ = NULL; } | tLCID { $$ = make_attr(ATTR_PARAMLCID); } | tLICENSED { $$ = make_attr(ATTR_LICENSED); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } + | tMARSHALINGBEHAVIOR '(' marshaling_behavior ')' + { $$ = make_attrv(ATTR_MARSHALING_BEHAVIOR, $3); } | tMAYBE { $$ = make_attr(ATTR_MAYBE); } | tMESSAGE { $$ = make_attr(ATTR_MESSAGE); } | tNOCODE { $$ = make_attr(ATTR_NOCODE); } @@ -2230,6 +2243,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_LIBLCID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "lcid" }, /* ATTR_LICENSED */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "licensed" }, /* ATTR_LOCAL */ { 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "local" }, + /* ATTR_MARSHALING_BEHAVIOR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "marshaling_behavior" }, /* ATTR_MAYBE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "maybe" }, /* ATTR_MESSAGE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "message" }, /* ATTR_NOCODE */ { 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "nocode" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d5862426ad4..6c130d4701e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -125,6 +125,7 @@ enum attr_type ATTR_LIBLCID, ATTR_LICENSED, ATTR_LOCAL, + ATTR_MARSHALING_BEHAVIOR, ATTR_MAYBE, ATTR_MESSAGE, ATTR_NOCODE, @@ -271,6 +272,14 @@ enum threading_type THREADING_BOTH }; +enum marshaling_type +{ + MARSHALING_INVALID = 0, + MARSHALING_NONE, + MARSHALING_AGILE, + MARSHALING_STANDARD, +}; + enum type_basic_type { TYPE_BASIC_INT8 = 1,

1 0

Rémi Bernon : widl: Remove unnecessary WinRT type comments.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: d90dc11d1acc0221e02e92f0627530bee9078688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d90dc11d1acc0221e02e92f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 25 12:35:28 2021 +0100 widl: Remove unnecessary WinRT type comments. 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/header.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 223ab5c5ca9..d5e35aac92f 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -45,8 +45,6 @@ generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declonly, const char *name, enum name_type name_type); -static void write_winrt_type_comments(FILE *header, const type_t *type); - static void write_apicontract_guard_start(FILE *header, const expr_t *expr); static void write_apicontract_guard_end(FILE *header, const expr_t *expr); @@ -1482,20 +1480,6 @@ static char *format_apicontract_macro(const type_t *type) return name; } -static void write_winrt_type_comments(FILE *header, const type_t *type) -{ - expr_t *contract = get_attrp(type->attrs, ATTR_CONTRACT); - fprintf(header, " *\n"); - if (contract) - { - const type_t *type = contract->u.tref.type; - char *name = format_namespace(type->namespace, "", ".", type->name, NULL); - int ver = contract->ref->u.lval; - fprintf(header, " * Introduced to %s in version %d.%d\n *\n", name, (ver >> 16) & 0xffff, ver & 0xffff); - free(name); - } -} - static void write_apicontract_guard_start(FILE *header, const expr_t *expr) { const type_t *type; @@ -1528,7 +1512,6 @@ static void write_com_interface_start(FILE *header, const type_t *iface) expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s %sinterface\n", iface->name, dispinterface ? "disp" : ""); - if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->c_name, dispinterface ? "DISP" : ""); @@ -1630,7 +1613,6 @@ static void write_rpc_interface_start(FILE *header, const type_t *iface) fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); - if (winrt_mode) write_winrt_type_comments(header, iface); fprintf(header, " */\n"); if (contract) write_apicontract_guard_start(header, contract); fprintf(header,"#ifndef __%s_INTERFACE_DEFINED__\n", iface->name);

1 0

Zebediah Figura : msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 408662379281aa24f41b680f1aba9abf2b40c603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=408662379281aa24f41b680f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 17:42:42 2021 -0600 msi: Return an error if trying to run a 64-bit custom action in a 32-bit prefix. This matches native behaviour (manually tested). This allows the Research in Motion (Blackberry) USB and Modem driver to fail cleanly instead of hanging, if run in a 32-bit prefix. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 7ae7e45af29..fb03958eb11 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -748,6 +748,13 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( if (!ret) info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); + if (info->arch == SCS_64BIT_BINARY && sizeof(void *) == 4 && !is_wow64) + { + ERR("Attempt to run a 64-bit custom action inside a 32-bit WINEPREFIX.\n"); + free_custom_action_data( info ); + return NULL; + } + custom_start_server(package, info->arch); info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL);

1 0

Zebediah Figura : msi: Check for failure from do_msidbCustomActionTypeDll().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 5f21acdc9e9840b50a6991b8e8dc52758adb192d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f21acdc9e9840b50a6991b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 17:42:41 2021 -0600 msi: Check for failure from do_msidbCustomActionTypeDll(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b3ac7327d94..7ae7e45af29 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -771,7 +771,8 @@ static UINT HANDLE_CustomType1( MSIPACKAGE *package, const WCHAR *source, const TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); - info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); } @@ -876,7 +877,8 @@ static UINT HANDLE_CustomType17( MSIPACKAGE *package, const WCHAR *source, const return ERROR_FUNCTION_FAILED; } - info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); + if (!(info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ))) + return ERROR_FUNCTION_FAILED; return wait_thread_handle( info ); }

1 0

Zebediah Figura : winegstreamer: Don't force got_data_sink() onto a Wine thread.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 3d7486d66b93dc749113300a004182de4ac72d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7486d66b93dc749113300a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:47 2021 -0600 winegstreamer: Don't force got_data_sink() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 13 ------------- dlls/winegstreamer/gst_cbs.h | 8 -------- dlls/winegstreamer/gstdemux.c | 8 +------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index ebef533779d..5b163e40201 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -216,19 +216,6 @@ gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) return cbdata.u.event_sink_data.ret; } -GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) -{ - struct cb_data cbdata = { GOT_DATA_SINK }; - - cbdata.u.got_data_sink_data.pad = pad; - cbdata.u.got_data_sink_data.parent = parent; - cbdata.u.got_data_sink_data.buf = buf; - - call_cb(&cbdata); - - return cbdata.u.got_data_sink_data.ret; -} - void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) { struct cb_data cbdata = { REMOVED_DECODED_PAD }; diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index ce74e76edae..2de829f72e3 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -36,7 +36,6 @@ enum CB_TYPE { REQUEST_BUFFER_SRC, EVENT_SRC, EVENT_SINK, - GOT_DATA_SINK, REMOVED_DECODED_PAD, QUERY_SINK, GSTDEMUX_MAX, @@ -102,12 +101,6 @@ struct cb_data { GstEvent *event; gboolean ret; } event_sink_data; - struct got_data_sink_data { - GstPad *pad; - GstObject *parent; - GstBuffer *buf; - GstFlowReturn ret; - } got_data_sink_data; struct pad_removed_data { GstElement *element; GstPad *pad; @@ -137,7 +130,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; -GstFlowReturn got_data_sink_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; GstFlowReturn got_data_wrapper(GstPad *pad, GstObject *parent, GstBuffer *buf) DECLSPEC_HIDDEN; void removed_decoded_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f51137344f9..5401d942a41 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2378,7 +2378,7 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name sprintf(pad_name, "qz_sink_%u", filter->source_count); pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin); - gst_pad_set_chain_function(pin->my_sink, got_data_sink_wrapper); + gst_pad_set_chain_function(pin->my_sink, got_data_sink); gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); @@ -2465,12 +2465,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.event_sink_data.ret = event_sink(data->pad, data->parent, data->event); break; } - case GOT_DATA_SINK: - { - struct got_data_sink_data *data = &cbdata->u.got_data_sink_data; - cbdata->u.got_data_sink_data.ret = got_data_sink(data->pad, data->parent, data->buf); - break; - } case REMOVED_DECODED_PAD: { struct pad_removed_data *data = &cbdata->u.pad_removed_data;

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in got_data_sink().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 2cdb12b08e632b38296b26cb9a68df67e5eeb23f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cdb12b08e632b38296b26cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:46 2021 -0600 winegstreamer: Avoid using Wine debug functions in got_data_sink(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ea1268ef0dd..f51137344f9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -690,13 +690,13 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct if (pin->flushing) { pthread_mutex_unlock(&filter->mutex); - TRACE("Filter is flushing; discarding event.\n"); + GST_DEBUG("Filter is flushing; discarding event."); return GST_FLOW_FLUSHING; } pin->event = *event; pthread_mutex_unlock(&filter->mutex); pthread_cond_signal(&pin->event_cond); - TRACE("Event queued.\n"); + GST_LOG("Event queued."); return GST_FLOW_OK; } @@ -880,7 +880,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu struct parser_event stream_event; GstFlowReturn ret; - TRACE("pad %p, pin %p, buffer %p.\n", pad, pin, buffer); + GST_LOG("pin %p, buffer %p.", pin, buffer); if (!pin->pin.pin.peer) {

1 0

Zebediah Figura : winegstreamer: Factor out get_stream_event().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 13ea906985a7e0f3190cdff97f1f1322bd0184ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ea906985a7e0f3190cdff9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:45 2021 -0600 winegstreamer: Factor out get_stream_event(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 46 ++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d16a8d28dd4..ea1268ef0dd 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1023,6 +1023,31 @@ static void send_buffer(struct parser_source *pin, GstBuffer *buf) gst_buffer_unref(buf); } +static bool get_stream_event(struct parser_source *pin, struct parser_event *event) +{ + struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + + pthread_mutex_lock(&filter->mutex); + + while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) + pthread_cond_wait(&pin->event_cond, &filter->mutex); + + if (filter->flushing) + { + pthread_mutex_unlock(&filter->mutex); + TRACE("Filter is flushing.\n"); + return false; + } + + *event = pin->event; + pin->event.type = PARSER_EVENT_NONE; + + pthread_mutex_unlock(&filter->mutex); + pthread_cond_signal(&pin->event_empty_cond); + + return true; +} + static DWORD CALLBACK stream_thread(void *arg) { struct parser_source *pin = arg; @@ -1035,32 +1060,13 @@ static DWORD CALLBACK stream_thread(void *arg) struct parser_event event; EnterCriticalSection(&pin->flushing_cs); - pthread_mutex_lock(&filter->mutex); - while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_cond, &filter->mutex); - - if (filter->flushing) + if (!get_stream_event(pin, &event)) { - pthread_mutex_unlock(&filter->mutex); LeaveCriticalSection(&pin->flushing_cs); - TRACE("Filter is flushing.\n"); continue; } - if (!pin->event.type) - { - pthread_mutex_unlock(&filter->mutex); - LeaveCriticalSection(&pin->flushing_cs); - continue; - } - - event = pin->event; - pin->event.type = PARSER_EVENT_NONE; - pthread_cond_signal(&pin->event_empty_cond); - - pthread_mutex_unlock(&filter->mutex); - TRACE("Got event of type %#x.\n", event.type); switch (event.type)

1 0

Zebediah Figura : winegstreamer: Use pthread condition variables to queue stream events.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 54e012b5b7ca55f4b6866a39f4c98292d544e48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e012b5b7ca55f4b6866a39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:44 2021 -0600 winegstreamer: Use pthread condition variables to queue stream events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 73 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 22df838e4df..d16a8d28dd4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -60,8 +60,6 @@ struct parser LONGLONG filesize; - CRITICAL_SECTION cs; - /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ @@ -117,7 +115,7 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; - CONDITION_VARIABLE event_cv, event_empty_cv; + pthread_cond_t event_cond, event_empty_cond; bool flushing, eos; struct parser_event event; HANDLE thread; @@ -686,18 +684,18 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct { struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) - SleepConditionVariableCS(&pin->event_empty_cv, &filter->cs, INFINITE); + pthread_cond_wait(&pin->event_empty_cond, &filter->mutex); if (pin->flushing) { - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); TRACE("Filter is flushing; discarding event.\n"); return GST_FLOW_FLUSHING; } pin->event = *event; - LeaveCriticalSection(&filter->cs); - WakeConditionVariable(&pin->event_cv); + pthread_mutex_unlock(&filter->mutex); + pthread_cond_signal(&pin->event_cond); TRACE("Event queued.\n"); return GST_FLOW_OK; } @@ -755,10 +753,10 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_START: if (pin->pin.pin.peer) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); pin->flushing = true; - WakeConditionVariable(&pin->event_empty_cv); + pthread_cond_signal(&pin->event_empty_cond); switch (pin->event.type) { @@ -773,7 +771,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } pin->event.type = PARSER_EVENT_NONE; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); } break; @@ -781,9 +779,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.peer) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); pin->flushing = false; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); } break; @@ -1037,14 +1035,14 @@ static DWORD CALLBACK stream_thread(void *arg) struct parser_event event; EnterCriticalSection(&pin->flushing_cs); - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) - SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); + pthread_cond_wait(&pin->event_cond, &filter->mutex); if (filter->flushing) { - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); LeaveCriticalSection(&pin->flushing_cs); TRACE("Filter is flushing.\n"); continue; @@ -1052,16 +1050,16 @@ static DWORD CALLBACK stream_thread(void *arg) if (!pin->event.type) { - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); LeaveCriticalSection(&pin->flushing_cs); continue; } event = pin->event; pin->event.type = PARSER_EVENT_NONE; - WakeConditionVariable(&pin->event_empty_cv); + pthread_cond_signal(&pin->event_empty_cond); - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); TRACE("Got event of type %#x.\n", event.type); @@ -1598,8 +1596,6 @@ static void parser_destroy(struct strmbase_filter *iface) pthread_cond_destroy(&filter->init_cond); pthread_mutex_destroy(&filter->mutex); - filter->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->cs); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); @@ -1616,9 +1612,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = true; - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = false; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -1656,9 +1652,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = false; - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = true; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -1667,7 +1663,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) if (!pin->pin.pin.peer) continue; - WakeConditionVariable(&pin->event_cv); + pthread_cond_signal(&pin->event_cond); } for (i = 0; i < filter->source_count; ++i) @@ -1893,8 +1889,6 @@ static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); pthread_cond_init(&object->init_cond, NULL); - InitializeCriticalSection(&object->cs); - object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.cs"); object->flushing = true; } @@ -2044,15 +2038,15 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = true; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) { if (filter->sources[i]->pin.pin.peer) { - WakeConditionVariable(&pin->event_cv); + pthread_cond_signal(&pin->event_cond); IPin_BeginFlush(filter->sources[i]->pin.pin.peer); } } @@ -2093,9 +2087,9 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = false; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -2329,6 +2323,9 @@ static void free_source_pin(struct parser_source *pin) gst_object_unref(pin->my_sink); gst_segment_free(pin->segment); + pthread_cond_destroy(&pin->event_cond); + pthread_cond_destroy(&pin->event_empty_cond); + pin->flushing_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pin->flushing_cs); @@ -2365,8 +2362,8 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate); - InitializeConditionVariable(&pin->event_cv); - InitializeConditionVariable(&pin->event_empty_cv); + pthread_cond_init(&pin->event_cond, NULL); + pthread_cond_init(&pin->event_empty_cond, NULL); BaseFilterImpl_IncrementPinVersion(&filter->filter); InitializeCriticalSection(&pin->flushing_cs); @@ -2394,13 +2391,13 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) return S_OK; /* Unblock all of our streams. */ - EnterCriticalSection(&This->cs); + pthread_mutex_lock(&This->mutex); for (i = 0; i < This->source_count; ++i) { This->sources[i]->flushing = true; - WakeConditionVariable(&This->sources[i]->event_empty_cv); + pthread_cond_signal(&This->sources[i]->event_empty_cond); } - LeaveCriticalSection(&This->cs); + pthread_mutex_unlock(&This->mutex); gst_element_set_state(This->container, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink);

1 0

Zebediah Figura : winegstreamer: Don't force no_more_pads() onto a Wine thread.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: e785880a96d677acaa06667d006e329516a1923a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e785880a96d677acaa06667d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:43 2021 -0600 winegstreamer: Don't force no_more_pads() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 10 ---------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 10 ++-------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index b9effe73a5b..ebef533779d 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -174,16 +174,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, return cbdata.u.activate_mode_data.ret; } -void no_more_pads_wrapper(GstElement *element, gpointer user) -{ - struct cb_data cbdata = { NO_MORE_PADS }; - - cbdata.u.no_more_pads_data.element = element; - cbdata.u.no_more_pads_data.user = user; - - call_cb(&cbdata); -} - GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) { diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 0e262c12db8..ce74e76edae 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -33,7 +33,6 @@ enum CB_TYPE { EXISTING_NEW_PAD, QUERY_FUNCTION, ACTIVATE_MODE, - NO_MORE_PADS, REQUEST_BUFFER_SRC, EVENT_SRC, EVENT_SINK, @@ -135,7 +134,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; -void no_more_pads_wrapper(GstElement *decodebin, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 56b8225c3df..22df838e4df 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1765,7 +1765,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); filter->their_sink = gst_element_get_static_pad(element, "sink"); @@ -2443,12 +2443,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); break; } - case NO_MORE_PADS: - { - struct no_more_pads_data *data = &cbdata->u.no_more_pads_data; - no_more_pads(data->element, data->user); - break; - } case REQUEST_BUFFER_SRC: { struct getrange_data *data = &cbdata->u.getrange_data; @@ -2645,7 +2639,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); filter->their_sink = gst_element_get_static_pad(element, "sink");

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in no_more_pads().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 7875d8dd878b31b70d9bc537f5ce08b511287ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7875d8dd878b31b70d9bc537… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:42 2021 -0600 winegstreamer: Avoid using Wine debug functions in no_more_pads(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e85e54c2e34..56b8225c3df 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1398,7 +1398,8 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g static void no_more_pads(GstElement *decodebin, gpointer user) { struct parser *filter = user; - TRACE("filter %p.\n", filter); + + GST_DEBUG("filter %p.", filter); pthread_mutex_lock(&filter->mutex); filter->no_more_pads = true;

1 0

Alexandre Julliard : makefiles: Add missing dependency to wrc for test dll resources.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 852c9c69de224669e5838bbc24642af633c9c620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=852c9c69de224669e5838bbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 24 21:58:53 2021 +0100 makefiles: Add missing dependency to wrc for test dll resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 306a50eef5d..913854c7f05 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3083,7 +3083,10 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_add( &make->clean_files, dll_name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); - output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); + output( "%s.res:", obj_dir_path( make, obj )); + output_filename( obj_dir_path( make, dll_name )); + output_filename( tools_path( make, "wrc" )); + output( "\n" ); output( "\t%secho \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, output_file, tools_path( make, "wrc" ));

1 0

Alexandre Julliard : ntdll: Delay mapping a module until we have found the final one to load.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 5fef775ddfc96334ee841c7fce1df8bcadb4fe1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fef775ddfc96334ee841c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 14:27:52 2021 +0100 ntdll: Delay mapping a module until we have found the final one to load. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 108 +++++++++++++++++++---------------------------- dlls/ntdll/unix/loader.c | 98 ++++++++++++++++++++++++------------------ 2 files changed, 100 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fef775ddfc96334ee84…

1 0

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