Skip to content

W
wine-cw
Commit 003e7e96 authored by Dylan Smith's avatar Dylan Smith Committed by Alexandre Julliard
Browse files
Options

wordpad: Avoid making monochrome bitmaps for print preview.

Previewly monochrome bitmaps were being created by CreateCompatibleBitmap because the hdc passed into that call came from CreateCompatibleDC which is initialized with a single pixel monochrome bitmap.
parent 9106860c
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
programs/wordpad/print.c
View file @ 003e7e96
...@@ -874,13 +874,11 @@ static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float r ...@@ -874,13 +874,11 @@ static void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float r
} }
static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, int bmWidth, int bmHeight, RECT* paper, int page) static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, RECT* paper, int page)
{ {
HBITMAP hBitmapCapture = CreateCompatibleBitmap(lpFr->hdc, bmWidth, bmHeight);
int bottom; int bottom;
char_from_pagenum(hEditorWnd, lpFr, page); char_from_pagenum(hEditorWnd, lpFr, page);
SelectObject(lpFr->hdc, hBitmapCapture);
FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH));
bottom = lpFr->rc.bottom; bottom = lpFr->rc.bottom;
SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr);
...@@ -926,6 +924,7 @@ LRESULT print_preview(HWND hwndPreview) ...@@ -926,6 +924,7 @@ LRESULT print_preview(HWND hwndPreview)
GETTEXTLENGTHEX gt; GETTEXTLENGTHEX gt;
RECT paper; RECT paper;
HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR);
HBITMAP hBitmapCapture;
preview.hdc = CreateCompatibleDC(hdc); preview.hdc = CreateCompatibleDC(hdc);
...@@ -947,12 +946,16 @@ LRESULT print_preview(HWND hwndPreview) ...@@ -947,12 +946,16 @@ LRESULT print_preview(HWND hwndPreview)
paper.bottom = preview.bmSize.cy; paper.bottom = preview.bmSize.cy;
fr.hdc = preview.hdc; fr.hdc = preview.hdc;
draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &paper, preview.page); hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy);
SelectObject(fr.hdc, hBitmapCapture);
draw_preview(hEditorWnd, &fr, &paper, preview.page);
if(preview.hdc2) if(preview.hdc2)
{ {
fr.hdc = preview.hdc2; fr.hdc = preview.hdc2;
draw_preview(hEditorWnd, &fr, preview.bmSize.cx, preview.bmSize.cy, &fr.rcPage, preview.page + 1); hBitmapCapture = CreateCompatibleBitmap(hdc, preview.bmSize.cx, preview.bmSize.cy);
SelectObject(fr.hdc, hBitmapCapture);
draw_preview(hEditorWnd, &fr, &fr.rcPage, preview.page + 1);
} }
update_preview_buttons(hMainWnd); update_preview_buttons(hMainWnd);
......
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