mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-01-08 06:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify WIN_CreateHCursor (#12933)

Browse Source
This commit is contained in:
Dimitriy Ryazantcev
2025-05-01 18:32:12 +03:00
committed by GitHub
parent 6a0505c090
commit 3730128e33
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/video/windows/SDL_windowsmouse.c
View File

@@ -205,39 +205,30 @@ static HBITMAP CreateMaskBitmap(SDL_Surface *surface, bool is_monochrome)
static HCURSOR WIN_CreateHCursor(SDL_Surface *surface, int hot_x, int hot_y)
{
HCURSOR hcursor;
ICONINFO ii;
HCURSOR hcursor = NULL;
bool is_monochrome = IsMonochromeSurface(surface);
SDL_zero(ii);
ii.fIcon = FALSE;
ii.xHotspot = (DWORD)hot_x;
ii.yHotspot = (DWORD)hot_y;
ii.hbmMask = CreateMaskBitmap(surface, is_monochrome);
ii.hbmColor = is_monochrome ? NULL : CreateColorBitmap(surface);
ICONINFO ii = {
.fIcon = FALSE,
.xHotspot = (DWORD)hot_x,
.yHotspot = (DWORD)hot_y,
.hbmMask = CreateMaskBitmap(surface, is_monochrome),
.hbmColor = is_monochrome ? NULL : CreateColorBitmap(surface)
};
if (!ii.hbmMask || (!is_monochrome && !ii.hbmColor)) {
SDL_SetError("Couldn't create cursor bitmaps");
if (ii.hbmMask) {
DeleteObject(ii.hbmMask);
}
if (ii.hbmColor) {
DeleteObject(ii.hbmColor);
}
return NULL;
goto cleanup;
}
hcursor = CreateIconIndirect(&ii);
if (!hcursor) {
WIN_SetError("CreateIconIndirect()");
DeleteObject(ii.hbmMask);
if (ii.hbmColor) {
DeleteObject(ii.hbmColor);
}
return NULL;
WIN_SetError("CreateIconIndirect failed");
}
DeleteObject(ii.hbmMask);
cleanup:
if (ii.hbmMask) {
DeleteObject(ii.hbmMask);
}
if (ii.hbmColor) {
DeleteObject(ii.hbmColor);
}