asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #88405 from bruvzg/fix_non_bgra_dib

Browse source 
[Windows] Fix reading non-BGRA8 DIBs from clipboard.
This commit is contained in:
Rémi Verschelde 2024-02-17 00:27:23 +01:00
commit b2fa20922f
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
platform/windows/display_server_windows.cpp
View file

@ -759,24 +759,49 @@ Ref<Image> DisplayServerWindows::clipboard_get_image() const {
if (ptr != NULL) { if (ptr != NULL) {
BITMAPINFOHEADER *info = &ptr->bmiHeader; BITMAPINFOHEADER *info = &ptr->bmiHeader;
PackedByteArray pba; void *dib_bits = (void *)(ptr->bmiColors);
for (LONG y = info->biHeight - 1; y > -1; y--) { // Draw DIB image to temporary DC surface and read it back as BGRA8.
for (LONG x = 0; x < info->biWidth; x++) { HDC dc = GetDC(0);
tagRGBQUAD *rgbquad = ptr->bmiColors + (info->biWidth * y) + x; if (dc) {
pba.append(rgbquad->rgbRed); HDC hdc = CreateCompatibleDC(dc);
pba.append(rgbquad->rgbGreen); if (hdc) {
pba.append(rgbquad->rgbBlue); HBITMAP hbm = CreateCompatibleBitmap(dc, info->biWidth, abs(info->biHeight));
pba.append(rgbquad->rgbReserved); if (hbm) {
SelectObject(hdc, hbm);
SetDIBitsToDevice(hdc, 0, 0, info->biWidth, abs(info->biHeight), 0, 0, 0, abs(info->biHeight), dib_bits, ptr, DIB_RGB_COLORS);
BITMAPINFO bmp_info = {};
bmp_info.bmiHeader.biSize = sizeof(bmp_info.bmiHeader);
bmp_info.bmiHeader.biWidth = info->biWidth;
bmp_info.bmiHeader.biHeight = -abs(info->biHeight);
bmp_info.bmiHeader.biPlanes = 1;
bmp_info.bmiHeader.biBitCount = 32;
bmp_info.bmiHeader.biCompression = BI_RGB;
Vector<uint8_t> img_data;
img_data.resize(info->biWidth * abs(info->biHeight) * 4);
GetDIBits(hdc, hbm, 0, abs(info->biHeight), img_data.ptrw(), &bmp_info, DIB_RGB_COLORS);
uint8_t *wr = (uint8_t *)img_data.ptrw();
for (int i = 0; i < info->biWidth * abs(info->biHeight); i++) {
SWAP(wr[i * 4 + 0], wr[i * 4 + 2]); // Swap B and R.
if (info->biBitCount != 32) {
wr[i * 4 + 3] = 255; // Set A to solid if it's not in the source image.
}
}
image = Image::create_from_data(info->biWidth, abs(info->biHeight), false, Image::Format::FORMAT_RGBA8, img_data);
DeleteObject(hbm);
}
DeleteDC(hdc);
} }
ReleaseDC(NULL, dc);
} }
image = Image::create_from_data(info->biWidth, info->biHeight, false, Image::Format::FORMAT_RGBA8, pba);
GlobalUnlock(mem); GlobalUnlock(mem);
} }
} }
} }
CloseClipboard(); CloseClipboard();
return image; return image;
@ -1153,7 +1178,7 @@ Ref<Image> DisplayServerWindows::screen_get_image(int p_screen) const {
uint8_t *wr = (uint8_t *)img_data.ptrw(); uint8_t *wr = (uint8_t *)img_data.ptrw();
for (int i = 0; i < width * height; i++) { for (int i = 0; i < width * height; i++) {
SWAP(wr[i * 4 + 0], wr[i * 4 + 2]); SWAP(wr[i * 4 + 0], wr[i * 4 + 2]); // Swap B and R.
} }
img = Image::create_from_data(width, height, false, Image::FORMAT_RGBA8, img_data); img = Image::create_from_data(width, height, false, Image::FORMAT_RGBA8, img_data);