mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-23 18:03:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[client,sdl] unify primary surface cleanup

Browse Source
This commit is contained in:
akallabeth 2023-05-12 13:56:24 +02:00 committed by David Fort
parent 1b28ed7c9c
commit a78182c425
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/SDL/sdl_freerdp.cpp
View File

@ -412,6 +412,17 @@ static BOOL sdl_end_paint(rdpContext* context)
return rc;
}
static void sdl_destroy_primary(sdlContext* sdl)
{
if (!sdl)
return;
SDL_FreeFormat(sdl->primary_format);
SDL_FreeSurface(sdl->primary);
sdl->primary = nullptr;
sdl->primary_format = nullptr;
}
/* Create a SDL surface from the GDI buffer */
static BOOL sdl_create_primary(sdlContext* sdl)
{
@ -422,8 +433,7 @@ static BOOL sdl_create_primary(sdlContext* sdl)
gdi = sdl->common.context.gdi;
WINPR_ASSERT(gdi);
SDL_FreeFormat(sdl->primary_format);
SDL_FreeSurface(sdl->primary);
sdl_destroy_primary(sdl);
sdl->primary = SDL_CreateRGBSurfaceWithFormatFrom(
gdi->primary_buffer, (int)gdi->width, (int)gdi->height,
(int)FreeRDPGetBitsPerPixel(gdi->dstFormat), (int)gdi->stride, sdl->sdl_pixel_format);
@ -592,11 +602,8 @@ static void sdl_cleanup_sdl(sdlContext* sdl)
*window = empty;
}
SDL_FreeFormat(sdl->primary_format);
sdl->primary_format = nullptr;
SDL_FreeSurface(sdl->primary);
sdl->primary = nullptr;
sdl_destroy_primary(sdl);
sdl->windowCount = 0;
SDL_Quit();