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

This reverts commit 4216179eaa.
This commit is contained in:
Piotr Caban 2023-04-28 19:58:33 +02:00 committed by Alexandre Julliard
parent eec01270c0
commit 50e18d19cc
3 changed files with 1 additions and 4 deletions

View file

@ -92,7 +92,7 @@ static const PSDRV_DEVMODE DefaultDevmode =
HINSTANCE PSDRV_hInstance = 0;
HANDLE PSDRV_Heap = 0;
HFONT PSDRV_DefaultFont = 0;
static HFONT PSDRV_DefaultFont = 0;
static const LOGFONTA DefaultLogFont = {
100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0,
DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, ""

View file

@ -1147,8 +1147,6 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable,
if (i & 0x80000000)
{
*pattern = NULL;
if ((i & 0x7fffffff) == DEVICE_DEFAULT_FONT)
return PSDRV_DefaultFont;
return GetStockObject(i & 0x7fffffff);
}
*pattern = data->patterns + i;

View file

@ -417,7 +417,6 @@ extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates inc
extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN;
extern HANDLE PSDRV_Heap 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 PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN;