lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Going towards TS support in mainline

Browse source
This commit is contained in:
Toni Spets 2011-07-01 10:55:10 +03:00
parent 706874f7f9
commit 517eef41dc
3 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
render_soft.c
View file

@ -27,11 +27,11 @@ DWORD WINAPI render_soft_main(void)
PBITMAPINFO bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFO) + (sizeof(RGBQUAD) * 256) + 1024);
bmi->bmiHeader.biSize = sizeof(BITMAPINFO);
bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmi->bmiHeader.biWidth = ddraw->width;
bmi->bmiHeader.biHeight = -ddraw->height;
bmi->bmiHeader.biPlanes = 1;
bmi->bmiHeader.biBitCount = 8;
bmi->bmiHeader.biBitCount = ddraw->bpp;
bmi->bmiHeader.biCompression = BI_RGB;
SelectObject(memDC, surface);
@ -58,9 +58,9 @@ DWORD WINAPI render_soft_main(void)
}
EnterCriticalSection(&ddraw->cs);
if (ddraw->primary && ddraw->primary->palette)
if (ddraw->primary && (ddraw->primary->palette || ddraw->bpp == 16))
{
if (ddraw->primary->palette->data_rgb == NULL)
if (ddraw->primary->palette && ddraw->primary->palette->data_rgb == NULL)
{
ddraw->primary->palette->data_rgb = &bmi->bmiColors[1];
}