mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 13:45:58 +00:00
Remove ExportDriver concept.
If you want a driver which exports some functions, simply set it as kernelmodedriver and add a .def file svn path=/trunk/; revision=28043
This commit is contained in:
parent
1c474e61da
commit
7855dd896f
|
@ -1,4 +1,4 @@
|
|||
<module name="ks" type="exportdriver" installbase="system32/drivers" installname="ks.sys" allowwarnings="true">
|
||||
<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys" allowwarnings="true">
|
||||
<include base="ks">.</include>
|
||||
<include base="ks">..</include>
|
||||
<include base="ks">../include</include>
|
||||
|
@ -7,7 +7,7 @@
|
|||
<define name="__USE_W32API" />
|
||||
<define name="BUILDING_KS" />
|
||||
<define name="_NTDDK_" />
|
||||
<define name="_COMDDK_" />
|
||||
<define name="_COMDDK_" />
|
||||
<file>ks.rc</file>
|
||||
<file>allocators.c</file>
|
||||
<file>clocks.c</file>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="ndis" type="exportdriver" installbase="system32/drivers" installname="ndis.sys">
|
||||
<module name="ndis" type="kernelmodedriver" installbase="system32/drivers" installname="ndis.sys">
|
||||
<importlibrary definition="ndis.def"></importlibrary>
|
||||
<include base="ndis">include</include>
|
||||
<define name="NDIS_WRAPPER" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="tcpip" type="exportdriver" installbase="system32/drivers" installname="tcpip.sys">
|
||||
<module name="tcpip" type="kernelmodedriver" installbase="system32/drivers" installname="tcpip.sys">
|
||||
<importlibrary definition="tcpip.def"></importlibrary>
|
||||
<include base="tcpip">include</include>
|
||||
<include base="oskittcp">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="tdi" type="exportdriver" installbase="system32/drivers" installname="tdi.sys">
|
||||
<module name="tdi" type="kernelmodedriver" installbase="system32/drivers" installname="tdi.sys">
|
||||
<importlibrary definition="misc/tdi.def"></importlibrary>
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntoskrnl</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys">
|
||||
<module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys">
|
||||
<bootstrap base="$(CDOUTPUT)" />
|
||||
<define name="__USE_W32API" />
|
||||
<importlibrary definition="class2.def" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="pciidex" type="exportdriver" installbase="system32/drivers" installname="pciidex.sys">
|
||||
<module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys">
|
||||
<importlibrary definition="pciidex.def" />
|
||||
<define name="__USE_W32API" />
|
||||
<library>ntoskrnl</library>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="diskdump" type="exportdriver" installbase="system32/drivers" installname="diskdump.sys">
|
||||
<module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
|
||||
<bootstrap base="$(CDOUTPUT)" />
|
||||
<define name="__USE_W32API" />
|
||||
<include base="ReactOS">include/reactos/drivers</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="scsiport" type="exportdriver" installbase="system32/drivers" installname="scsiport.sys">
|
||||
<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
|
||||
<bootstrap base="$(CDOUTPUT)" />
|
||||
<define name="__USE_W32API" />
|
||||
<define name="_SCSIPORT_" />
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="videoprt" type="exportdriver" installbase="system32/drivers" installname="videoprt.sys">
|
||||
<module name="videoprt" type="kernelmodedriver" installbase="system32/drivers" installname="videoprt.sys">
|
||||
<importlibrary definition="videoprt.def" />
|
||||
<include base="videoprt">.</include>
|
||||
<include base="ntoskrnl">include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="drmk" type="exportdriver" installbase="system32/drivers" installname="drmk.sys" allowwarnings="true">
|
||||
<module name="drmk" type="kernelmodedriver" installbase="system32/drivers" installname="drmk.sys" allowwarnings="true">
|
||||
<include base="drmk">.</include>
|
||||
<include base="drmk">..</include>
|
||||
<include base="drmk">../include</include>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<module name="wmilib" type="exportdriver" installbase="system32/drivers" installname="wmilib.sys">
|
||||
<module name="wmilib" type="kernelmodedriver" installbase="system32/drivers" installname="wmilib.sys">
|
||||
<importlibrary definition="wmilib.def" />
|
||||
<include base="wmilib">.</include>
|
||||
<library>ntoskrnl</library>
|
||||
|
|
|
@ -160,7 +160,7 @@
|
|||
<file>xpstubs.c</file>
|
||||
</directory>
|
||||
</module>
|
||||
<module name="win32k" type="exportdriver" installbase="system32" installname="win32k.sys" allowwarnings="true">
|
||||
<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" allowwarnings="true">
|
||||
<importlibrary definition="win32k.def" />
|
||||
<library>win32k_base</library>
|
||||
<library>pseh</library>
|
||||
|
|
|
@ -226,7 +226,6 @@ MingwModuleHandler::InstanciateHandler (
|
|||
handler = new MingwWin32OCXModuleHandler ( module );
|
||||
break;
|
||||
case KernelModeDriver:
|
||||
case ExportDriver: // maybe change this later
|
||||
handler = new MingwKernelModeDriverModuleHandler ( module );
|
||||
break;
|
||||
case BootLoader:
|
||||
|
@ -1626,7 +1625,19 @@ MingwModuleHandler::GenerateLinkerCommand (
|
|||
fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
|
||||
string targetName ( module.GetTargetName () );
|
||||
|
||||
if ( module.IsDLL () )
|
||||
if ( !module.IsDLL () )
|
||||
{
|
||||
fprintf ( fMakefile,
|
||||
"\t%s %s %s -o %s %s %s %s\n",
|
||||
linker.c_str (),
|
||||
linkerParameters.c_str (),
|
||||
linkerScriptArgument.c_str (),
|
||||
target.c_str (),
|
||||
objectsMacro.c_str (),
|
||||
libsMacro.c_str (),
|
||||
GetLinkerMacro ().c_str () );
|
||||
}
|
||||
else if ( module.HasImportLibrary () )
|
||||
{
|
||||
string temp_exp = ros_temp + module.name + ".temp.exp";
|
||||
CLEAN_FILE ( temp_exp );
|
||||
|
@ -1661,6 +1672,12 @@ MingwModuleHandler::GenerateLinkerCommand (
|
|||
}
|
||||
else
|
||||
{
|
||||
/* XXX: need to workaround binutils bug, which exports
|
||||
* all functions in a dll if no .def file or an empty
|
||||
* one has been provided... */
|
||||
/* See bug 1244 */
|
||||
//printf ( "%s will have all its functions exported\n",
|
||||
// module.GetTargetName ().c_str () );
|
||||
fprintf ( fMakefile,
|
||||
"\t%s %s %s -o %s %s %s %s\n",
|
||||
linker.c_str (),
|
||||
|
@ -1670,12 +1687,6 @@ MingwModuleHandler::GenerateLinkerCommand (
|
|||
objectsMacro.c_str (),
|
||||
libsMacro.c_str (),
|
||||
GetLinkerMacro ().c_str () );
|
||||
|
||||
#if 0 // causes crashes sometimes
|
||||
fprintf ( fMakefile,
|
||||
"\t${objcopy} -R .edata %s\n",
|
||||
target.c_str () );
|
||||
#endif
|
||||
}
|
||||
|
||||
GenerateBuildMapCode ();
|
||||
|
|
|
@ -43,7 +43,6 @@ Bootstrap::IsSupportedModuleType ( ModuleType type )
|
|||
{
|
||||
case Kernel:
|
||||
case KernelModeDLL:
|
||||
case ExportDriver:
|
||||
case NativeDLL:
|
||||
case NativeCUI:
|
||||
case Win32DLL:
|
||||
|
|
|
@ -805,8 +805,6 @@ Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
|
|||
return Kernel;
|
||||
if ( attribute.value == "kernelmodedll" )
|
||||
return KernelModeDLL;
|
||||
if ( attribute.value == "exportdriver" )
|
||||
return ExportDriver;
|
||||
if ( attribute.value == "kernelmodedriver" )
|
||||
return KernelModeDriver;
|
||||
if ( attribute.value == "nativedll" )
|
||||
|
@ -881,7 +879,6 @@ Module::GetDefaultModuleExtension () const
|
|||
return ".ocx";
|
||||
case KernelModeDriver:
|
||||
case BootLoader:
|
||||
case ExportDriver:
|
||||
return ".sys";
|
||||
case BootSector:
|
||||
return ".o";
|
||||
|
@ -916,7 +913,6 @@ Module::GetDefaultModuleEntrypoint () const
|
|||
return "NtProcessStartup";
|
||||
case KernelModeDLL:
|
||||
case KernelModeDriver:
|
||||
case ExportDriver:
|
||||
return "DriverEntry@8";
|
||||
case NativeDLL:
|
||||
return "DllMainCRTStartup@12";
|
||||
|
@ -978,7 +974,6 @@ Module::GetDefaultModuleBaseaddress () const
|
|||
return "0x00400000";
|
||||
case KernelModeDLL:
|
||||
case KernelModeDriver:
|
||||
case ExportDriver:
|
||||
return "0x00010000";
|
||||
case BuildTool:
|
||||
case StaticLibrary:
|
||||
|
@ -1014,12 +1009,11 @@ Module::IsDLL () const
|
|||
{
|
||||
case Kernel:
|
||||
case KernelModeDLL:
|
||||
case ExportDriver:
|
||||
case NativeDLL:
|
||||
case Win32DLL:
|
||||
case Win32OCX:
|
||||
return true;
|
||||
case KernelModeDriver:
|
||||
return true;
|
||||
case NativeCUI:
|
||||
case Win32CUI:
|
||||
case Test:
|
||||
|
@ -1053,7 +1047,6 @@ Module::GenerateInOutputTree () const
|
|||
{
|
||||
case Kernel:
|
||||
case KernelModeDLL:
|
||||
case ExportDriver:
|
||||
case NativeDLL:
|
||||
case Win32DLL:
|
||||
case Win32OCX:
|
||||
|
@ -1547,11 +1540,10 @@ AutoRegister::IsSupportedModuleType ( ModuleType type )
|
|||
switch ( type )
|
||||
{
|
||||
case Win32DLL:
|
||||
case Win32OCX:
|
||||
case Win32OCX:
|
||||
return true;
|
||||
case Kernel:
|
||||
case KernelModeDLL:
|
||||
case ExportDriver:
|
||||
case NativeDLL:
|
||||
case NativeCUI:
|
||||
case Win32CUI:
|
||||
|
|
|
@ -270,7 +270,6 @@ enum ModuleType
|
|||
Alias = 19,
|
||||
BootProgram = 20,
|
||||
Win32SCR = 21,
|
||||
ExportDriver = 22,
|
||||
IdlHeader = 23,
|
||||
IsoRegTest = 24,
|
||||
LiveIsoRegTest = 25,
|
||||
|
@ -322,7 +321,7 @@ public:
|
|||
bool allowWarnings;
|
||||
bool enabled;
|
||||
bool useHostStdlib;
|
||||
bool isStartupLib;
|
||||
bool isStartupLib;
|
||||
|
||||
Module ( const Project& project,
|
||||
const XMLElement& moduleNode,
|
||||
|
@ -346,7 +345,7 @@ public:
|
|||
void InvokeModule () const;
|
||||
void ProcessXML ();
|
||||
void GetSourceFilenames ( string_list& list,
|
||||
bool includeGeneratedFiles ) const;
|
||||
bool includeGeneratedFiles ) const;
|
||||
private:
|
||||
std::string GetDefaultModuleExtension () const;
|
||||
std::string GetDefaultModuleEntrypoint () const;
|
||||
|
|
Loading…
Reference in a new issue