wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Ziqing Hui : windowscodecs: Add a lock for DdsFrameDecode.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: ba913316adafdafedd13f403d064bf6b536fd051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba913316adafdafedd13f403… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Aug 24 12:09:27 2020 +0800 windowscodecs: Add a lock for DdsFrameDecode. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 12b6c42f64..c179a38935 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -150,6 +150,7 @@ typedef struct DdsFrameDecode { IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; BYTE *data; + CRITICAL_SECTION lock; dds_frame_info info; } DdsFrameDecode; @@ -777,6 +778,8 @@ static HRESULT DdsFrameDecode_CreateInstance(DdsFrameDecode **frame_decode) result->IWICBitmapFrameDecode_iface.lpVtbl = &DdsFrameDecode_Vtbl; result->IWICDdsFrameDecode_iface.lpVtbl = &DdsFrameDecode_Dds_Vtbl; result->ref = 1; + InitializeCriticalSection(&result->lock); + result->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DdsFrameDecode.lock"); *frame_decode = result; return S_OK;

1 0

Alexandre Julliard : makefiles: Don't implicitly import the module itself when -nodefaultlibs is used.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 7571fa87df453e404d8b6ca58e2da95340156849 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7571fa87df453e404d8b6ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:30:12 2020 +0200 makefiles: Don't implicitly import the module itself when -nodefaultlibs is used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 825458156f..4bd20d469d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2212,7 +2212,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *lib = NULL; /* skip module's own importlib, its object files will be linked directly */ - if (make->importlib && !is_unix && !strcmp( make->importlib, imports.str[i] )) continue; + if (make->importlib && !strcmp( make->importlib, imports.str[i] )) + { + if (!is_unix) continue; + if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) continue; + } for (j = 0; j < top_makefile->subdirs.count; j++) {

1 0

Alexandre Julliard : winecrt0: Move setjmpex/longjmp implementation to a separate file.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 33be7790e57b8f24933929e514e30bad2708d675 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33be7790e57b8f24933929e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:31:04 2020 +0200 winecrt0: Move setjmpex/longjmp implementation to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/exception.c | 196 ----------------------------------------- dlls/winecrt0/setjmp.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 219 insertions(+), 196 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33be7790e57b8f249339…

1 0

Alexandre Julliard : ntdll: Avoid referencing winecrt0 exception handlers from the Unix library.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 97847eeee8aaaad9b141e14d4468838960ea3093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97847eeee8aaaad9b141e14d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:30:19 2020 +0200 ntdll: Avoid referencing winecrt0 exception handlers from the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 10 ++++++---- include/wine/exception.h | 17 ++++------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fa46ec0966..e3f2820de5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -92,6 +92,8 @@ struct file_view unsigned int protect; /* protection for all pages at allocation time and SEC_* flags */ }; +#define __EXCEPT_SYSCALL __EXCEPT_HANDLER(0) + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -3142,7 +3144,7 @@ BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) dummy = p[0]; dummy = p[count - 1]; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return FALSE; } @@ -3175,7 +3177,7 @@ BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) p[0] |= 0; p[count - 1] |= 0; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return FALSE; } @@ -3197,7 +3199,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) volatile const char *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return TRUE; } @@ -3219,7 +3221,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) volatile const WCHAR *p = str; while (p != str + max) if (!*p++) break; } - __EXCEPT_PAGE_FAULT + __EXCEPT_SYSCALL { return TRUE; } diff --git a/include/wine/exception.h b/include/wine/exception.h index a6ada7af21..a2b0bb08dc 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -163,27 +163,18 @@ extern DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { -/* convenience handler for page fault exceptions */ -#define __EXCEPT_PAGE_FAULT \ +#define __EXCEPT_HANDLER(handler) \ } while(0); \ __wine_pop_frame( &__f.frame ); \ break; \ } else { \ - __f.frame.Handler = __wine_exception_handler_page_fault; \ + __f.frame.Handler = (handler); \ if (__wine_setjmpex( &__f.jmp, &__f.frame )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { -/* convenience handler for all exceptions */ -#define __EXCEPT_ALL \ - } while(0); \ - __wine_pop_frame( &__f.frame ); \ - break; \ - } else { \ - __f.frame.Handler = __wine_exception_handler_all; \ - if (__wine_setjmpex( &__f.jmp, &__f.frame )) { \ - const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ - do { +#define __EXCEPT_PAGE_FAULT __EXCEPT_HANDLER(__wine_exception_handler_page_fault) +#define __EXCEPT_ALL __EXCEPT_HANDLER(__wine_exception_handler_all) #define __ENDTRY \ } while (0); \

1 0

Alexandre Julliard : ntdll: Stop resolving imports for the Unix library.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 6844ff8a0bda7c0511c3c328f459cc4286bf3c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6844ff8a0bda7c0511c3c328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 13:25:26 2020 +0200 ntdll: Stop resolving imports for the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 72 +++++------------------------------------------- 1 file changed, 7 insertions(+), 65 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1424bf3cc6..69ea69ad53 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -92,8 +92,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); -extern IMAGE_NT_HEADERS __wine_spec_nt_header; - void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; NTSTATUS (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; void (WINAPI *pKiUserApcDispatcher)(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PNTAPCFUNC) = NULL; @@ -126,7 +124,6 @@ const char *build_dir = NULL; const char *config_dir = NULL; const char **dll_paths = NULL; const char *user_name = NULL; -static HMODULE ntdll_module; struct file_id { @@ -160,11 +157,6 @@ static NTSTATUS add_builtin_module( void *module, void *handle, const struct sta return STATUS_SUCCESS; } -static inline void *get_rva( const IMAGE_NT_HEADERS *nt, ULONG_PTR addr ) -{ - return (BYTE *)nt + addr; -} - /* adjust an array of pointers to make them into RVAs */ static inline void fixup_rva_ptrs( void *array, BYTE *base, unsigned int count ) { @@ -780,63 +772,15 @@ static ULONG_PTR find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY return 0; } -static ULONG_PTR find_pe_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - const IMAGE_IMPORT_BY_NAME *name ) -{ - const WORD *ordinals = (const WORD *)((BYTE *)module + exports->AddressOfNameOrdinals); - const DWORD *names = (const DWORD *)((BYTE *)module + exports->AddressOfNames); - - if (name->Hint < exports->NumberOfNames) - { - char *ename = (char *)module + names[name->Hint]; - if (!strcmp( ename, (char *)name->Name )) - return find_ordinal_export( module, exports, ordinals[name->Hint] ); - } - return find_named_export( module, exports, (char *)name->Name ); -} - -static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) +static void load_ntdll_functions( HMODULE module ) { - const IMAGE_EXPORT_DIRECTORY *ntdll_exports = get_export_dir( ntdll_module ); - const IMAGE_IMPORT_DESCRIPTOR *descr; - const IMAGE_THUNK_DATA *import_list; - IMAGE_THUNK_DATA *thunk_list; + const IMAGE_EXPORT_DIRECTORY *ntdll_exports = get_export_dir( module ); void **ptr; assert( ntdll_exports ); - descr = get_rva( nt, nt->OptionalHeader.DataDirectory[IMAGE_FILE_IMPORT_DIRECTORY].VirtualAddress ); - - /* ntdll must be the only import */ - assert( !strcmp( get_rva( nt, descr->Name ), "ntdll.dll" )); - assert( !descr[1].Name ); - - thunk_list = get_rva( nt, (DWORD)descr->FirstThunk ); - if (descr->u.OriginalFirstThunk) - import_list = get_rva( nt, (DWORD)descr->u.OriginalFirstThunk ); - else - import_list = thunk_list; - - while (import_list->u1.Ordinal) - { - if (IMAGE_SNAP_BY_ORDINAL( import_list->u1.Ordinal )) - { - int ordinal = IMAGE_ORDINAL( import_list->u1.Ordinal ) - ntdll_exports->Base; - thunk_list->u1.Function = find_ordinal_export( ntdll_module, ntdll_exports, ordinal ); - if (!thunk_list->u1.Function) ERR( "ordinal %u not found\n", ordinal ); - } - else /* import by name */ - { - IMAGE_IMPORT_BY_NAME *pe_name = get_rva( nt, import_list->u1.AddressOfData ); - thunk_list->u1.Function = find_pe_export( ntdll_module, ntdll_exports, pe_name ); - if (!thunk_list->u1.Function) ERR( "%s not found\n", pe_name->Name ); - } - import_list++; - thunk_list++; - } - #define GET_FUNC(name) \ - if (!(p##name = (void *)find_named_export( ntdll_module, ntdll_exports, #name ))) \ + if (!(p##name = (void *)find_named_export( module, ntdll_exports, #name ))) \ ERR( "%s not found\n", #name ) GET_FUNC( DbgUiRemoteBreakin ); @@ -848,7 +792,7 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) GET_FUNC( __wine_set_unix_funcs ); #undef GET_FUNC #define SET_PTR(name,val) \ - if ((ptr = (void *)find_named_export( ntdll_module, ntdll_exports, #name ))) *ptr = val; \ + if ((ptr = (void *)find_named_export( module, ntdll_exports, #name ))) *ptr = val; \ else ERR( "%s not found\n", #name ) SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); @@ -1294,7 +1238,7 @@ found: /*********************************************************************** * load_ntdll */ -static HMODULE load_ntdll(void) +static void load_ntdll(void) { NTSTATUS status; void *module; @@ -1317,7 +1261,7 @@ static HMODULE load_ntdll(void) } if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); - return module; + load_ntdll_functions( module ); } @@ -1705,9 +1649,7 @@ void __wine_main( int argc, char *argv[], char *envp[] ) #endif virtual_init(); - - ntdll_module = load_ntdll(); - fixup_ntdll_imports( &__wine_spec_nt_header ); + load_ntdll(); init_environment( argc, argv, envp ); wine_dll_set_callback( load_builtin_callback );

1 0

Alexandre Julliard : ntdll: Handle page faults happening during a syscall without dispatching the exception.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 0b3db9dfa2877ff36c10f73b04e97af71ab2f845 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3db9dfa2877ff36c10f73b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 24 11:46:22 2020 +0200 ntdll: Handle page faults happening during a syscall without dispatching the exception. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 59 ++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 76 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 61 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 63 ++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/sync.c | 12 ++----- 5 files changed, 261 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0b3db9dfa2877ff36c10…

1 0

Fabian Maurer : user32: Set default user preferences to enable animations.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 7b998c266e38e809adabc3fe99727dc185eb056d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b998c266e38e809adabc3fe… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Aug 19 22:37:14 2020 +0200 user32: Set default user preferences to enable animations. This allows games like solitaire, chess titans, etc. to use animations. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0c0f8fac5d..114ac6adfa 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1432,7 +1432,7 @@ static DWORD_ENTRY( AUDIODESC_LOCALE, 0 ); static PATH_ENTRY( DESKPATTERN ); static PATH_ENTRY( DESKWALLPAPER ); -static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00, 0x00 }; +static BYTE user_prefs[8] = { 0x30, 0x00, 0x00, 0x80, 0x12, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); static FONT_ENTRY( CAPTIONLOGFONT, FW_BOLD );

1 0

Zebediah Figura : ntdll: Read the condition variable and manipulate the lock on the PE side.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 8bd95a80f263a8df6873f8e3a8b10fdce4136fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd95a80f263a8df6873f8e3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 20 15:38:42 2020 -0500 ntdll: Read the condition variable and manipulate the lock on the PE side. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49712 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 21 +++-------- dlls/ntdll/unix/loader.c | 3 +- dlls/ntdll/unix/sync.c | 84 ++++++++---------------------------------- dlls/ntdll/unix/unix_private.h | 7 +--- dlls/ntdll/unixlib.h | 10 ++--- 5 files changed, 27 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bd95a80f263a8df6873…

1 0

Paul Gofman : ntdll: Also save unwind info for rbp in call_consolidate_callback() on x64.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: 057e7f19407f0291cb4240c23fc391263ba9faa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=057e7f19407f0291cb4240c2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 21 23:56:41 2020 +0300 ntdll: Also save unwind info for rbp in call_consolidate_callback() on x64. Fixes Bloons TD 6 crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 564b74b7be..87acff3dcd 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1029,9 +1029,9 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_SEH(".seh_pushframe\n\t") __ASM_SEH(".seh_endprologue\n\t") - "subq $0xf8,%rsp\n\t" /* 10*16 (float regs) + 7*8 (int regs) + 32 (shadow store). */ - __ASM_SEH(".seh_stackalloc 0xf8\n\t") - __ASM_CFI(".cfi_adjust_cfa_offset 0xf8\n\t") + "subq $0x108,%rsp\n\t" /* 10*16 (float regs) + 8*8 (int regs) + 32 (shadow store) + 8 (align). */ + __ASM_SEH(".seh_stackalloc 0x108\n\t") + __ASM_CFI(".cfi_adjust_cfa_offset 0x108\n\t") /* Setup CFI unwind to context. */ "movq %rcx,0x10(%rbp)\n\t" @@ -1058,6 +1058,9 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, __ASM_CFI(".cfi_escape 0x10,0x20,0x06,0x76,0x10,0x06,0x23,0x90,0x05\n\t") /* %xmm15 */ /* Setup SEH unwind registers restore. */ + "movq 0xa0(%rcx),%rax\n\t" /* context->Rbp */ + "movq %rax,0x100(%rsp)\n\t" + __ASM_SEH(".seh_savereg %rbp, 0x100\n\t") "movq 0x90(%rcx),%rax\n\t" /* context->Rbx */ "movq %rax,0x20(%rsp)\n\t" __ASM_SEH(".seh_savereg %rbx, 0x20\n\t")

1 0

Alex Henrie : user32: Comment out SetWindowFullScreenState.
by Alexandre Julliard 24 Aug '20

24 Aug '20

Module: wine Branch: master Commit: a13f78cca755a182c26ae197c696d8ebc27c82f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a13f78cca755a182c26ae197… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Aug 23 18:59:52 2020 -0600 user32: Comment out SetWindowFullScreenState. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49728 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d2a1487971..8051ae3f76 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -717,7 +717,7 @@ @ stdcall SetWindowCompositionAttribute(ptr ptr) @ stdcall SetWindowContextHelpId(long long) @ stdcall SetWindowDisplayAffinity(long long) -@ stub SetWindowFullScreenState +# @ stub SetWindowFullScreenState @ stdcall SetWindowLongA(long long long) @ stdcall -arch=win64 SetWindowLongPtrA(long long long) @ stdcall -arch=win64 SetWindowLongPtrW(long long long)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2020