May 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : winedump: Print exported function names in the exception data.
by Alexandre Julliard May 30, 2024

May 30, 2024

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

Davide Beatrici : winealsa: Return minimum period in get_device_period if requested.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 5c6e63bac21d3cbeed56ad76f45f16fa8fc76518 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c6e63bac21d3cbeed56ad76f45f16… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed May 29 21:28:18 2024 +0200 winealsa: Return minimum period in get_device_period if requested. --- dlls/winealsa.drv/alsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index aa1ad4abe6c..3172e1ece81 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2153,7 +2153,7 @@ static NTSTATUS alsa_get_device_period(void *args) if (params->def_period) *params->def_period = def_period; if (params->min_period) - *params->min_period = def_period; + *params->min_period = min_period; params->result = S_OK;

1 0

Vijay Kiran Kamuju : ntdll: Add stub RtlLookupGenericTableAvl function.
by Alexandre Julliard May 30, 2024

May 30, 2024

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

Esme Povirk : win32u: Implement EVENT_SYSTEM_FOREGROUND.
by Alexandre Julliard May 29, 2024

May 29, 2024

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

Rémi Bernon : win32u: Use a helper to flush window surface, factor locking and bounds reset.
by Alexandre Julliard May 29, 2024

May 29, 2024

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

Rémi Bernon : winemac: Get rid of unnecessary blit_data / drawn surface members.
by Alexandre Julliard May 29, 2024

May 29, 2024

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

Rémi Bernon : win32u: Use helpers to lock/unlock window surfaces.
by Alexandre Julliard May 29, 2024

May 29, 2024

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

Rémi Bernon : win32u: Introduce a new window_surface_init helper.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: ac63239cc01769bad31603798bea59dfbd46392a URL: https://gitlab.winehq.org/wine/wine/-/commit/ac63239cc01769bad31603798bea59… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 28 09:39:28 2024 +0200 win32u: Introduce a new window_surface_init helper. --- dlls/win32u/dce.c | 25 +++++++++++++++++++++---- dlls/wineandroid.drv/window.c | 5 ++--- dlls/winemac.drv/surface.c | 4 +--- dlls/winewayland.drv/window_surface.c | 5 ++--- dlls/winex11.drv/bitblt.c | 5 ++--- include/wine/gdi_driver.h | 14 +++----------- 6 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index 491c21f0ff5..f8e9b0bbe6e 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -219,10 +219,7 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su *surface = NULL; size = surface_rect.right * surface_rect.bottom * 4; if (!(impl = calloc(1, offsetof( struct offscreen_window_surface, info.bmiColors[0] ) + size))) return; - - impl->header.funcs = &offscreen_window_surface_funcs; - impl->header.ref = 1; - impl->header.rect = surface_rect; + window_surface_init( &impl->header, &offscreen_window_surface_funcs, &surface_rect ); pthread_mutex_init( &impl->mutex, NULL ); @@ -242,6 +239,26 @@ void create_offscreen_window_surface( const RECT *visible_rect, struct window_su *surface = &impl->header; } +/* window surface common helpers */ + +W32KAPI void window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, const RECT *rect ) +{ + surface->funcs = funcs; + surface->ref = 1; + surface->rect = *rect; +} + +W32KAPI void window_surface_add_ref( struct window_surface *surface ) +{ + InterlockedIncrement( &surface->ref ); +} + +W32KAPI void window_surface_release( struct window_surface *surface ) +{ + ULONG ret = InterlockedDecrement( &surface->ref ); + if (!ret) surface->funcs->destroy( surface ); +} + /******************************************************************* * register_window_surface * diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 0ba9123c1ba..7397e1758f4 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -905,6 +905,8 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, surface = calloc( 1, FIELD_OFFSET( struct android_window_surface, info.bmiColors[3] )); if (!surface) return NULL; + window_surface_init( &surface->header, &android_surface_funcs, rect ); + set_color_info( &surface->info, src_alpha ); surface->info.bmiHeader.biWidth = width; surface->info.bmiHeader.biHeight = -height; /* top-down */ @@ -913,9 +915,6 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, pthread_mutex_init( &surface->mutex, NULL ); - surface->header.funcs = &android_surface_funcs; - surface->header.rect = *rect; - surface->header.ref = 1; surface->hwnd = hwnd; surface->window = get_ioctl_window( hwnd ); surface->alpha = alpha; diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 65da12912c2..5ec83dd9ebb 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -251,6 +251,7 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, surface = calloc(1, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); if (!surface) return NULL; + window_surface_init(&surface->header, &macdrv_surface_funcs, rect); if ((err = pthread_mutex_init(&surface->mutex, NULL))) { @@ -272,9 +273,6 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, colors[1] = 0x0000ff00; colors[2] = 0x000000ff; - surface->header.funcs = &macdrv_surface_funcs; - surface->header.rect = *rect; - surface->header.ref = 1; surface->window = window; reset_bounds(&surface->bounds); if (old_mac_surface && old_mac_surface->drawn) diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c index cb5e1539072..37858c825ca 100644 --- a/dlls/winewayland.drv/window_surface.c +++ b/dlls/winewayland.drv/window_surface.c @@ -512,6 +512,8 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect wws = calloc(1, sizeof(*wws)); if (!wws) return NULL; + window_surface_init(&wws->header, &wayland_window_surface_funcs, rect); + wws->info.bmiHeader.biSize = sizeof(wws->info.bmiHeader); wws->info.bmiHeader.biClrUsed = 0; wws->info.bmiHeader.biBitCount = 32; @@ -523,9 +525,6 @@ struct window_surface *wayland_window_surface_create(HWND hwnd, const RECT *rect pthread_mutex_init(&wws->mutex, NULL); - wws->header.funcs = &wayland_window_surface_funcs; - wws->header.rect = *rect; - wws->header.ref = 1; wws->hwnd = hwnd; reset_bounds(&wws->bounds); diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 5eccc4a2eb7..a814fdb94b0 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2021,6 +2021,8 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface = calloc( 1, FIELD_OFFSET( struct x11drv_window_surface, info.bmiColors[colors] )); if (!surface) return NULL; + window_surface_init( &surface->header, &x11drv_surface_funcs, rect ); + surface->info.bmiHeader.biSize = sizeof(surface->info.bmiHeader); surface->info.bmiHeader.biWidth = width; surface->info.bmiHeader.biHeight = -height; /* top-down */ @@ -2031,9 +2033,6 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co pthread_mutex_init( &surface->mutex, NULL ); - surface->header.funcs = &x11drv_surface_funcs; - surface->header.rect = *rect; - surface->header.ref = 1; surface->window = window; surface->is_argb = (use_alpha && vis->depth == 32 && surface->info.bmiHeader.biCompression == BI_RGB); set_color_key( surface, color_key ); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4639a409dab..e1a7f2bbffc 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -223,17 +223,9 @@ struct window_surface /* driver-specific fields here */ }; -static inline ULONG window_surface_add_ref( struct window_surface *surface ) -{ - return InterlockedIncrement( &surface->ref ); -} - -static inline ULONG window_surface_release( struct window_surface *surface ) -{ - ULONG ret = InterlockedDecrement( &surface->ref ); - if (!ret) surface->funcs->destroy( surface ); - return ret; -} +W32KAPI void window_surface_init( struct window_surface *surface, const struct window_surface_funcs *funcs, const RECT *rect ); +W32KAPI void window_surface_add_ref( struct window_surface *surface ); +W32KAPI void window_surface_release( struct window_surface *surface ); /* display manager interface, used to initialize display device registry data */

1 0

Rémi Bernon : win32u: Move the window surface mutex to the surface header.
by Alexandre Julliard May 29, 2024

May 29, 2024

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

Rémi Bernon : win32u: Move window surface bounds to the window_surface base struct.
by Alexandre Julliard May 29, 2024

May 29, 2024

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