[tkreuzer] 34775: merge 34755 from trunk

Author: tkreuzer
Date: Fri Jul 25 07:28:50 2008
New Revision: 34775

URL: http://svn.reactos.org/svn/reactos?rev=34775&view=rev
Log:
merge 34755 from trunk

Added:
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.spec   (with props)
Removed:
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def
Modified:
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild

Modified: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Fri Jul 25 07:28:50 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll">
-	<importlibrary definition="bootvid_$(ARCH).def"></importlibrary>
+	<importlibrary definition="bootvid.spec.def"></importlibrary>
    <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
    <include base="bootvid">.</include>
    <library>ntoskrnl</library>
@@ -20,5 +20,6 @@
    	</directory>
    </if>
    <file>bootvid.rc</file>
+	<file>bootvid.spec</file>
    <pch>precomp.h</pch>
 </module>

Added: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.spec
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.spec (added)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.spec [iso-8859-1] Fri Jul 25 07:28:50 2008
@@ -1,0 +1,11 @@
+@ stdcall VidBitBlt(ptr long long)
+@ stdcall VidBufferToScreenBlt(ptr long long long long long)
+@ stdcall VidCleanUp()
+@ stdcall VidDisplayString(str)
+@ stdcall VidDisplayStringXY(str long long long)
+@ stdcall VidInitialize(long)
+@ stdcall VidResetDisplay(long)
+@ stdcall VidScreenToBufferBlt(ptr long long long long long)
+@ stdcall VidSetScrollRegion(long long long long)
+@ stdcall VidSetTextColor(long)
+@ stdcall VidSolidColorFill(long long long long long)

Propchange: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def (removed)
@@ -1,15 +1,0 @@
-LIBRARY BOOTVID.DLL
-
-EXPORTS
-VidBitBlt
-VidBufferToScreenBlt
-VidCleanUp
-VidDisplayString
-VidDisplayStringXY
-VidInitialize
-VidResetDisplay
-VidScreenToBufferBlt
-VidSetScrollRegion
-VidSetTextColor
-VidSolidColorFill
-

Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def (removed)
@@ -1,15 +1,0 @@
-LIBRARY BOOTVID.DLL
-
-EXPORTS
-VidBitBlt
-VidBufferToScreenBlt
-VidCleanUp
-VidDisplayString
-VidDisplayStringXY
-VidInitialize
-VidResetDisplay
-VidScreenToBufferBlt
-VidSetScrollRegion
-VidSetTextColor
-VidSolidColorFill
-

Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def (removed)
@@ -1,15 +1,0 @@
-LIBRARY BOOTVID.DLL
-
-EXPORTS
-VidBitBlt@12
-VidBufferToScreenBlt@24
-VidCleanUp@0
-VidDisplayString@4
-VidDisplayStringXY
-VidInitialize@4
-VidResetDisplay@4
-VidScreenToBufferBlt@24
-VidSetScrollRegion@16
-VidSetTextColor@4
-VidSolidColorFill@20
-