joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 11:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize outputPage: Merge SDL Locks & Streamline 8-bit DIBSection

Browse Source 
Increased filename buffer to 512 bytes to prevent potential buffer overruns.

Consolidated separate SDL_LockSurface/SDL_UnlockSurface calls into a single lock session to both extract the SDL palette for the BITMAPINFO color table and copy the pixel data via memcpy, reducing lock overhead.

Utilized an 8-bit DIBSection (top-down) for printer output, ensuring the palette is correctly populated from the SDL surface.
Improved GDI resource cleanup by restoring the original bitmap in the memory DC before deleting the DIBSection.
This commit is contained in:
Dwayne Selsig 2025-03-21 22:11:12 +01:00 committed by GitHub
parent 78f6b2fc8b
commit c792b47e94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/hardware/parport/printer.cpp
View File

@ -1987,7 +1987,7 @@ void CPrinter::doAction(const char *fname) {
void CPrinter::outputPage()
{
char fname[200];
char fname[512];
if (strcasecmp(output, "printer") == 0)
{
@ -2012,20 +2012,6 @@ void CPrinter::outputPage()
else
scaleH = (double)physH / (double)page->h;
HDC memHDC = CreateCompatibleDC(printerDC);
BITMAPINFO bmi = { 0 };
bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmi.bmiHeader.biWidth = page->w;
bmi.bmiHeader.biHeight = -(page->h); // Top-down bitmap
bmi.bmiHeader.biPlanes = 1;
bmi.bmiHeader.biBitCount = 32;
bmi.bmiHeader.biCompression = BI_RGB;
uint32_t* pixelBuffer = nullptr;
HBITMAP bitmap = CreateCompatibleBitmap(memHDC, page->w, page->h);
SelectObject(memHDC, bitmap);
// Start new printer job?
if (outputHandle == NULL)
{
@ -2039,8 +2025,6 @@ void CPrinter::outputPage()
if (StartDoc(printerDC, &docinfo)<=0) {
LOG_MSG("PRINTER: Cannot start print.");
DeleteObject(bitmap);
DeleteDC(memHDC);
return;
}
multiPageCounter = 1;
@ -2049,30 +2033,46 @@ void CPrinter::outputPage()
if (StartPage(printerDC) < 0)
{
LOG_MSG("PRINTER: Cannot start page.");
DeleteObject(bitmap);
DeleteDC(memHDC);
return;
}
// Create a memory DC for the printer bitmap
HDC memHDC = CreateCompatibleDC(printerDC);
// Set up a BITMAPINFO for an 8-bit DIBSection (top-down)
BITMAPINFO bmi;
ZeroMemory(&bmi, sizeof(bmi));
bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bmi.bmiHeader.biWidth = page->w;
bmi.bmiHeader.biHeight = -((LONG)page->h); // top-down bitmap
bmi.bmiHeader.biPlanes = 1;
bmi.bmiHeader.biBitCount = 8;
bmi.bmiHeader.biCompression = BI_RGB;
// Fill the color table with the SDL palette (256 colors)
SDL_LockSurface(page);
SDL_Palette* sdlpal = page->format->palette;
for(uint16_t y = 0; y < page->h; y++)
{
for(uint16_t x = 0; x < page->w; x++)
{
uint8_t pixel = *((uint8_t*)page->pixels + x + (y * page->pitch));
uint8_t r = sdlpal->colors[pixel].r;
uint8_t g = sdlpal->colors[pixel].g;
uint8_t b = sdlpal->colors[pixel].b;
// 32-bit ARGB (0x00bbggrr)
pixelBuffer[x + (y * page->w)] = (b << 16) | (g << 8) | r;
}
for(int i = 0; i < 256; i++) {
bmi.bmiColors[i].rgbRed = sdlpal->colors[i].r;
bmi.bmiColors[i].rgbGreen = sdlpal->colors[i].g;
bmi.bmiColors[i].rgbBlue = sdlpal->colors[i].b;
bmi.bmiColors[i].rgbReserved = 0;
}
// Create the DIBSection and obtain a pointer to the pixel memory
void* pBits = NULL;
HBITMAP hBitmap = CreateDIBSection(printerDC, &bmi, DIB_RGB_COLORS, &pBits, NULL, 0);
HBITMAP hOldBitmap = (HBITMAP)SelectObject(memHDC, hBitmap);
// Copy the entire 8-bit pixel data from the SDL surface to the DIBSection
for(int y = 0; y < page->h; y++) {
memcpy((uint8_t*)pBits + y * page->w,
(uint8_t*)page->pixels + y * page->pitch,
page->w);
}
SDL_UnlockSurface(page);
// Stretch and copy the bitmap from the memory DC to the printer DC, scaling it to the printer's physical dimensions
StretchBlt(printerDC, 0, 0, physW, physH, memHDC, 0, 0, page->w, page->h, SRCCOPY);
EndPage(printerDC);
@ -2087,7 +2087,8 @@ void CPrinter::outputPage()
EndDoc(printerDC);
outputHandle = NULL;
}
DeleteObject(bitmap);
SelectObject(memHDC, hOldBitmap);
DeleteObject(hBitmap);
DeleteDC(memHDC);
#else
LOG_MSG("PRINTER: Direct printing not supported under this OS");