Commit 9c30236d authored by Evan Stade's avatar Evan Stade Committed by Alexandre Julliard

gdiplus: Replace GetDC(0) with CreateCompatibleDC(0).

parent 94a19d1f
...@@ -130,7 +130,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, ...@@ -130,7 +130,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect,
bmi.bmiHeader.biBitCount = 0; bmi.bmiHeader.biBitCount = 0;
if(!bm_is_selected){ if(!bm_is_selected){
hdc = GetDC(0); hdc = CreateCompatibleDC(0);
old = SelectObject(hdc, (HBITMAP)hbm); old = SelectObject(hdc, (HBITMAP)hbm);
} }
...@@ -149,7 +149,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, ...@@ -149,7 +149,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect,
if(!bm_is_selected){ if(!bm_is_selected){
SelectObject(hdc, old); SelectObject(hdc, old);
ReleaseDC(0, hdc); DeleteDC(hdc);
} }
lockeddata->Width = rect->Width; lockeddata->Width = rect->Width;
...@@ -210,7 +210,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, ...@@ -210,7 +210,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap,
bmi.bmiHeader.biBitCount = 0; bmi.bmiHeader.biBitCount = 0;
if(!bm_is_selected){ if(!bm_is_selected){
hdc = GetDC(0); hdc = CreateCompatibleDC(0);
old = SelectObject(hdc, (HBITMAP)hbm); old = SelectObject(hdc, (HBITMAP)hbm);
} }
...@@ -221,7 +221,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, ...@@ -221,7 +221,7 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap,
if(!bm_is_selected){ if(!bm_is_selected){
SelectObject(hdc, old); SelectObject(hdc, old);
ReleaseDC(0, hdc); DeleteDC(hdc);
} }
GdipFree(bitmap->bitmapbits); GdipFree(bitmap->bitmapbits);
...@@ -677,11 +677,11 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) ...@@ -677,11 +677,11 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image)
if(!hdc){ if(!hdc){
HBITMAP old; HBITMAP old;
hdc = GetDC(0); hdc = CreateCompatibleDC(0);
old = SelectObject(hdc, (HBITMAP)hbm); old = SelectObject(hdc, (HBITMAP)hbm);
GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);
SelectObject(hdc, old); SelectObject(hdc, old);
ReleaseDC(0, hdc); DeleteDC(hdc);
} }
else else
GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS);
......
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