October 2021 - Wine-commits

Eric Pouech : winedbg: Add a pair of helpers for accessing frames' internal info.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 83f85f5c919621c891473199f601c15341a36f13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f85f5c919621c891473199… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:56 2021 +0200 winedbg: Add a pair of helpers for accessing frames' internal info. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 13 ++++++++++++- programs/winedbg/stack.c | 16 ++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 6ed0f8bfe2f..7af9e0d75e4 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -179,7 +179,7 @@ struct dbg_thread * - only valid when in_exception is TRUE */ EXCEPTION_RECORD excpt_record; /* only valid when in_exception is TRUE */ - struct + struct dbg_frame { ADDRESS64 addr_pc; ADDRESS64 addr_frame; @@ -390,6 +390,17 @@ extern BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf); extern BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pval); extern unsigned stack_fetch_frames(const dbg_ctx_t *ctx); extern BOOL stack_get_current_symbol(SYMBOL_INFO* sym); +static inline struct dbg_frame* + stack_get_thread_frame(struct dbg_thread* thd, unsigned nf) +{ + if (!thd->frames || nf >= thd->num_frames) return NULL; + return &thd->frames[nf]; +} +static inline struct dbg_frame* + stack_get_curr_frame(void) +{ + return stack_get_thread_frame(dbg_curr_thread, dbg_curr_thread->curr_frame); +} /* symbol.c */ extern enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, struct dbg_lvalue* addr, BOOL bp_disp); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 396caf11edd..9c22587a864 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -111,10 +111,10 @@ BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf) BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pval) { - if (dbg_curr_thread->frames == NULL) return FALSE; - if (dbg_curr_thread->frames[dbg_curr_thread->curr_frame].is_ctx_valid) - *pval = (DWORD_PTR*)((char*)&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].context + - (DWORD_PTR)div->pval); + struct dbg_frame* currfrm = stack_get_curr_frame(); + if (currfrm == NULL) return FALSE; + if (currfrm->is_ctx_valid) + *pval = (DWORD_PTR*)((char*)&currfrm->context + (DWORD_PTR)div->pval); else { enum be_cpu_addr kind; @@ -125,13 +125,13 @@ BOOL stack_get_register_frame(const struct dbg_internal_var* div, DWORD_PTR** pv switch (kind) { case be_cpu_addr_pc: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_pc; + *pval = &currfrm->linear_pc; break; case be_cpu_addr_stack: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_stack; + *pval = &currfrm->linear_stack; break; case be_cpu_addr_frame: - *pval = &dbg_curr_thread->frames[dbg_curr_thread->curr_frame].linear_frame; + *pval = &currfrm->linear_frame; break; } } @@ -143,7 +143,7 @@ BOOL stack_set_frame(int newframe) ADDRESS64 addr; if (!stack_set_frame_internal(newframe)) return FALSE; addr.Mode = AddrModeFlat; - addr.Offset = (DWORD_PTR)memory_to_linear_addr(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_pc); + addr.Offset = (DWORD_PTR)memory_to_linear_addr(&stack_get_curr_frame()->addr_pc); source_list_from_addr(&addr, 0); return TRUE; }

1 0

Eric Pouech : winedbg: Use SymSetScopeFromAddr() instead of SymSetContext().
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 885200417046de2edd4cc8b98b93763823c82f24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=885200417046de2edd4cc8b9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:46:01 2021 +0200 winedbg: Use SymSetScopeFromAddr() instead of SymSetContext(). This allows to simplify a bit the frame internal storage (no longer using IMAGEHLP_STACK_FRAME structure). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 - programs/winedbg/stack.c | 88 +++++++++++++++++++-------------------------- programs/winedbg/symbol.c | 23 ++++++------ 3 files changed, 48 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=885200417046de2edd4c…

1 0

Eric Pouech : winedbg: Use inline contexts oriented APIs for stack backtrace.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: ce6eeda0181e11f5313bd488c8e988509dacddb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce6eeda0181e11f5313bd488… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:46:07 2021 +0200 winedbg: Use inline contexts oriented APIs for stack backtrace. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 + programs/winedbg/stack.c | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 498a1a0516d..28126c28930 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -188,6 +188,7 @@ struct dbg_thread DWORD_PTR linear_frame; DWORD_PTR linear_stack; dbg_ctx_t context; /* context we got out of stackwalk for this frame */ + DWORD inline_ctx; BOOL is_ctx_valid; /* is the context above valid */ }* frames; int num_frames; diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 317eb5626dd..4d2389ee345 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -80,8 +80,9 @@ static BOOL stack_set_local_scope(void) * Therefore, we decrement linear_pc in order to ensure that * the considered address is really inside the current function or inline site. */ - return SymSetScopeFromAddr(dbg_curr_process->handle, - (dbg_curr_thread->curr_frame) ? frm->linear_pc - 1 : frm->linear_pc); + return SymSetScopeFromInlineContext(dbg_curr_process->handle, + (dbg_curr_thread->curr_frame) ? frm->linear_pc - 1 : frm->linear_pc, + frm->inline_ctx); } static BOOL stack_set_frame_internal(int newframe) @@ -149,7 +150,7 @@ BOOL stack_get_current_symbol(SYMBOL_INFO* symbol) struct dbg_frame* frm = stack_get_curr_frame(); if (frm == NULL) return FALSE; - return SymFromAddr(dbg_curr_process->handle, frm->linear_pc, &disp, symbol); + return SymFromInlineContext(dbg_curr_process->handle, frm->linear_pc, frm->inline_ctx, &disp, symbol); } static BOOL CALLBACK stack_read_mem(HANDLE hProc, DWORD64 addr, @@ -173,21 +174,23 @@ static BOOL CALLBACK stack_read_mem(HANDLE hProc, DWORD64 addr, */ unsigned stack_fetch_frames(const dbg_ctx_t* _ctx) { - STACKFRAME64 sf; - unsigned nf = 0; + STACKFRAME_EX sf; + unsigned nf = 0; /* as native stackwalk can modify the context passed to it, simply copy * it to avoid any damage */ - dbg_ctx_t ctx = *_ctx; - BOOL ret; + dbg_ctx_t ctx = *_ctx; + BOOL ret; HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames); dbg_curr_thread->frames = NULL; memset(&sf, 0, sizeof(sf)); + sf.StackFrameSize = sizeof(sf); dbg_curr_process->be_cpu->get_addr(dbg_curr_thread->handle, &ctx, be_cpu_addr_frame, &sf.AddrFrame); dbg_curr_process->be_cpu->get_addr(dbg_curr_thread->handle, &ctx, be_cpu_addr_pc, &sf.AddrPC); dbg_curr_process->be_cpu->get_addr(dbg_curr_thread->handle, &ctx, be_cpu_addr_stack, &sf.AddrStack); + sf.InlineFrameContext = INLINE_FRAME_CONTEXT_INIT; /* don't confuse StackWalk by passing in inconsistent addresses */ if ((sf.AddrPC.Mode == AddrModeFlat) && (sf.AddrFrame.Mode != AddrModeFlat)) @@ -196,9 +199,9 @@ unsigned stack_fetch_frames(const dbg_ctx_t* _ctx) sf.AddrFrame.Mode = AddrModeFlat; } - while ((ret = StackWalk64(dbg_curr_process->be_cpu->machine, dbg_curr_process->handle, + while ((ret = StackWalkEx(dbg_curr_process->be_cpu->machine, dbg_curr_process->handle, dbg_curr_thread->handle, &sf, &ctx, stack_read_mem, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) || + SymFunctionTableAccess64, SymGetModuleBase64, NULL, SYM_STKWALK_DEFAULT)) || nf == 0) /* we always register first frame information */ { dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, @@ -211,6 +214,7 @@ unsigned stack_fetch_frames(const dbg_ctx_t* _ctx) dbg_curr_thread->frames[nf].addr_stack = sf.AddrStack; dbg_curr_thread->frames[nf].linear_stack = (DWORD_PTR)memory_to_linear_addr(&sf.AddrStack); dbg_curr_thread->frames[nf].context = ctx; + dbg_curr_thread->frames[nf].inline_ctx = sf.InlineFrameContext; /* FIXME: can this heuristic be improved: we declare first context always valid, and next ones * if it has been modified by the call to StackWalk... */ @@ -268,7 +272,7 @@ static void stack_print_addr_and_args(void) si->SizeOfStruct = sizeof(*si); si->MaxNameLen = 256; - if (SymFromAddr(dbg_curr_process->handle, frm->linear_pc, &disp64, si)) + if (SymFromInlineContext(dbg_curr_process->handle, frm->linear_pc, frm->inline_ctx, &disp64, si)) { struct sym_enum se; DWORD disp; @@ -284,7 +288,8 @@ static void stack_print_addr_and_args(void) dbg_printf(")"); il.SizeOfStruct = sizeof(il); - if (SymGetLineFromAddr64(dbg_curr_process->handle, frm->linear_pc, &disp, &il)) + if (SymGetLineFromInlineContext(dbg_curr_process->handle, frm->linear_pc, frm->inline_ctx, + 0, &disp, &il)) dbg_printf(" [%s:%u]", il.FileName, il.LineNumber); dbg_printf(" in %s", im.ModuleName); }

1 0

Paul Gofman : ntdll: Return sufficient info size at once from NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: b5f3ddd185808e45e702490348493919dac95ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f3ddd185808e45e7024903… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 25 21:46:19 2021 +0300 ntdll: Return sufficient info size at once from NtQuerySystemInformation(SystemProcessInformation). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 43 +++++++++++++++++++++++++++++------------- dlls/ntdll/unix/system.c | 17 +++++++++++++---- include/wine/server_protocol.h | 4 +++- server/process.c | 4 ++++ server/protocol.def | 2 ++ server/request.h | 4 +++- server/trace.c | 2 ++ 7 files changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6e71f0848ec..635c551383c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -470,25 +470,30 @@ static void test_query_process(void) SYSTEM_THREAD_INFORMATION ti[1]; } SYSTEM_PROCESS_INFORMATION_PRIVATE; - ULONG SystemInformationLength = sizeof(SYSTEM_PROCESS_INFORMATION_PRIVATE); - SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + SYSTEM_PROCESS_INFORMATION_PRIVATE *spi, *spi_buf; + BOOL current_process_found = FALSE; /* test ReturnLength */ ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); - ok( ReturnLength > 0, "got 0 length\n"); + ok( ReturnLength > 0, "got 0 length\n" ); - /* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */ - for (;;) + /* W2K3 and later returns the needed length, the rest returns 0. */ + if (!ReturnLength) { - status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, SystemInformationLength, &ReturnLength); - - if (status != STATUS_INFO_LENGTH_MISMATCH) break; - - spi_buf = HeapReAlloc(GetProcessHeap(), 0, spi_buf , SystemInformationLength *= 2); + win_skip( "Zero return length, skipping tests." ); + return; } - ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + spi_buf = HeapAlloc(GetProcessHeap(), 0, ReturnLength); + status = pNtQuerySystemInformation(SystemProcessInformation, spi_buf, ReturnLength, &ReturnLength); + + /* Sometimes new process or threads appear between the call and increase the size, + * otherwise the previously returned buffer size should be sufficient. */ + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH, + "Expected STATUS_SUCCESS, got %08x\n", status ); + spi = spi_buf; for (;;) @@ -496,9 +501,16 @@ static void test_query_process(void) DWORD_PTR tid; DWORD j; + winetest_push_context( "i %u (%s)", i, debugstr_w(spi->ProcessName.Buffer) ); + i++; last_pid = (DWORD_PTR)spi->UniqueProcessId; + ok( !(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId ); + + if (last_pid == GetCurrentProcessId()) + current_process_found = TRUE; + ok(!(last_pid & 3), "Unexpected PID low bits: %p\n", spi->UniqueProcessId); for (j = 0; j < spi->dwThreadCount; j++) { @@ -511,12 +523,17 @@ static void test_query_process(void) ok(!(tid & 3), "Unexpected TID low bits: %p\n", spi->ti[j].ClientId.UniqueThread); } - if (!spi->NextEntryOffset) break; - + if (!spi->NextEntryOffset) + { + winetest_pop_context(); + break; + } one_before_last_pid = last_pid; spi = (SYSTEM_PROCESS_INFORMATION_PRIVATE*)((char*)spi + spi->NextEntryOffset); + winetest_pop_context(); } + ok( current_process_found, "Test process not found.\n" ); if (winetest_debug > 1) trace("%u processes, %u threads\n", i, k); if (one_before_last_pid == 0) one_before_last_pid = last_pid; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c6bbabd85c5..33e7083d18b 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2446,10 +2446,13 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, case SystemProcessInformation: /* 5 */ { - unsigned int process_count, i, j; + unsigned int process_count, total_thread_count, total_name_len, i, j; char *buffer = NULL; unsigned int pos = 0; +C_ASSERT( sizeof(struct thread_info) <= sizeof(SYSTEM_THREAD_INFORMATION) ); +C_ASSERT( sizeof(struct process_info) <= sizeof(SYSTEM_PROCESS_INFORMATION) ); + if (size && !(buffer = malloc( size ))) { ret = STATUS_NO_MEMORY; @@ -2460,19 +2463,25 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { wine_server_set_reply( req, buffer, size ); ret = wine_server_call( req ); - len = reply->info_size; + total_thread_count = reply->total_thread_count; + total_name_len = reply->total_name_len; process_count = reply->process_count; } SERVER_END_REQ; + len = 0; + if (ret) { + if (ret == STATUS_INFO_LENGTH_MISMATCH) + len = sizeof(SYSTEM_PROCESS_INFORMATION) * process_count + + (total_name_len + process_count) * sizeof(WCHAR) + + total_thread_count * sizeof(SYSTEM_THREAD_INFORMATION); + free( buffer ); break; } - len = 0; - for (i = 0; i < process_count; i++) { SYSTEM_PROCESS_INFORMATION *nt_process = (SYSTEM_PROCESS_INFORMATION *)((char *)info + len); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a85e0bc4ff..6e38d0b075d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2029,6 +2029,8 @@ struct list_processes_reply struct reply_header __header; data_size_t info_size; int process_count; + int total_thread_count; + data_size_t total_name_len; /* VARARG(data,process_info,info_size); */ }; @@ -6259,7 +6261,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 733 +#define SERVER_PROTOCOL_VERSION 734 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index d8d09698558..b6ad4e47bd4 100644 --- a/server/process.c +++ b/server/process.c @@ -1868,6 +1868,8 @@ DECL_HANDLER(list_processes) char *buffer; reply->process_count = 0; + reply->total_thread_count = 0; + reply->total_name_len = 0; reply->info_size = 0; LIST_FOR_EACH_ENTRY( process, &process_list, struct process, entry ) @@ -1877,6 +1879,8 @@ DECL_HANDLER(list_processes) reply->info_size = (reply->info_size + 7) & ~7; reply->info_size += process->running_threads * sizeof(struct thread_info); reply->process_count++; + reply->total_thread_count += process->running_threads; + reply->total_name_len += process->imagelen; } if (reply->info_size > get_reply_max_size()) diff --git a/server/protocol.def b/server/protocol.def index 0f58dc7c85a..7d27fa382d2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1624,6 +1624,8 @@ struct process_info @REPLY data_size_t info_size; int process_count; + int total_thread_count; + data_size_t total_name_len; VARARG(data,process_info,info_size); @END diff --git a/server/request.h b/server/request.h index 778e7272bf5..33d4237f49f 100644 --- a/server/request.h +++ b/server/request.h @@ -1127,7 +1127,9 @@ C_ASSERT( sizeof(struct get_mapping_filename_reply) == 16 ); C_ASSERT( sizeof(struct list_processes_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct list_processes_reply, info_size) == 8 ); C_ASSERT( FIELD_OFFSET(struct list_processes_reply, process_count) == 12 ); -C_ASSERT( sizeof(struct list_processes_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct list_processes_reply, total_thread_count) == 16 ); +C_ASSERT( FIELD_OFFSET(struct list_processes_reply, total_name_len) == 20 ); +C_ASSERT( sizeof(struct list_processes_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_debug_obj_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_debug_obj_request, flags) == 16 ); C_ASSERT( sizeof(struct create_debug_obj_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 5a2afac504a..6e78f8281f0 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2287,6 +2287,8 @@ static void dump_list_processes_reply( const struct list_processes_reply *req ) { fprintf( stderr, " info_size=%u", req->info_size ); fprintf( stderr, ", process_count=%d", req->process_count ); + fprintf( stderr, ", total_thread_count=%d", req->total_thread_count ); + fprintf( stderr, ", total_name_len=%u", req->total_name_len ); dump_varargs_process_info( ", data=", min(cur_size,req->info_size) ); }

1 0

Paul Gofman : ntdll: Factor out get_system_process_info() function.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: bb6aa6c773489ac718989751b3716d21da929b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb6aa6c773489ac718989751… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 25 21:46:20 2021 +0300 ntdll: Factor out get_system_process_info() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 220 +++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb6aa6c773489ac71898…

1 0

Paul Gofman : ntdll: Implement SystemExtendedProcessInformation system info class.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 98a546638056d819f8a1dd6da6eeecca7c91bb38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98a546638056d819f8a1dd6d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 25 21:46:21 2021 +0300 ntdll: Implement SystemExtendedProcessInformation system info class. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 90 +++++++++++++++++++++++++++++++++++++----- dlls/ntdll/unix/system.c | 42 +++++++++++++------- include/wine/server_protocol.h | 4 +- include/winternl.h | 12 ++++++ server/process.c | 2 + server/protocol.def | 2 + 6 files changed, 126 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=98a546638056d819f8a1…

1 0

Biswapriyo Nath : include: Add BackgroundCopyManager1_5 library in bits1_5.idl.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: f209fb97aa5de7b442b95d660b9e13c8bb577b27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f209fb97aa5de7b442b95d66… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Oct 26 11:19:51 2021 +0530 include: Add BackgroundCopyManager1_5 library in bits1_5.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bits1_5.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/bits1_5.idl b/include/bits1_5.idl index 5937ce02967..5c3523e4e99 100644 --- a/include/bits1_5.idl +++ b/include/bits1_5.idl @@ -87,4 +87,23 @@ interface IBackgroundCopyJob2 : IBackgroundCopyJob HRESULT RemoveCredentials(BG_AUTH_TARGET target, BG_AUTH_SCHEME scheme); } +[ + uuid(ea9319ea-c628-480f-8331-768fac397e4e), + lcid(0x0000), + version(1.0) +] +library BackgroundCopyManager1_5 +{ + [ + uuid(f087771f-d74f-4c1a-bb8a-e16aca9124ea) + ] + coclass BackgroundCopyManager1_5 + { + [default] interface IBackgroundCopyManager; + }; + + interface IBackgroundCopyCallback; + interface IBackgroundCopyJob2; +} + cpp_quote("#include \"bits2_0.h\"")

1 0

Alistair Leslie-Hughes : include: Add some MFT CLSIDs.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: c45be242e5b6bc0a80796d65716ced8e0bc5fd41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c45be242e5b6bc0a80796d65… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 26 19:59:55 2021 +1100 include: Add some MFT CLSIDs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 62e0ca3025a..d23995fbc18 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1620,4 +1620,12 @@ cpp_quote("EXTERN_GUID(MF_XVP_DISABLE_FRC, 0x2c0afa19, 0x7a97, 0x4d5a, 0x9e, 0xe cpp_quote("EXTERN_GUID(MF_XVP_CALLER_ALLOCATES_OUTPUT, 0x4a2cabc, 0x0cab, 0x40b1, 0xa1, 0xb9, 0x75, 0xbc, 0x36, 0x58, 0xf0, 0x00);") cpp_quote("EXTERN_GUID(MF_XVP_SAMPLE_LOCK_TIMEOUT, 0xaa4ddb29, 0x5134, 0x4363, 0xac, 0x72, 0x83, 0xec, 0x4b, 0xc1, 0x04, 0x26);") +cpp_quote("EXTERN_GUID(CLSID_MSAACDecMFT, 0x32d186a7, 0x218f, 0x4c75, 0x88, 0x76, 0xdd, 0x77, 0x27, 0x3a, 0x89, 0x99);") +cpp_quote("EXTERN_GUID(CLSID_MSDDPlusDecMFT, 0x177c0afe, 0x900b, 0x48d4, 0x9e, 0x4c, 0x57, 0xad, 0xd2, 0x50, 0xb3, 0xd4);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGAudDecMFT, 0x70707b39, 0xb2ca, 0x4015, 0xab, 0xea, 0xf8, 0x44, 0x7d, 0x22, 0xd8, 0x8b);") +cpp_quote("EXTERN_GUID(CLSID_MSMPEGDecoderMFT, 0x2d709e52, 0x123f, 0x49b5, 0x9c, 0xbc, 0x9a, 0xf5, 0xcd, 0xe2, 0x8f, 0xb9);") +cpp_quote("EXTERN_GUID(CLSID_MSH264DecoderMFT, 0x62ce7e72, 0x4c71, 0x4d20, 0xb1, 0x5d, 0x45, 0x28, 0x31, 0xa8, 0x7d, 0x9d);") +cpp_quote("EXTERN_GUID(CLSID_MSH264EncoderMFT, 0x6ca50344, 0x051a, 0x4ded, 0x97, 0x79, 0xa4, 0x33, 0x05, 0x16, 0x5e, 0x35);") +cpp_quote("EXTERN_GUID(CLSID_MSH265DecoderMFT, 0x420a51a3, 0xd605, 0x430c, 0xb4, 0xfc, 0x45, 0x27, 0x4f, 0xa6, 0xc5, 0x62);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);") +cpp_quote("EXTERN_GUID(CLSID_WMVDecoderMFT, 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);")

1 0

Alistair Leslie-Hughes : include: Add CMSH264DecoderMFT CLSID.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 7f481ea05faf02914ecbc1932703e528511cce1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f481ea05faf02914ecbc193… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 26 20:14:25 2021 +1100 include: Add CMSH264DecoderMFT CLSID. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 61381bee6d4..fd21ad54a40 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -30,3 +30,8 @@ coclass CMP3DecMediaObject {} uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) ] coclass CResamplerMediaObject {} + +[ + uuid(62ce7e72-4c71-4d20-b15d-452831a87d9d) +] +coclass CMSH264DecoderMFT {}

1 0

Brendan Shanks : configure: Simplify flag checks for Mac preloader.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 80a30625a70343cf6f38d80d02f640d684e27e6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a30625a70343cf6f38d80d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 27 13:13:10 2021 -0700 configure: Simplify flag checks for Mac preloader. Always build the Mac preloader with '-mmacosx-version-min=10.7', which works with all supported toolchains. Fixes bug when building with Xcode 9 where preloader flags would be added to EXTRACFLAGS and cause build failures on 32-bit. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 54 +----------------------------------------------------- configure.ac | 14 ++++++-------- 2 files changed, 7 insertions(+), 61 deletions(-) diff --git a/configure b/configure index 5c73f1412d2..8e46839a534 100755 --- a/configure +++ b/configure @@ -8781,32 +8781,7 @@ fi $as_echo "$ac_cv_cflags__Wl__no_new_main__e__main" >&6; } if test "x$ac_cv_cflags__Wl__no_new_main__e__main" = xyes; then : WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs" >&5 -$as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs... " >&6; } -if ${ac_cv_cflags__Wl__no_new_main__e__main__nostartfiles__nodefaultlibs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl__no_new_main__e__main__nostartfiles__nodefaultlibs=yes -else - ac_cv_cflags__Wl__no_new_main__e__main__nostartfiles__nodefaultlibs=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__no_new_main__e__main__nostartfiles__nodefaultlibs" >&5 -$as_echo "$ac_cv_cflags__Wl__no_new_main__e__main__nostartfiles__nodefaultlibs" >&6; } -if test "x$ac_cv_cflags__Wl__no_new_main__e__main__nostartfiles__nodefaultlibs" = xyes; then : - EXTRACFLAGS="$EXTRACFLAGS -Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" >&5 $as_echo_n "checking whether the compiler supports -Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs... " >&6; } if ${ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs+:} false; then : $as_echo_n "(cached) " >&6 @@ -8833,32 +8808,6 @@ if test "x$ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nos else wine_can_build_preloader=no fi -fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -nostartfiles -nodefaultlibs" >&5 -$as_echo_n "checking whether the compiler supports -nostartfiles -nodefaultlibs... " >&6; } -if ${ac_cv_cflags__nostartfiles__nodefaultlibs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -nostartfiles -nodefaultlibs" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__nostartfiles__nodefaultlibs=yes -else - ac_cv_cflags__nostartfiles__nodefaultlibs=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__nostartfiles__nodefaultlibs" >&5 -$as_echo "$ac_cv_cflags__nostartfiles__nodefaultlibs" >&6; } -if test "x$ac_cv_cflags__nostartfiles__nodefaultlibs" = xyes; then : - EXTRACFLAGS="$EXTRACFLAGS -nostartfiles -nodefaultlibs" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" >&5 $as_echo_n "checking whether the compiler supports -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs... " >&6; } @@ -8887,7 +8836,6 @@ if test "x$ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" else wine_can_build_preloader=no fi -fi fi if test "$wine_can_build_preloader" = "yes" then diff --git a/configure.ac b/configure.ac index 03a08562556..50c84cfe5cf 100644 --- a/configure.ac +++ b/configure.ac @@ -739,14 +739,12 @@ case $host_os in WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" - WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, - [WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], - [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], - [wine_can_build_preloader=no])])], - [WINE_TRY_CFLAGS([-nostartfiles -nodefaultlibs],, - [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], - [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], - [wine_can_build_preloader=no])])]) + WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])], + [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])]) if test "$wine_can_build_preloader" = "yes" then WINE_TRY_CFLAGS([-Wl,-no_pie],

1 0