Commit e015928a authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

uxtheme: Fix buffer bitmap leak.

parent a86af722
...@@ -39,12 +39,14 @@ struct paintbuffer ...@@ -39,12 +39,14 @@ struct paintbuffer
{ {
HDC targetdc; HDC targetdc;
HDC memorydc; HDC memorydc;
HBITMAP bitmap;
RECT rect; RECT rect;
void *bits; void *bits;
}; };
static void free_paintbuffer(struct paintbuffer *buffer) static void free_paintbuffer(struct paintbuffer *buffer)
{ {
DeleteObject(buffer->bitmap);
DeleteDC(buffer->memorydc); DeleteDC(buffer->memorydc);
HeapFree(GetProcessHeap(), 0, buffer); HeapFree(GetProcessHeap(), 0, buffer);
} }
...@@ -83,7 +85,6 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, ...@@ -83,7 +85,6 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect,
char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])];
BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; BITMAPINFO *bmi = (BITMAPINFO *)bmibuf;
struct paintbuffer *buffer; struct paintbuffer *buffer;
HBITMAP hbm;
TRACE("(%p %s %d %p %p)\n", targetdc, wine_dbgstr_rect(rect), format, TRACE("(%p %s %d %p %p)\n", targetdc, wine_dbgstr_rect(rect), format,
params, retdc); params, retdc);
...@@ -105,7 +106,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, ...@@ -105,7 +106,7 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect,
switch (format) switch (format)
{ {
case BPBF_COMPATIBLEBITMAP: case BPBF_COMPATIBLEBITMAP:
hbm = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top); buffer->bitmap = CreateCompatibleBitmap(targetdc, rect->right - rect->left, rect->bottom - rect->top);
buffer->bits = NULL; buffer->bits = NULL;
break; break;
case BPBF_DIB: case BPBF_DIB:
...@@ -120,22 +121,23 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, ...@@ -120,22 +121,23 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect,
bmi->bmiHeader.biBitCount = format == BPBF_TOPDOWNMONODIB ? 1 : 32; bmi->bmiHeader.biBitCount = format == BPBF_TOPDOWNMONODIB ? 1 : 32;
bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biPlanes = 1;
bmi->bmiHeader.biCompression = BI_RGB; bmi->bmiHeader.biCompression = BI_RGB;
hbm = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0); buffer->bitmap = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0);
break; break;
default: default:
WARN("Unknown buffer format %d\n", format); WARN("Unknown buffer format %d\n", format);
buffer->bitmap = NULL;
free_paintbuffer(buffer); free_paintbuffer(buffer);
return NULL; return NULL;
} }
if (!hbm) if (!buffer->bitmap)
{ {
WARN("Failed to create buffer bitmap\n"); WARN("Failed to create buffer bitmap\n");
free_paintbuffer(buffer); free_paintbuffer(buffer);
return NULL; return NULL;
} }
DeleteObject(SelectObject(buffer->memorydc, hbm)); DeleteObject(SelectObject(buffer->memorydc, buffer->bitmap));
*retdc = buffer->memorydc; *retdc = buffer->memorydc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment