Skip to content

W
wine-winehq
Commit 50e18d19 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

Revert "wineps: Fix default device font selection.".

This reverts commit 4216179e.
parent eec01270
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
dlls/wineps.drv/init.c
View file @ 50e18d19
...@@ -92,7 +92,7 @@ static const PSDRV_DEVMODE DefaultDevmode = ...@@ -92,7 +92,7 @@ static const PSDRV_DEVMODE DefaultDevmode =
HINSTANCE PSDRV_hInstance = 0; HINSTANCE PSDRV_hInstance = 0;
HANDLE PSDRV_Heap = 0; HANDLE PSDRV_Heap = 0;
HFONT PSDRV_DefaultFont = 0; static HFONT PSDRV_DefaultFont = 0;
static const LOGFONTA DefaultLogFont = { static const LOGFONTA DefaultLogFont = {
100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, 100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0,
DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, ""
......
dlls/wineps.drv/printproc.c
View file @ 50e18d19
...@@ -1147,8 +1147,6 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, ...@@ -1147,8 +1147,6 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable,
if (i & 0x80000000) if (i & 0x80000000)
{ {
*pattern = NULL; *pattern = NULL;
if ((i & 0x7fffffff) == DEVICE_DEFAULT_FONT)
return PSDRV_DefaultFont;
return GetStockObject(i & 0x7fffffff); return GetStockObject(i & 0x7fffffff);
} }
*pattern = data->patterns + i; *pattern = data->patterns + i;
......
dlls/wineps.drv/psdrv.h
View file @ 50e18d19
...@@ -417,7 +417,6 @@ extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates inc ...@@ -417,7 +417,6 @@ extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates inc
extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN;
extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN;
extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN;
extern HFONT PSDRV_DefaultFont DECLSPEC_HIDDEN;
extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN;
extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN;
......
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