diff --git a/reactos/drivers/dd/vga/display/main/enable.c b/reactos/drivers/dd/vga/display/main/enable.c index 0fe843aae8b..e9f0da76afa 100644 --- a/reactos/drivers/dd/vga/display/main/enable.c +++ b/reactos/drivers/dd/vga/display/main/enable.c @@ -1,9 +1,9 @@ /* * entry.c * - * $Revision: 1.14 $ - * $Author: ekohl $ - * $Date: 2001/06/29 19:32:50 $ + * $Revision: 1.15 $ + * $Author: jfilby $ + * $Date: 2001/07/01 14:32:47 $ * */ @@ -13,7 +13,7 @@ #define DBG_PREFIX "VGADDI: " -BOOL VGADDIAssertMode(IN DHPDEV DPev, +VOID VGADDIAssertMode(IN DHPDEV DPev, IN BOOL Enable); VOID VGADDICompletePDEV(IN DHPDEV PDev, IN HDEV Dev); @@ -184,9 +184,10 @@ DHPDEV VGADDIEnablePDEV(IN DEVMODEW *DM, // FIXME: fill out DevCaps // FIXME: full out DevInfo - devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (PULONG*)(VGApalette.PaletteEntry), 0, 0, 0); - + devinfoVGA.hpalDefault = EngCreatePalette(PAL_INDEXED, 16, (PULONG)(VGApalette.PaletteEntry), 0, 0, 0); +DbgPrint("Palette from Driver: %u\n", devinfoVGA.hpalDefault); *DI = devinfoVGA; +DbgPrint("Palette from Driver 2: %u and DI is %08x\n", DI->hpalDefault, DI); return PDev; } @@ -203,7 +204,7 @@ VOID VGADDICompletePDEV(IN DHPDEV PDev, } -BOOL VGADDIAssertMode(IN DHPDEV DPev, +VOID VGADDIAssertMode(IN DHPDEV DPev, IN BOOL Enable) { PPDEV ppdev = (PPDEV)DPev; @@ -235,7 +236,6 @@ BOOL VGADDIAssertMode(IN DHPDEV DPev, } } - return TRUE; } VOID VGADDIDisablePDEV(IN DHPDEV PDev) diff --git a/reactos/drivers/dd/vga/display/main/gdiinfo.h b/reactos/drivers/dd/vga/display/main/gdiinfo.h index fc84f2b1653..dc73223a4dd 100644 --- a/reactos/drivers/dd/vga/display/main/gdiinfo.h +++ b/reactos/drivers/dd/vga/display/main/gdiinfo.h @@ -98,12 +98,9 @@ const VGALOGPALETTE VGApalette = // Devinfo structure passed back to the engine in DrvEnablePDEV -// FIXME: The names of these fonts should be L"..." (For Unicode).. but that -// just doesn't seem compatible with the def of LOGFONT - -#define SYSTM_LOGFONT {16,7,0,0,700,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,VARIABLE_PITCH | FF_DONTCARE,"System"} -#define HELVE_LOGFONT {12,9,0,0,400,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_STROKE_PRECIS,PROOF_QUALITY,VARIABLE_PITCH | FF_DONTCARE, "MS Sans Serif"} -#define COURI_LOGFONT {12,9,0,0,400,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_STROKE_PRECIS,PROOF_QUALITY,FIXED_PITCH | FF_DONTCARE, "Courier"} +#define SYSTM_LOGFONT {16,7,0,0,700,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,VARIABLE_PITCH | FF_DONTCARE, L"System"} +#define HELVE_LOGFONT {12,9,0,0,400,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_STROKE_PRECIS,PROOF_QUALITY,VARIABLE_PITCH | FF_DONTCARE, L"MS Sans Serif"} +#define COURI_LOGFONT {12,9,0,0,400,0,0,0,ANSI_CHARSET,OUT_DEFAULT_PRECIS,CLIP_STROKE_PRECIS,PROOF_QUALITY,FIXED_PITCH | FF_DONTCARE, L"Courier"} DEVINFO devinfoVGA = {