winemac.drv: Move create_bitmap_from_dib() above the import/export functions.
Signed-off-by: Charles Davis <cdavis5x@gmail.com> Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a313c9b7f9
commit
1dcf51f0fc
|
@ -615,6 +615,36 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* create_bitmap_from_dib
|
||||||
|
*
|
||||||
|
* Given a packed DIB, creates a bitmap object from it.
|
||||||
|
*/
|
||||||
|
static HANDLE create_bitmap_from_dib(HANDLE dib)
|
||||||
|
{
|
||||||
|
HANDLE ret = 0;
|
||||||
|
BITMAPINFO *bmi;
|
||||||
|
|
||||||
|
if (dib && (bmi = GlobalLock(dib)))
|
||||||
|
{
|
||||||
|
HDC hdc;
|
||||||
|
unsigned int offset;
|
||||||
|
|
||||||
|
hdc = GetDC(NULL);
|
||||||
|
|
||||||
|
offset = bitmap_info_size(bmi, DIB_RGB_COLORS);
|
||||||
|
|
||||||
|
ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset,
|
||||||
|
bmi, DIB_RGB_COLORS);
|
||||||
|
|
||||||
|
GlobalUnlock(dib);
|
||||||
|
ReleaseDC(NULL, hdc);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* import_clipboard_data
|
* import_clipboard_data
|
||||||
*
|
*
|
||||||
|
@ -650,36 +680,6 @@ static HANDLE import_clipboard_data(CFDataRef data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
* create_bitmap_from_dib
|
|
||||||
*
|
|
||||||
* Given a packed DIB, creates a bitmap object from it.
|
|
||||||
*/
|
|
||||||
static HANDLE create_bitmap_from_dib(HANDLE dib)
|
|
||||||
{
|
|
||||||
HANDLE ret = 0;
|
|
||||||
BITMAPINFO *bmi;
|
|
||||||
|
|
||||||
if (dib && (bmi = GlobalLock(dib)))
|
|
||||||
{
|
|
||||||
HDC hdc;
|
|
||||||
unsigned int offset;
|
|
||||||
|
|
||||||
hdc = GetDC(NULL);
|
|
||||||
|
|
||||||
offset = bitmap_info_size(bmi, DIB_RGB_COLORS);
|
|
||||||
|
|
||||||
ret = CreateDIBitmap(hdc, &bmi->bmiHeader, CBM_INIT, (LPBYTE)bmi + offset,
|
|
||||||
bmi, DIB_RGB_COLORS);
|
|
||||||
|
|
||||||
GlobalUnlock(dib);
|
|
||||||
ReleaseDC(NULL, hdc);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* import_bmp_to_bitmap
|
* import_bmp_to_bitmap
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue