[ros-diffs] [fireball] 27188: - Match prototypes, stub missing functions. - Disable VGA Text mode for now.
fireball at svn.reactos.org
fireball at svn.reactos.org
Fri Jun 15 14:21:02 CEST 2007
Author: fireball
Date: Fri Jun 15 16:21:01 2007
New Revision: 27188
URL: http://svn.reactos.org/svn/reactos?rev=27188&view=rev
Log:
- Match prototypes, stub missing functions.
- Disable VGA Text mode for now.
Modified:
branches/olpc/drivers/base/bootvid/bootvid.def
branches/olpc/drivers/base/bootvid/bootvid.h
branches/olpc/drivers/base/bootvid/vid.c
branches/olpc/drivers/base/bootvid/vid_vga.c
branches/olpc/drivers/base/bootvid/vid_vgatext.c
branches/olpc/drivers/base/bootvid/vid_xbox.c
Modified: branches/olpc/drivers/base/bootvid/bootvid.def
URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/bootvid.def?rev=27188&r1=27187&r2=27188&view=diff
==============================================================================
--- branches/olpc/drivers/base/bootvid/bootvid.def (original)
+++ branches/olpc/drivers/base/bootvid/bootvid.def Fri Jun 15 16:21:01 2007
@@ -1,14 +1,15 @@
-LIBRARY bootvid.sys
+LIBRARY BOOTVID.DLL
EXPORTS
-VidInitialize
-VidCleanUp
-VidResetDisplay
-VidBufferToScreenBlt
-VidScreenToBufferBlt
-VidBitBlt
-VidSolidColorFill
-VidDisplayString
-BootVidDisplayBootLogo
-BootVidUpdateProgress
-BootVidFinalizeBootLogo
+VidBitBlt at 12
+VidBufferToScreenBlt at 24
+VidCleanUp at 0
+VidDisplayString at 4
+VidDisplayStringXY
+VidInitialize at 4
+VidResetDisplay at 4
+VidScreenToBufferBlt at 24
+VidSetScrollRegion at 16
+VidSetTextColor at 4
+VidSolidColorFill at 20
+
Modified: branches/olpc/drivers/base/bootvid/bootvid.h
URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/bootvid.h?rev=27188&r1=27187&r2=27188&view=diff
==============================================================================
--- branches/olpc/drivers/base/bootvid/bootvid.h (original)
+++ branches/olpc/drivers/base/bootvid/bootvid.h Fri Jun 15 16:21:01 2007
@@ -34,7 +34,7 @@
BOOLEAN NTAPI VidInitialize(BOOLEAN);
VOID NTAPI VidCleanUp(VOID);
-VOID NTAPI VidResetDisplay(VOID);
+VOID NTAPI VidResetDisplay(IN BOOLEAN HalReset);
VOID NTAPI VidBufferToScreenBlt(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG);
VOID NTAPI VidScreenToBufferBlt(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG);
VOID NTAPI VidBitBlt(PUCHAR, ULONG, ULONG);
@@ -49,6 +49,7 @@
typedef VOID (NTAPI *PVID_BITBLT)(PUCHAR, ULONG, ULONG);
typedef VOID (NTAPI *PVID_SOLID_COLOR_FILL)(ULONG, ULONG, ULONG, ULONG, ULONG);
typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PCSTR);
+typedef VOID (NTAPI *PVID_DISPLAY_STRING_XY)(PUCHAR, ULONG, ULONG, BOOLEAN);
typedef struct _VID_FUNCTION_TABLE
{
@@ -60,6 +61,7 @@
PVID_BITBLT BitBlt;
PVID_SOLID_COLOR_FILL SolidColorFill;
PVID_DISPLAY_STRING DisplayString;
+ PVID_DISPLAY_STRING_XY DisplayStringXY;
} VID_FUNCTION_TABLE, *PVID_FUNCTION_TABLE;
#endif /* _BOOTVID_H */
Modified: branches/olpc/drivers/base/bootvid/vid.c
URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid.c?rev=27188&r1=27187&r2=27188&view=diff
==============================================================================
--- branches/olpc/drivers/base/bootvid/vid.c (original)
+++ branches/olpc/drivers/base/bootvid/vid.c Fri Jun 15 16:21:01 2007
@@ -50,13 +50,13 @@
VidTable = &VidXboxTable;
else if (SetMode)
VidTable = &VidVgaTable;
- else
- VidTable = &VidVgaTextTable;
+ /*else
+ VidTable = &VidVgaTextTable;*/
return VidTable->Initialize(SetMode);
}
-VOID STDCALL
-VidResetDisplay(VOID)
+VOID NTAPI
+VidResetDisplay(IN BOOLEAN HalReset)
{
VidTable->ResetDisplay();
}
@@ -117,3 +117,28 @@
{
VidTable->DisplayString(String);
}
+
+VOID NTAPI
+VidSetScrollRegion(IN ULONG x1,
+ IN ULONG y1,
+ IN ULONG x2,
+ IN ULONG y2)
+{
+ // UNIMPLEMENTED
+}
+
+VOID NTAPI
+VidDisplayStringXY(IN PUCHAR String,
+ IN ULONG Left,
+ IN ULONG Top,
+ IN BOOLEAN Transparent)
+{
+ // UNIMPLEMENTED
+}
+
+ULONG NTAPI
+VidSetTextColor(IN ULONG Color)
+{
+ // UNIMPLEMENTED
+ return 0; // FIXME: Return old text color
+}
Modified: branches/olpc/drivers/base/bootvid/vid_vga.c
URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_vga.c?rev=27188&r1=27187&r2=27188&view=diff
==============================================================================
--- branches/olpc/drivers/base/bootvid/vid_vga.c (original)
+++ branches/olpc/drivers/base/bootvid/vid_vga.c Fri Jun 15 16:21:01 2007
@@ -499,6 +499,16 @@
{
}
+static VOID NTAPI
+VidVgaDisplayStringXY(
+ IN PUCHAR String,
+ IN ULONG Top,
+ IN ULONG Left,
+ IN BOOLEAN Transparent)
+{
+}
+
+
VID_FUNCTION_TABLE VidVgaTable =
{
VidVgaInitialize,
@@ -508,5 +518,6 @@
VidVgaScreenToBufferBlt,
VidVgaBitBlt,
VidVgaSolidColorFill,
- VidVgaDisplayString
+ VidVgaDisplayString,
+ VidVgaDisplayStringXY
};
Modified: branches/olpc/drivers/base/bootvid/vid_vgatext.c
URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_vgatext.c?rev=27188&r1=27187&r2=27188&view=diff
==============================================================================
--- branches/olpc/drivers/base/bootvid/vid_vgatext.c (original)
+++ branches/olpc/drivers/base/bootvid/vid_vgatext.c Fri Jun 15 16:21:01 2007
@@ -238,6 +238,16 @@
WRITE_PORT_UCHAR(CRTCDATA, (UCHAR)((offset >> 8) & 0xff));
}
+static VOID NTAPI
+VidVgaTextDisplayStringXY(
+ IN PUCHAR String,
+ IN ULONG Top,
+ IN ULONG Left,
+ IN BOOLEAN Transparent)
+{
+}
+
+
VID_FUNCTION_TABLE VidVgaTextTable = {
VidVgaTextInitialize,
VidVgaTextCleanUp,
@@ -246,5 +256,6 @@
VidVgaTextScreenToBufferBlt,
VidVgaTextBitBlt,
VidVgaTextSolidColorFill,
- VidVgaTextDisplayString
+ VidVgaTextDisplayString,
+ VidVgaTextDisplayStringXY
};
Modified: branches/olpc/drivers/base/bootvid/vid_xbox.c
URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_xbox.c?rev=27188&r1=27187&r2=27188&view=diff
==============================================================================
--- branches/olpc/drivers/base/bootvid/vid_xbox.c (original)
+++ branches/olpc/drivers/base/bootvid/vid_xbox.c Fri Jun 15 16:21:01 2007
@@ -89,6 +89,15 @@
{
}
+static VOID NTAPI
+VidXboxDisplayStringXY(
+ IN PUCHAR String,
+ IN ULONG Top,
+ IN ULONG Left,
+ IN BOOLEAN Transparent)
+{
+}
+
VID_FUNCTION_TABLE VidXboxTable = {
VidXboxInitialize,
VidXboxCleanUp,
@@ -97,5 +106,6 @@
VidXboxScreenToBufferBlt,
VidXboxBitBlt,
VidXboxSolidColorFill,
- VidXboxDisplayString
+ VidXboxDisplayString,
+ VidXboxDisplayStringXY
};
More information about the Ros-diffs
mailing list