winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2024
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
705 discussions
Start a n
N
ew thread
Alexandre Julliard : winedump: Print the export or import name of exception handlers.
by Alexandre Julliard
30 May '24
30 May '24
Module: wine Branch: master Commit: bb8ef91f46b21ac4ed6fbd5f9d958646dfadf7cf URL:
https://gitlab.winehq.org/wine/wine/-/commit/bb8ef91f46b21ac4ed6fbd5f9d9586…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 14:38:01 2024 +0200 winedump: Print the export or import name of exception handlers. --- tools/winedump/pe.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 96 insertions(+), 6 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index e2a8354e537..cfb7b18fff7 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -681,6 +681,89 @@ static const char *find_export_from_rva( UINT rva ) return ret ? strmake( " (%s)", ret ) : ""; } +static const char *find_import_from_rva( UINT rva ) +{ + const IMAGE_IMPORT_DESCRIPTOR *imp; + + if (!(imp = get_dir( IMAGE_FILE_IMPORT_DIRECTORY ))) return ""; + + /* check for import thunk */ + switch (PE_nt_headers->FileHeader.Machine) + { + case IMAGE_FILE_MACHINE_AMD64: + { + const BYTE *ptr = RVA( rva, 6 ); + if (!ptr) return ""; + if (ptr[0] == 0xff && ptr[1] == 0x25) + { + rva += 6 + *(int *)(ptr + 2); + break; + } + if (ptr[0] == 0x48 && ptr[1] == 0xff && ptr[2] == 0x25) + { + rva += 7 + *(int *)(ptr + 3); + break; + } + return ""; + } + case IMAGE_FILE_MACHINE_ARM64: + { + const UINT *ptr = RVA( rva, sizeof(DWORD) ); + if ((ptr[0] & 0x9f00001f) == 0x90000010 && /* adrp x16, page */ + (ptr[1] & 0xffc003ff) == 0xf9400210 && /* ldr x16, [x16, #off] */ + ptr[2] == 0xd61f0200) /* br x16 */ + { + rva &= ~0xfff; + rva += ((ptr[0] & 0x00ffffe0) << 9) + ((ptr[0] & 0x60000000) >> 17); + rva += (ptr[1] & 0x003ffc00) >> 7; + break; + } + return ""; + } + default: + return ""; + } + + for ( ; imp->Name && imp->FirstThunk; imp++) + { + UINT imp_rva = imp->OriginalFirstThunk ? imp->OriginalFirstThunk : imp->FirstThunk; + UINT thunk_rva = imp->FirstThunk; + + if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_THUNK_DATA64 *il = RVA( imp_rva, sizeof(DWORD) ); + for ( ; il && il->u1.Ordinal; il++, thunk_rva += sizeof(LONGLONG)) + { + if (thunk_rva != rva) continue; + if (IMAGE_SNAP_BY_ORDINAL64(il->u1.Ordinal)) + return strmake( " (-> #%u)", (WORD)IMAGE_ORDINAL64( il->u1.Ordinal )); + else + return strmake( " (-> %s)", get_symbol_str( RVA( (DWORD)il->u1.AddressOfData + 2, 1 ))); + } + } + else + { + const IMAGE_THUNK_DATA32 *il = RVA( imp_rva, sizeof(DWORD) ); + for ( ; il && il->u1.Ordinal; il++, thunk_rva += sizeof(LONG)) + { + if (thunk_rva != rva) continue; + if (IMAGE_SNAP_BY_ORDINAL32(il->u1.Ordinal)) + return strmake( " (-> #%u)", (WORD)IMAGE_ORDINAL32( il->u1.Ordinal )); + else + return strmake( " (-> %s)", get_symbol_str( RVA( (DWORD)il->u1.AddressOfData + 2, 1 ))); + } + } + } + return ""; +} + +static const char *get_function_name( UINT rva ) +{ + const char *name = find_export_from_rva( rva ); + if (!*name) name = find_import_from_rva( rva ); + return name; +} + static void dump_dir_exported_functions(void) { unsigned int size; @@ -975,8 +1058,12 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct return; } if (info->flags & (UNW_FLAG_EHANDLER | UNW_FLAG_UHANDLER)) - printf( " handler %08x data at %08x\n", handler_data->handler, - (UINT)(function->UnwindData + (const char *)(&handler_data->handler + 1) - (const char *)info )); + { + UINT rva = function->UnwindData + ((const char *)(&handler_data->handler + 1) - (const char *)info); + const char *name = get_function_name( handler_data->handler ); + + printf( " handler %08x%s data at %08x\n", handler_data->handler, name, rva ); + } } static const BYTE armnt_code_lengths[256] = @@ -1365,11 +1452,12 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (info->x) { const unsigned int *handler; + const char *name; handler = RVA( rva, sizeof(*handler) ); rva = rva + sizeof(*handler); - - printf( " handler %08x data at %08x\n", *handler, rva); + name = get_function_name( *handler ); + printf( " handler %08x%s data at %08x\n", *handler, name, rva ); } } @@ -1708,13 +1796,15 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) } ptr = RVA( rva, codes * 4); rva += codes * 4; + dump_arm64_codes( ptr, codes * 4 ); if (info->x) { const UINT *handler = RVA( rva, sizeof(*handler) ); + const char *name = get_function_name( *handler ); + rva += sizeof(*handler); - printf( " handler: %08x data %08x\n", *handler, rva ); + printf( " handler: %08x%s data %08x\n", *handler, name, rva ); } - dump_arm64_codes( ptr, codes * 4 ); } static void dump_dir_exceptions(void)
1
0
0
0
Alexandre Julliard : winedump: Print exported function names in the exception data.
by Alexandre Julliard
30 May '24
30 May '24
Module: wine Branch: master Commit: 855017063aa9555623ee17944f24e33254c438eb URL:
https://gitlab.winehq.org/wine/wine/-/commit/855017063aa9555623ee17944f24e3…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 22:02:30 2024 +0200 winedump: Print exported function names in the exception data. --- tools/winedump/pe.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 22260e5249b..e2a8354e537 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -662,19 +662,23 @@ static const char *find_export_from_rva( UINT rva ) const IMAGE_EXPORT_DIRECTORY *dir; const char *ret = NULL; - if (!(dir = get_dir( IMAGE_FILE_EXPORT_DIRECTORY ))) return NULL; - if (!(funcs = RVA( dir->AddressOfFunctions, dir->NumberOfFunctions * sizeof(DWORD) ))) return NULL; + if (!(dir = get_dir( IMAGE_FILE_EXPORT_DIRECTORY ))) return ""; + if (!(funcs = RVA( dir->AddressOfFunctions, dir->NumberOfFunctions * sizeof(DWORD) ))) return ""; names = RVA( dir->AddressOfNames, dir->NumberOfNames * sizeof(DWORD) ); ordinals = RVA( dir->AddressOfNameOrdinals, dir->NumberOfNames * sizeof(WORD) ); func_names = calloc( dir->NumberOfFunctions, sizeof(*func_names) ); for (i = 0; i < dir->NumberOfNames; i++) func_names[ordinals[i]] = names[i]; - for (i = 0; i < dir->NumberOfFunctions && !ret; i++) - if (funcs[i] == rva) ret = get_symbol_str( RVA( func_names[i], sizeof(DWORD) )); + for (i = 0; i < dir->NumberOfFunctions; i++) + { + if (funcs[i] != rva) continue; + if (func_names[i]) ret = get_symbol_str( RVA( func_names[i], sizeof(DWORD) )); + break; + } free( func_names ); - if (!ret && rva == PE_nt_headers->OptionalHeader.AddressOfEntryPoint) return "<EntryPoint>"; - return ret; + if (!ret && rva == PE_nt_headers->OptionalHeader.AddressOfEntryPoint) return " <EntryPoint>"; + return ret ? strmake( " (%s)", ret ) : ""; } static void dump_dir_exported_functions(void) @@ -854,7 +858,8 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct const struct unwind_info_x86_64 *info; unsigned int i, count; - printf( "\nFunction %08x-%08x:\n", function->BeginAddress, function->EndAddress ); + printf( "\nFunction %08x-%08x:%s\n", function->BeginAddress, function->EndAddress, + find_export_from_rva( function->BeginAddress )); if (function->UnwindData & 1) { const struct runtime_function_x86_64 *next = RVA( function->UnwindData & ~1, sizeof(*next) ); @@ -1000,9 +1005,10 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) WORD pf = 0, ef = 0, fpoffset = 0, stack = fnc->StackAdjust; const char *pfx = " ... "; - printf( "\nFunction %08x-%08x: (flag=%u ret=%u H=%u reg=%u R=%u L=%u C=%u)\n", + printf( "\nFunction %08x-%08x: flag=%u ret=%u H=%u reg=%u R=%u L=%u C=%u%s\n", fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + fnc->FunctionLength * 2, - fnc->Flag, fnc->Ret, fnc->H, fnc->Reg, fnc->R, fnc->L, fnc->C ); + fnc->Flag, fnc->Ret, fnc->H, fnc->Reg, fnc->R, fnc->L, fnc->C, + find_export_from_rva( fnc->BeginAddress )); if (fnc->StackAdjust >= 0x03f4) { @@ -1124,9 +1130,9 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) count = info->count; words = info->words; - printf( "\nFunction %08x-%08x: (ver=%u X=%u E=%u F=%u)\n", fnc->BeginAddress & ~1, + printf( "\nFunction %08x-%08x: ver=%u X=%u E=%u F=%u%s\n", fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + info->function_length * 2, - info->version, info->x, info->e, info->f ); + info->version, info->x, info->e, info->f, find_export_from_rva( fnc->BeginAddress | 1 )); if (!info->count && !info->words) { @@ -1654,8 +1660,8 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) { case 1: case 2: - printf( "\nFunction %08x-%08x:\n", func->BeginAddress, - func->BeginAddress + func->FunctionLength * 4 ); + printf( "\nFunction %08x-%08x:%s\n", func->BeginAddress, + func->BeginAddress + func->FunctionLength * 4, find_export_from_rva( func->BeginAddress )); printf( " len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", func->FunctionLength, func->Flag, func->RegF, func->RegI, func->H, func->CR, func->FrameSize ); @@ -1664,8 +1670,9 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) case 3: rva = func->UnwindData & ~3; parent_func = RVA( rva, sizeof(*parent_func) ); - printf( "\nFunction %08x-%08x:\n", func->BeginAddress, - func->BeginAddress + 12 /* adrl x16, <dest>; br x16 */ ); + printf( "\nFunction %08x-%08x:%s\n", func->BeginAddress, + func->BeginAddress + 12 /* adrl x16, <dest>; br x16 */, + find_export_from_rva( func->BeginAddress )); printf( " forward to parent %08x\n", parent_func->BeginAddress ); return; } @@ -1947,10 +1954,8 @@ static void dump_hybrid_metadata(void) for (i = 0; i < data->CodeRangesToEntryPointsCount; i++) { const char *name = find_export_from_rva( map[i].EntryPoint ); - printf( " %08x - %08x %08x", - (int)map[i].StartRva, (int)map[i].EndRva, (int)map[i].EntryPoint ); - if (name) printf( " %s", name ); - printf( "\n" ); + printf( " %08x - %08x %08x%s\n", + (int)map[i].StartRva, (int)map[i].EndRva, (int)map[i].EntryPoint, name ); } } @@ -1963,9 +1968,7 @@ static void dump_hybrid_metadata(void) for (i = 0; i < data->RedirectionMetadataCount; i++) { const char *name = find_export_from_rva( map[i].Source ); - printf( " %08x -> %08x", (int)map[i].Source, (int)map[i].Destination ); - if (name) printf( " (%s)", name ); - printf( "\n" ); + printf( " %08x -> %08x%s\n", (int)map[i].Source, (int)map[i].Destination, name ); } } break;
1
0
0
0
Vijay Kiran Kamuju : ntdll: Add stub RtlLookupGenericTableAvl function.
by Alexandre Julliard
30 May '24
30 May '24
Module: wine Branch: master Commit: 349c2275d41b8bae1fc886c404ae6e879863caaf URL:
https://gitlab.winehq.org/wine/wine/-/commit/349c2275d41b8bae1fc886c404ae6e…
Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed May 29 19:14:45 2024 +0200 ntdll: Add stub RtlLookupGenericTableAvl function. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=56736
--- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2d2ec919c5c..3471905c762 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -877,7 +877,7 @@ # @ stub RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -# @ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) @ stdcall -arch=!i386 RtlLookupFunctionTable(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3d482ec2f92..948412071c5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2175,6 +2175,15 @@ void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, FIXME("%p %p %lu %p: stub\n", table, buffer, size, element); } +/****************************************************************************** + * RtlLookupElementGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer) +{ + FIXME("(%p, %p) stub!\n", table, buffer); + return NULL; +} + /********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 996777fd7fd..d7a77f5911a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1199,7 +1199,7 @@ @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -@ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl @ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index c705958e147..6a8fffd532e 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -280,6 +280,7 @@ void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPA void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); void WINAPI RtlMapGenericMask(ACCESS_MASK*,const GENERIC_MAPPING*); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);
1
0
0
0
Esme Povirk : win32u: Implement EVENT_SYSTEM_FOREGROUND.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: 962eb7ca02da7c657354a7f8f7c80aabbe75fea8 URL:
https://gitlab.winehq.org/wine/wine/-/commit/962eb7ca02da7c657354a7f8f7c80a…
Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 25 17:13:46 2024 +0000 win32u: Implement EVENT_SYSTEM_FOREGROUND. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++-------------------- dlls/win32u/input.c | 2 ++ 2 files changed, 29 insertions(+), 20 deletions(-)
1
0
0
0
Rémi Bernon : win32u: Use a helper to flush window surface, factor locking and bounds reset.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: 5d0efbcc6e88e2b7886f2a0cfb58c9100b452160 URL:
https://gitlab.winehq.org/wine/wine/-/commit/5d0efbcc6e88e2b7886f2a0cfb58c9…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 11:21:12 2024 +0200 win32u: Use a helper to flush window surface, factor locking and bounds reset. --- dlls/win32u/dce.c | 27 +++++++++--- dlls/win32u/dibdrv/dc.c | 2 +- dlls/wineandroid.drv/window.c | 65 +++++++++------------------- dlls/winemac.drv/surface.c | 16 ++----- dlls/winemac.drv/window.c | 2 +- dlls/winewayland.drv/window.c | 2 +- dlls/winewayland.drv/window_surface.c | 22 ++-------- dlls/winex11.drv/bitblt.c | 80 +++++++++++++---------------------- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 6 +-- include/wine/gdi_driver.h | 3 +- 11 files changed, 86 insertions(+), 141 deletions(-)
1
0
0
0
Rémi Bernon : wineandroid: Hold the lock while reading window surface bits.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: b44730a39e78d692c15624ea45d8c0a41466c7cc URL:
https://gitlab.winehq.org/wine/wine/-/commit/b44730a39e78d692c15624ea45d8c0…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 16:20:52 2024 +0200 wineandroid: Hold the lock while reading window surface bits. To avoid hiding the change in the next commit. --- dlls/wineandroid.drv/window.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 8314876f1c4..d1c93b5ceff 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -695,8 +695,12 @@ static void android_surface_flush( struct window_surface *window_surface ) surface->header.rect.bottom - surface->header.rect.top ); needs_flush = intersect_rect( &rect, &rect, &window_surface->bounds ); reset_bounds( &window_surface->bounds ); - window_surface_unlock( window_surface ); - if (!needs_flush) return; + + if (!needs_flush) + { + window_surface_unlock( window_surface ); + return; + } TRACE( "flushing %p hwnd %p surface %s rect %s bits %p alpha %02x key %08x region %u rects\n", surface, surface->hwnd, wine_dbgstr_rect( &surface->header.rect ), @@ -760,6 +764,8 @@ static void android_surface_flush( struct window_surface *window_surface ) } else TRACE( "Unable to lock surface %p window %p buffer %p\n", surface, surface->hwnd, surface->window ); + + window_surface_unlock( window_surface ); } /***********************************************************************
1
0
0
0
Rémi Bernon : winemac: Get rid of unnecessary blit_data / drawn surface members.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: 4d659e65c2d514df83537c4e09ba2b7d12433afd URL:
https://gitlab.winehq.org/wine/wine/-/commit/4d659e65c2d514df83537c4e09ba2b…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 00:51:31 2024 +0200 winemac: Get rid of unnecessary blit_data / drawn surface members. --- dlls/winemac.drv/cocoa_window.m | 29 +++----- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_cocoa.h | 7 +- dlls/winemac.drv/surface.c | 146 ++++++---------------------------------- dlls/winemac.drv/window.c | 4 +- 5 files changed, 38 insertions(+), 149 deletions(-)
1
0
0
0
Rémi Bernon : win32u: Move window surface bounds to the window_surface base struct.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: 370966f51b004a6ac41f182127ba9ef61a511cfb URL:
https://gitlab.winehq.org/wine/wine/-/commit/370966f51b004a6ac41f182127ba9e…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 26 14:25:42 2024 +0200 win32u: Move window surface bounds to the window_surface base struct. --- dlls/win32u/dce.c | 27 +++++---------------------- dlls/win32u/dibdrv/dc.c | 2 +- dlls/wineandroid.drv/window.c | 25 ++++++------------------- dlls/winemac.drv/surface.c | 25 ++++++------------------- dlls/winemac.drv/window.c | 6 ++---- dlls/winewayland.drv/window_surface.c | 18 +++--------------- dlls/winex11.drv/bitblt.c | 24 +++++------------------- dlls/winex11.drv/window.c | 2 +- include/wine/gdi_driver.h | 2 +- 9 files changed, 30 insertions(+), 101 deletions(-)
1
0
0
0
Rémi Bernon : win32u: Use helpers to lock/unlock window surfaces.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: 1565d529bab10d8232110498ff3f510cc54d634c URL:
https://gitlab.winehq.org/wine/wine/-/commit/1565d529bab10d8232110498ff3f51…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 26 14:21:54 2024 +0200 win32u: Use helpers to lock/unlock window surfaces. --- dlls/win32u/dce.c | 44 +++++++++++++---------------------- dlls/win32u/dibdrv/dc.c | 4 ++-- dlls/wineandroid.drv/window.c | 42 ++++++++++----------------------- dlls/winemac.drv/surface.c | 30 +++++------------------- dlls/winemac.drv/window.c | 12 +++++----- dlls/winewayland.drv/window_surface.c | 26 ++++----------------- dlls/winex11.drv/bitblt.c | 34 +++++++-------------------- dlls/winex11.drv/window.c | 4 ++-- include/wine/gdi_driver.h | 4 ++-- 9 files changed, 58 insertions(+), 142 deletions(-)
1
0
0
0
Rémi Bernon : win32u: Move the window surface mutex to the surface header.
by Alexandre Julliard
29 May '24
29 May '24
Module: wine Branch: master Commit: 00aec714ddbc125ad37f6e7b793b7c808cccd7b3 URL:
https://gitlab.winehq.org/wine/wine/-/commit/00aec714ddbc125ad37f6e7b793b7c…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 14:42:09 2024 +0200 win32u: Move the window surface mutex to the surface header. --- dlls/win32u/dce.c | 23 +++++++++++------------ dlls/wineandroid.drv/window.c | 14 +++----------- dlls/winemac.drv/surface.c | 21 ++++----------------- dlls/winewayland.drv/window_surface.c | 12 +++--------- dlls/winex11.drv/bitblt.c | 14 +++----------- include/wine/gdi_driver.h | 9 +++++++++ 6 files changed, 33 insertions(+), 60 deletions(-)
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200