Author: tkreuzer
Date: Sun Oct 1 10:17:30 2017
New Revision: 76014
URL: http://svn.reactos.org/svn/reactos?rev=76014&view=rev
Log:
[VGA_NEW] Add CMakeLists.txt and fix build
Added:
trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt (with props)
Modified:
trunk/reactos/win32ss/drivers/displays/vga_new/enable.c
trunk/reactos/win32ss/drivers/displays/vga_new/palette.c
trunk/reactos/win32ss/drivers/displays/vga_new/screen.c
Added: trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt?rev=76014
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt (added)
+++ trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt
[iso-8859-1] Sun Oct 1 10:17:30 2017
@@ -0,0 +1,18 @@
+
+list(APPEND SOURCE
+ enable.c
+ debug.c
+ enable.c
+ palette.c
+ screen.c)
+
+add_library(vgaddi SHARED
+ ${SOURCE}
+ vga_new.rc)
+
+set_module_type(vgaddi kerneldll ENTRYPOINT DrvEnableDriver 12)
+
+add_importlibs(vgaddi win32k)
+target_link_libraries(vgaddi libcntpr)
+add_dependencies(vgaddi psdk)
+add_cd_file(TARGET vgaddi DESTINATION reactos/system32 FOR all)
Propchange: trunk/reactos/win32ss/drivers/displays/vga_new/CMakeLists.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/win32ss/drivers/displays/vga_new/enable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/vga_new/enable.c?rev=76014&r1=76013&r2=76014&view=diff
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga_new/enable.c [iso-8859-1]
(original)
+++ trunk/reactos/win32ss/drivers/displays/vga_new/enable.c [iso-8859-1]
Sun Oct 1 10:17:30 2017
@@ -48,7 +48,7 @@
*
\**************************************************************************/
-BOOL DrvEnableDriver(
+BOOL APIENTRY DrvEnableDriver(
ULONG iEngineVersion,
ULONG cj,
PDRVENABLEDATA pded)
@@ -88,7 +88,7 @@
*
\**************************************************************************/
-DHPDEV DrvEnablePDEV(
+DHPDEV APIENTRY DrvEnablePDEV(
DEVMODEW *pDevmode, // Pointer to DEVMODE
PWSTR pwszLogAddress, // Logical address
ULONG cPatterns, // number of patterns
@@ -176,7 +176,7 @@
*
\**************************************************************************/
-VOID DrvCompletePDEV(
+VOID APIENTRY DrvCompletePDEV(
DHPDEV dhpdev,
HDEV hdev)
{
@@ -191,7 +191,7 @@
*
\**************************************************************************/
-VOID DrvDisablePDEV(
+VOID APIENTRY DrvDisablePDEV(
DHPDEV dhpdev)
{
vDisablePalette((PPDEV) dhpdev);
@@ -207,14 +207,17 @@
*
\**************************************************************************/
-HSURF DrvEnableSurface(
+HSURF APIENTRY DrvEnableSurface(
DHPDEV dhpdev)
{
PPDEV ppdev;
HSURF hsurf;
SIZEL sizl;
ULONG ulBitmapType;
+#if 0
FLONG flHooks;
+#endif
+ HSURF hSurfBitmap;
// Create engine bitmap around frame buffer.
@@ -290,7 +293,6 @@
// eVb: 1.5 [END]
ppdev->hsurfEng = hsurf;
// eVb: 1.4 [VGARISC Change] - Allocate 4BPP DIB that will store GDI drawing
- HSURF hSurfBitmap;
hSurfBitmap = (HSURF)EngCreateBitmap(sizl, 0, ulBitmapType, 0, NULL);
if (hSurfBitmap == (HSURF) 0)
{
@@ -328,7 +330,7 @@
*
\**************************************************************************/
-VOID DrvDisableSurface(
+VOID APIENTRY DrvDisableSurface(
DHPDEV dhpdev)
{
EngDeleteSurface(((PPDEV) dhpdev)->hsurfEng);
@@ -343,7 +345,7 @@
*
\**************************************************************************/
-BOOL DrvAssertMode(
+BOOL APIENTRY DrvAssertMode(
DHPDEV dhpdev,
BOOL bEnable)
{
@@ -415,7 +417,7 @@
*
\**************************************************************************/
-ULONG DrvGetModes(
+ULONG APIENTRY DrvGetModes(
HANDLE hDriver,
ULONG cjSize,
DEVMODEW *pdm)
Modified: trunk/reactos/win32ss/drivers/displays/vga_new/palette.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/vga_new/palette.c?rev=76014&r1=76013&r2=76014&view=diff
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga_new/palette.c [iso-8859-1]
(original)
+++ trunk/reactos/win32ss/drivers/displays/vga_new/palette.c [iso-8859-1]
Sun Oct 1 10:17:30 2017
@@ -288,7 +288,7 @@
*
\**************************************************************************/
-BOOL DrvSetPalette(
+BOOL APIENTRY DrvSetPalette(
DHPDEV dhpdev,
PALOBJ* ppalo,
FLONG fl,
Modified: trunk/reactos/win32ss/drivers/displays/vga_new/screen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/vga_new/screen.c?rev=76014&r1=76013&r2=76014&view=diff
==============================================================================
--- trunk/reactos/win32ss/drivers/displays/vga_new/screen.c [iso-8859-1]
(original)
+++ trunk/reactos/win32ss/drivers/displays/vga_new/screen.c [iso-8859-1]
Sun Oct 1 10:17:30 2017
@@ -114,7 +114,7 @@
\**************************************************************************/
// Values for the internal, EGA-compatible palette.
-
+#if 0
static WORD PaletteBuffer[] = {
16, // 16 entries
@@ -156,6 +156,7 @@
0x00, 0x3F, 0x3F, 0x00, // bright ScanLinesan
0x3F, 0x3F, 0x3F, 0x00 // bright white
};
+#endif
// eVb: 2.3 [END]
/******************************Public*Routine******************************\
* bInitSURF
@@ -330,8 +331,10 @@
{
ULONG cModes;
PVIDEO_MODE_INFORMATION pVideoBuffer, pVideoModeSelected, pVideoTemp;
+#if 0
VIDEO_COLOR_CAPABILITIES colorCapabilities;
ULONG ulTemp;
+#endif
BOOL bSelectDefault;
ULONG cbModeSize;
