Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 13755: Support for non-standard module base addresses
by chorns＠svn.reactos.com 26 Feb '05

26 Feb '05

Support for non-standard module base addresses Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/baseaddress.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-26 16:40:44 UTC (rev 13754) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-26 17:11:06 UTC (rev 13755) @@ -7,6 +7,8 @@ </xi:fallback> </xi:include> + <xi:include href="baseaddress.xml" /> + <define name="_M_IX86" /> <if property="DBG" value="1"> <define name="DBG" value="1" /> _____ Added: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-02-26 16:40:44 UTC (rev 13754) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-02-26 17:11:06 UTC (rev 13755) @@ -0,0 +1,89 @@ +<property name="BASEADDRESS_DINPUT8" value="0x00400000" /> +<property name="BASEADDRESS_DXDIAGN" value="0x00400000" /> +<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> +<property name="BASEADDRESS_SECURE32" value="0x10000000" /> +<property name="BASEADDRESS_DEVENUM" value="0x35680000" /> +<property name="BASEADDRESS_DSOUND" value="0x50000000" /> +<property name="BASEADDRESS_GLU32" value="0x50000000" /> +<property name="BASEADDRESS_OPENGL32" value="0x50000000" /> +<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> +<property name="BASEADDRESS_DINPUT" value="0x5F580000" /> +<property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> +<property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> +<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> +<property name="BASEADDRESS_MAIN" value="0x64F40000" /> +<property name="BASEADDRESS_INTL" value="0x64FB0000" /> +<property name="BASEADDRESS_DESK" value="0x65080000" /> +<property name="BASEADDRESS_APPWIZ" value="0x65100000" /> +<property name="BASEADDRESS_ACCESS" value="0x65180000" /> +<property name="BASEADDRESS_HID" value="0x688F0000" /> +<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> +<property name="BASEADDRESS_PSAPI" value="0x68f70000" /> +<property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> +<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> +<property name="BASEADDRESS_UNICODE" value="0x6b200000" /> +<property name="BASEADDRESS_DISPLAY" value="DISPLAY" /> +<property name="BASEADDRESS_CARDS" value="0x701a0000" /> +<property name="BASEADDRESS_WININET" value="0x70200000" /> +<property name="BASEADDRESS_ACLUI" value="0x71550000" /> +<property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> +<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> +<property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> +<property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> +<property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> +<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> +<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> +<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> +<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> +<property name="BASEADDRESS_LZEXPAND" value="0x73d80000" /> +<property name="BASEADDRESS_USERENV" value="0x74850000" /> +<property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> +<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> +<property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> +<property name="BASEADDRESS_CABINET" value="0x75120000" /> +<property name="BASEADDRESS_MSGINA" value="0x75970000" /> +<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> +<property name="BASEADDRESS_IMM32" value="0x75e60000" /> +<property name="BASEADDRESS_RPCRT4" value="0x76000000" /> +<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> +<property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> +<property name="BASEADDRESS_COMCTL32" value="0x76160000" /> +<property name="BASEADDRESS_COMDLG32" value="0x76200000" /> +<property name="BASEADDRESS_OLEAUT32" value="0x76260000" /> +<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> +<property name="BASEADDRESS_RICHEDIT" value="0x76340000" /> +<property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> +<property name="BASEADDRESS_LSASRV" value="0x76540000" /> +<property name="BASEADDRESS_MPR" value="0x76620000" /> +<property name="BASEADDRESS_ODBC32" value="0x76660000" /> +<property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> +<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> +<property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> +<property name="BASEADDRESS_FMIFS" value="0x76df0000" /> +<property name="BASEADDRESS_SHELL32" value="0x77260000" /> +<property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> +<property name="BASEADDRESS_MSACM" value="0x77400000" /> +<property name="BASEADDRESS_MMDRV" value="0x77500000" /> +<property name="BASEADDRESS_CRTDLL" value="0x77630000" /> +<property name="BASEADDRESS_PACKET" value="0x77780000" /> +<property name="BASEADDRESS_W2_32" value="0x77780000" /> +<property name="BASEADDRESS_MSAFD" value="0x777a0000" /> +<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> +<property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> +<property name="BASEADDRESS_WINMM" value="0x777c0000" /> +<property name="BASEADDRESS_WS2HELP" value="0x777c0000" /> +<property name="BASEADDRESS_WSHIRDA" value="0x777c0000" /> +<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> +<property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> +<property name="BASEADDRESS_OLE32" value="0x77a50000" /> +<property name="BASEADDRESS_OLEPRO32" value="0x77a50000" /> +<property name="BASEADDRESS_VERSION" value="0x77a90000" /> +<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> +<property name="BASEADDRESS_USER32" value="0x77e60000" /> +<property name="BASEADDRESS_GDI32" value="0x77ed0000" /> +<property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> +<property name="BASEADDRESS_MSVCRT" value="0x78000000" /> +<property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> +<property name="BASEADDRESS_EXPAT" value="0x79000000" /> +<property name="BASEADDRESS_KERNEL32" value="0x7C800000" /> +<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-26 16:40:44 UTC (rev 13754) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-02-26 17:11:06 UTC (rev 13755) @@ -1340,9 +1340,10 @@ string base_tmp = ros_junk + module.name + ".base.tmp"; string junk_tmp = ros_junk + module.name + ".junk.tmp"; string temp_exp = ros_junk + module.name + ".temp.exp"; - string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.GetBasePath ().c_str (), - module.entrypoint.c_str () ); + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateMacrosAndTargetsTarget ( module ); @@ -1466,8 +1467,9 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1523,8 +1525,9 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1576,8 +1579,9 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1633,8 +1637,9 @@ archiveFilename.c_str (), importLibraryDependencies.c_str () ); - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, "${gcc}", linkerParameters, @@ -1712,8 +1717,9 @@ else linker = "${gcc}"; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x10000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, linker, linkerParameters, @@ -1770,8 +1776,9 @@ else linker = "${gcc}"; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, linker, linkerParameters, @@ -1828,8 +1835,9 @@ else linker = "${gcc}"; - string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,0x00400000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", - module.entrypoint.c_str () ); + string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + module.entrypoint.c_str (), + module.baseaddress.c_str () ); GenerateLinkerCommand ( module, linker, linkerParameters, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-26 16:40:44 UTC (rev 13754) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-02-26 17:11:06 UTC (rev 13755) @@ -82,6 +82,12 @@ else entrypoint = GetDefaultModuleEntrypoint (); + att = moduleNode.GetAttribute ( "baseaddress", false ); + if ( att != NULL ) + baseaddress = att->value; + else + baseaddress = GetDefaultModuleBaseaddress (); + att = moduleNode.GetAttribute ( "mangledsymbols", false ); if ( att != NULL ) mangledSymbols = att->value != "false"; @@ -365,6 +371,39 @@ __LINE__ ); } +string +Module::GetDefaultModuleBaseaddress () const +{ + switch (type) + { + case Kernel: + return "0xc0000000"; + case KernelModeDLL: + return "0x10000"; + case NativeDLL: + return "0x10000"; + case NativeCUI: + return "0x10000"; + case Win32DLL: + return "0x10000"; + case Win32CUI: + return "0x00400000"; + case Win32GUI: + return "0x00400000"; + case KernelModeDriver: + return "0x10000"; + case BuildTool: + case StaticLibrary: + case ObjectLibrary: + case BootLoader: + case BootSector: + case Iso: + return ""; + } + throw InvalidOperationException ( __FILE__, + __LINE__ ); +} + bool Module::HasImportLibrary () const { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-26 16:40:44 UTC (rev 13754) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-02-26 17:11:06 UTC (rev 13755) @@ -122,6 +122,7 @@ std::string name; std::string extension; std::string entrypoint; + std::string baseaddress; std::string path; ModuleType type; ImportLibrary* importLibrary; @@ -157,6 +158,7 @@ private: std::string GetDefaultModuleExtension () const; std::string GetDefaultModuleEntrypoint () const; + std::string GetDefaultModuleBaseaddress () const; void ProcessXMLSubElement ( const XMLElement& e, const std::string& path, If* pIf = NULL ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-02-26 16:40:44 UTC (rev 13754) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-02-26 17:11:06 UTC (rev 13755) @@ -3,21 +3,16 @@ Building ReactOS ---------------- -To generate GNU make makefiles for building ReactOS do the following: +To generate GNU make makefiles and building ReactOS do the following: 1) Go to the top-level reactos directory - 2) Run the command: mingw32-make -C tools\reactos - 3) Run the command: tools\rbuild\rbuild mingw + 2) Run the command: mingw32-make -This will generate Makefile.auto in the current directory. Now run the following command: - - mingw32-make -f Makefile.auto - This will start building ReactOS. To build a bootable CD run the following command: - mingw32-make -f Makefile.auto bootcd + mingw32-make bootcd This will create ReactOS.iso in the top-level reactos directory. @@ -112,7 +107,7 @@ There can be zero or more modules per xml build file. Syntax: - <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" mangledsymbols="true"> + <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true"> ... </module> @@ -120,7 +115,8 @@ name - Name of the module. Also the base name of the generated file if such file is generated for the particular module type. type - Type of module. See below for an explanation of module types. extension - Extension of the generated file if such file is generated for the particular module type. - entrypoint - Entrypoint for the generated file if such file is generated for the particular module type. + entrypoint - Entrypoint symbol of the generated file if such file is generated for the particular module type. + baseaddress - Base address of the generated file if such file is generated for the particular module type. mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true. Value: @@ -133,18 +129,18 @@ Module types ------------ The module type determines the actions that is to be carried out to process the module. The defined module types are seen below: - buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint module attribute is not applicable for this module type. - staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint module attribute is not applicable for this module type. - objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint module attribute is not applicable for this module type. + buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. + staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. + objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. kernel - Builds ntoskrnl.exe. Default extension is .exe. Default entrypoint is _NtProcessStartup. kernelmodedll - Builds a kernel-mode DLL. Default extension is .dll. Default entrypoint is _DriverEntry@8. kernelmodedriver - Builds a kernel-mode driver. Default extension is .sys. Default entrypoint is _DriverEntry@8. nativedll - Builds a native DLL. Default extension is .dll. Default entrypoint is _DllMainCRTStartup@12. win32dll - Builds a Win32 DLL. Default extension is .dll. Default entrypoint is _DllMain@12. - win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup. - bootloader - Builds a bootloader. The extension and entrypoint module attributes are not applicable for this module type. - bootsector - Builds one or more bootsector binaries. The extension and entrypoint module attributes are not applicable for this module type. - iso - Builds a bootable CD. The extension and entrypoint module attributes are not applicable for this module type + win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup. The baseaddress module attribute is not applicable for this module type. + bootloader - Builds a bootloader. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. + bootsector - Builds one or more bootsector binaries. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. + iso - Builds a bootable CD. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type. Define element

1 0

[hbirr] 13754: Copied msiexec from the current trunk.
by hbirr＠svn.reactos.com 26 Feb '05

26 Feb '05

Copied msiexec from the current trunk. Added: branches/cache_manager_rewrite/reactos/subsys/system/msiexec/ _____ Copied: branches/cache_manager_rewrite/reactos/subsys/system/msiexec (from rev 13753, trunk/reactos/subsys/system/msiexec)

1 0

[hbirr] 13753:
by hbirr＠svn.reactos.com 26 Feb '05

26 Feb '05

Deleted: branches/cache_manager_rewrite/reactos/subsys/system/msiexec/

1 0

[ekohl] 13752: - Server stubs are void functions.
by ekohl＠svn.reactos.com 26 Feb '05

26 Feb '05

- Server stubs are void functions. - Fix a warning in the server stub descriptor. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-02-26 15:17:54 UTC (rev 13751) +++ trunk/reactos/tools/widl/ChangeLog 2005-02-26 15:54:27 UTC (rev 13752) @@ -1,5 +1,12 @@ ChangeLog +2005-02-26 ekohl + tools/widl/server.c + +Server stubs are void functions. +Fix a warning in the server stub descriptor. + + 2005-02-25 ekohl tools/widl/client.c tools/widl/header.c _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-02-26 15:17:54 UTC (rev 13751) +++ trunk/reactos/tools/widl/server.c 2005-02-26 15:54:27 UTC (rev 13752) @@ -366,8 +366,7 @@ } } - write_type(server, def->type, def, def->tname); - fprintf(server, " __RPC_STUB\n"); + fprintf(server, "void __RPC_STUB\n"); fprintf(server, "%s_", iface->name); write_name(server, def); fprintf(server, "(\n"); @@ -602,11 +601,11 @@ print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name); print_server("MIDL_user_allocate,\n"); print_server("MIDL_user_free,\n"); + print_server("{NULL},\n"); print_server("0,\n"); print_server("0,\n"); print_server("0,\n"); print_server("0,\n"); - print_server("0,\n"); print_server("__MIDL_TypeFormatString.Format,\n"); print_server("1, /* -error bounds_check flag */\n"); print_server("0x10001, /* Ndr library version */\n");

1 0

[ea] 13751: Multiuser Win32: empty server dll
by ea＠svn.reactos.com 26 Feb '05

26 Feb '05

Multiuser Win32: empty server dll Added: trunk/reactos/subsys/csrss/win32mu/ Added: trunk/reactos/subsys/csrss/win32mu/Makefile Added: trunk/reactos/subsys/csrss/win32mu/dllmain.c Added: trunk/reactos/subsys/csrss/win32mu/init.c Added: trunk/reactos/subsys/csrss/win32mu/w32mu.h Added: trunk/reactos/subsys/csrss/win32mu/win32mu.def Added: trunk/reactos/subsys/csrss/win32mu/win32mu.rc _____ Added: trunk/reactos/subsys/csrss/win32mu/Makefile --- trunk/reactos/subsys/csrss/win32mu/Makefile 2005-02-26 15:15:11 UTC (rev 13750) +++ trunk/reactos/subsys/csrss/win32mu/Makefile 2005-02-26 15:17:54 UTC (rev 13751) @@ -0,0 +1,28 @@ +# $Id: $ + +PATH_TO_TOP = ../../.. + +TARGET_TYPE = dynlink + +TARGET_NAME = win32mu + +TARGET_BASE = 0x5ffb0000 + +# require os code to explicitly request A/W version of structs/functions +TARGET_CFLAGS += -D__USE_W32API -D_DISABLE_TIDENTS -Wall -Werror -I../include + +TARGET_LFLAGS = -nostartfiles -nostdlib + +TARGET_SDKLIBS = ntdll.a kernel32.a user32.a gdi32.a + +TARGET_OBJECTS = dllmain.o init.o + +TARGET_ENTRY = _DllMain@12 + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk + +include $(TOOLS_PATH)/depend.mk _____ Added: trunk/reactos/subsys/csrss/win32mu/dllmain.c --- trunk/reactos/subsys/csrss/win32mu/dllmain.c 2005-02-26 15:15:11 UTC (rev 13750) +++ trunk/reactos/subsys/csrss/win32mu/dllmain.c 2005-02-26 15:17:54 UTC (rev 13751) @@ -0,0 +1,37 @@ +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: subsys/csrss/win32csr/dllmain.c + * PURPOSE: Initialization + */ + +/* INCLUDES ******************************************************************/ + +#include <windows.h> +#include "csrplugin.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS *******************************************************************/ + +HINSTANCE DllHandle = (HINSTANCE) 0; + +/* FUNCTIONS *****************************************************************/ + +BOOL STDCALL +DllMain(HANDLE hDll, + DWORD dwReason, + LPVOID lpReserved) +{ + if (DLL_PROCESS_ATTACH == dwReason) + { + DllHandle = hDll; + } + + return TRUE; +} + +/* EOF */ _____ Added: trunk/reactos/subsys/csrss/win32mu/init.c --- trunk/reactos/subsys/csrss/win32mu/init.c 2005-02-26 15:15:11 UTC (rev 13750) +++ trunk/reactos/subsys/csrss/win32mu/init.c 2005-02-26 15:17:54 UTC (rev 13751) @@ -0,0 +1,85 @@ +/* $Id: $ + * + * WIN32MU.DLL - init.c - Initialize the server DLL + * + * ReactOS Operating System + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.LIB. If not, write + * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, + * MA 02139, USA. + * + * -------------------------------------------------------------------- + */ +#define NTOS_MODE_USER +#include <ntos.h> + +#define NDEBUG +#include <debug.h> + +#include "w32mu.h" + +static NTSTATUS STDCALL +W32muLoadRemoteTerminalProxy (VOID) +{ + SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("W32MU: loading remote terminal device\n"); + + /* Load kernel mode module */ + RtlInitUnicodeString (& ImageInfo.ModuleName, + L"\\SystemRoot\\system32\\w32mut.sys"); + + Status = NtSetSystemInformation (SystemLoadAndCallImage, + & ImageInfo, + sizeof (SYSTEM_LOAD_AND_CALL_IMAGE)); + + DPRINT("W32MU: w32mut.sys loaded\n", Status); + if (!NT_SUCCESS(Status)) + { + DPRINT("W32MU: loading w32mut.sys failed (Status=0x%08lx)\n", Status); + return Status; + } + return Status; +} + +/* Public entry point for CSRSS.EXE to load us */ + +NTSTATUS STDCALL +ServerDllInitialization (int a0, int a1, int a2, int a3, int a4) +{ + NTSTATUS Status = STATUS_SUCCESS; + + /* TODO: + * 1) load a kernel mode module to make Kmode happy + * (it will provide keyoard, display and pointer + * devices for window stations not attached to + * the console); + */ + Status = W32muLoadRemoteTerminalProxy (); + /* + * 2) pick up from the registry the list of session + * access providers (SAP: Local, RFB, RDP, ICA, ...); + * 3) initialize each SAP; + * 4) on SAP events, provide: + * 4.1) create session (SESSION->new); + * 4.2) suspend session (SESSION->state_change); + * 4.3) destroy session (SESSION->delete). + */ + return Status; +} + +/* EOF */ _____ Added: trunk/reactos/subsys/csrss/win32mu/w32mu.h Added: trunk/reactos/subsys/csrss/win32mu/win32mu.def --- trunk/reactos/subsys/csrss/win32mu/win32mu.def 2005-02-26 15:15:11 UTC (rev 13750) +++ trunk/reactos/subsys/csrss/win32mu/win32mu.def 2005-02-26 15:17:54 UTC (rev 13751) @@ -0,0 +1,4 @@ +; $Id: $ +LIBRARY win32mu.dll +EXPORTS +ServerDllInitialization@20 _____ Added: trunk/reactos/subsys/csrss/win32mu/win32mu.rc --- trunk/reactos/subsys/csrss/win32mu/win32mu.rc 2005-02-26 15:15:11 UTC (rev 13750) +++ trunk/reactos/subsys/csrss/win32mu/win32mu.rc 2005-02-26 15:17:54 UTC (rev 13751) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 Multiuser Server\0" +#define REACTOS_STR_INTERNAL_NAME "win32mu\0" +#define REACTOS_STR_ORIGINAL_FILENAME "win32mu.dll\0" +#include <reactos/version.rc>

1 0

[hbirr] 13750: - Copy winebuild from the current trunk.
by hbirr＠svn.reactos.com 26 Feb '05

26 Feb '05

- Copy winebuild from the current trunk. Added: branches/cache_manager_rewrite/reactos/tools/winebuild/ _____ Copied: branches/cache_manager_rewrite/reactos/tools/winebuild (from rev 13749, trunk/reactos/tools/winebuild)

1 0

[hbirr] 13749:
by hbirr＠svn.reactos.com 26 Feb '05

26 Feb '05

Deleted: branches/cache_manager_rewrite/reactos/tools/winebuild/

1 0

[ea] 13748: CSR pre-init cleanup
by ea＠svn.reactos.com 26 Feb '05

26 Feb '05

CSR pre-init cleanup Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/csrss.c Modified: trunk/reactos/subsys/csrss/include/api.h Modified: trunk/reactos/subsys/csrss/init.c _____ Modified: trunk/reactos/subsys/csrss/api/wapi.c --- trunk/reactos/subsys/csrss/api/wapi.c 2005-02-25 21:22:05 UTC (rev 13747) +++ trunk/reactos/subsys/csrss/api/wapi.c 2005-02-26 15:06:19 UTC (rev 13748) @@ -2,7 +2,7 @@ * * reactos/subsys/csrss/api/wapi.c * - * Initialize the CSRSS subsystem server process. + * CSRSS port message processing * * ReactOS Operating System * @@ -147,14 +147,14 @@ /********************************************************************** * NAME - * Thread_Api + * ServerApiPortThread/1 * * DESCRIPTION * Handle connection requests from clients to the port * "\Windows\ApiPort". */ void STDCALL -ServerApiPortThead(PVOID PortHandle) +ServerApiPortThread (PVOID PortHandle) { NTSTATUS Status; LPC_MAX_MESSAGE Request; @@ -232,4 +232,51 @@ NtTerminateThread(NtCurrentThread(), Status); } +/********************************************************************** + * NAME + * ServerSbApiPortThread/1 + * + * DESCRIPTION + * Handle connection requests from SM to the port + * "\Windows\SbApiPort". + */ +VOID STDCALL +ServerSbApiPortThread (PVOID PortHandle) +{ + HANDLE hSbApiPortListen = (HANDLE) PortHandle; + HANDLE hConnectedPort = (HANDLE) 0; + LPC_MAX_MESSAGE Request = {{0}}; + NTSTATUS Status = STATUS_SUCCESS; + + while (TRUE) + { + Status = NtListenPort (hSbApiPortListen, & Request.Header); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtListenPort(SB) failed\n", __FUNCTION__); + break; + } + Status = NtAcceptConnectPort (& hConnectedPort, + hSbApiPortListen, + NULL, + TRUE, + NULL, + NULL); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtAcceptConnectPort() failed\n", __FUNCTION__); + break; + } + Status = NtCompleteConnectPort (hConnectedPort); + if(!NT_SUCCESS(Status)) + { + DPRINT1("CSR: %s: NtCompleteConnectPort() failed\n", __FUNCTION__); + break; + } + /* TODO: create thread for the connected port */ + } + NtClose (hSbApiPortListen); + NtTerminateThread (NtCurrentThread(), Status); +} + /* EOF */ _____ Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-02-25 21:22:05 UTC (rev 13747) +++ trunk/reactos/subsys/csrss/csrss.c 2005-02-26 15:06:19 UTC (rev 13748) @@ -38,42 +38,75 @@ #include "api.h" -/* Native process' entry point */ +#define NDEBUG +#include <debug.h> -VOID STDCALL NtProcessStartup(PPEB Peb) +#define CSRP_MAX_ARGUMENT_COUNT 512 + +typedef struct _COMMAND_LINE_ARGUMENT { - PRTL_USER_PROCESS_PARAMETERS ProcParams; - PWSTR ArgBuffer; - PWSTR *argv; - ULONG argc = 0; - int i = 0; - int afterlastspace = 0; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE CsrssInitEvent; - UNICODE_STRING UnicodeString; - NTSTATUS Status; + ULONG Count; + UNICODE_STRING Buffer; + PWSTR * Vector; - ProcParams = RtlNormalizeProcessParams (Peb->ProcessParameters); +} COMMAND_LINE_ARGUMENT, *PCOMMAND_LINE_ARGUMENT; - argv = (PWSTR *)RtlAllocateHeap (Peb->ProcessHeap, - 0, 512 * sizeof(PWSTR)); - ArgBuffer = (PWSTR)RtlAllocateHeap (Peb->ProcessHeap, - 0, - ProcParams->CommandLine.Length + sizeof(WCHAR)); - memcpy (ArgBuffer, - ProcParams->CommandLine.Buffer, - ProcParams->CommandLine.Length + sizeof(WCHAR)); +/********************************************************************** + * NAME PRIVATE + * CsrpParseCommandLine/3 + */ +static NTSTATUS STDCALL +CsrpParseCommandLine (HANDLE ProcessHeap, + PRTL_USER_PROCESS_PARAMETERS RtlProcessParameters, + PCOMMAND_LINE_ARGUMENT Argument) +{ + INT i = 0; + INT afterlastspace = 0; - while (ArgBuffer[i]) + + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlZeroMemory (Argument, sizeof (COMMAND_LINE_ARGUMENT)); + + Argument->Vector = (PWSTR *) RtlAllocateHeap (ProcessHeap, + 0, + (CSRP_MAX_ARGUMENT_COUNT * sizeof Argument->Vector[0])); + if(NULL == Argument->Vector) + { + DPRINT("CSR: %s: no memory for Argument->Vector\n", __FUNCTION__); + return STATUS_NO_MEMORY; + } + + Argument->Buffer.Length = + Argument->Buffer.MaximumLength = + RtlProcessParameters->CommandLine.Length + + sizeof Argument->Buffer.Buffer [0]; /* zero terminated */ + Argument->Buffer.Buffer = + (PWSTR) RtlAllocateHeap (ProcessHeap, + 0, + Argument->Buffer.MaximumLength); + if(NULL == Argument->Buffer.Buffer) + { + DPRINT("CSR: %s: no memory for Argument->Buffer.Buffer\n", __FUNCTION__); + return STATUS_NO_MEMORY; + } + + RtlCopyMemory (Argument->Buffer.Buffer, + RtlProcessParameters->CommandLine.Buffer, + RtlProcessParameters->CommandLine.Length); + + while (Argument->Buffer.Buffer [i]) { - if (ArgBuffer[i] == L' ') + if (Argument->Buffer.Buffer[i] == L' ') { - argc++; - ArgBuffer[i] = L'\0'; - argv[argc-1] = &(ArgBuffer[afterlastspace]); + Argument->Count ++; + Argument->Buffer.Buffer [i] = L'\0'; + Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); i++; - while (ArgBuffer[i] == L' ') + while (Argument->Buffer.Buffer [i] == L' ') + { i++; + } afterlastspace = i; } else @@ -82,56 +115,122 @@ } } - if (ArgBuffer[afterlastspace] != L'\0') + if (Argument->Buffer.Buffer [afterlastspace] != L'\0') { - argc++; - ArgBuffer[i] = L'\0'; - argv[argc-1] = &(ArgBuffer[afterlastspace]); + Argument->Count ++; + Argument->Buffer.Buffer [i] = L'\0'; + Argument->Vector [Argument->Count - 1] = & (Argument->Buffer.Buffer [afterlastspace]); } - - RtlRosInitUnicodeStringFromLiteral(&UnicodeString, + + return STATUS_SUCCESS; +} + +/********************************************************************** + * NAME PRIVATE + * CsrpFreeCommandLine/2 + */ + +static VOID STDCALL +CsrpFreeCommandLine (HANDLE ProcessHeap, + PCOMMAND_LINE_ARGUMENT Argument) +{ + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlFreeHeap (ProcessHeap, + 0, + Argument->Vector); + RtlFreeHeap (ProcessHeap, + 0, + Argument->Buffer.Buffer); +} + + +/********************************************************************** + * NAME PRIVATE + * CsrpOpenKeInitDoneEvent/0 + */ +static NTSTATUS STDCALL +CsrpOpenKeInitDoneEvent (PHANDLE CsrssInitEvent) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING EventName; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + RtlInitUnicodeString(& EventName, L"\\CsrssInitDone"); - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, - EVENT_ALL_ACCESS, - 0, - NULL); - Status = NtOpenEvent(&CsrssInitEvent, + InitializeObjectAttributes (& ObjectAttributes, + & EventName, + EVENT_ALL_ACCESS, + 0, + NULL); + return NtOpenEvent (CsrssInitEvent, EVENT_ALL_ACCESS, - &ObjectAttributes); + & ObjectAttributes); +} + +/* Native process' entry point */ + +VOID STDCALL NtProcessStartup(PPEB Peb) +{ + PRTL_USER_PROCESS_PARAMETERS RtlProcessParameters = NULL; + COMMAND_LINE_ARGUMENT CmdLineArg = {0}; + HANDLE CsrssInitEvent = (HANDLE) 0; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("CSR: %s\n", __FUNCTION__); + + RtlProcessParameters = RtlNormalizeProcessParams (Peb->ProcessParameters); + + /*================================================================== + * Parse the command line. + *================================================================*/ + Status = CsrpParseCommandLine (Peb->ProcessHeap, + RtlProcessParameters, + & CmdLineArg); + if(STATUS_SUCCESS != Status) + { + DbgPrint("CSR: CsrpParseCommandLine failed (Status=0x%08lx)\n", + Status); + } + /* + * Open the Ke notification event to notify we are OK after + * subsystem server initialization. + */ + Status = CsrpOpenKeInitDoneEvent(& CsrssInitEvent); if (!NT_SUCCESS(Status)) { - DbgPrint("CSR: Failed to open csrss notification event\n"); + DbgPrint("CSR: CsrpOpenKeInitDoneEvent failed (Status=0x%08lx)\n", + Status); } - if (CsrServerInitialization (argc, argv) == TRUE) + /*================================================================== + * Initialize the Win32 environment subsystem server. + *================================================================*/ + if (CsrServerInitialization (CmdLineArg.Count, CmdLineArg.Vector) == TRUE) { + /*============================================================= + * Tell Ke we are up and safe. If we fail to notify Ke, it will + * bugcheck the system with SESSION5_INITIALIZATION_FAILED. + * TODO: choose a better way to check user mode initialization + * is OK. + *===========================================================*/ + NtSetEvent (CsrssInitEvent, NULL); - NtSetEvent(CsrssInitEvent, - NULL); - - RtlFreeHeap (Peb->ProcessHeap, - 0, argv); - RtlFreeHeap (Peb->ProcessHeap, - 0, - ArgBuffer); - - /* terminate the current thread only */ - NtTerminateThread( NtCurrentThread(), 0 ); + CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); + /* + * Terminate the current thread only. + */ + NtTerminateThread (NtCurrentThread(), 0); } else { - DisplayString( L"CSR: Subsystem initialization failed.\n" ); + DisplayString (L"CSR: CsrServerInitialization failed.\n"); - RtlFreeHeap (Peb->ProcessHeap, - 0, argv); - RtlFreeHeap (Peb->ProcessHeap, - 0, - ArgBuffer); - + CsrpFreeCommandLine (Peb->ProcessHeap, & CmdLineArg); /* - * Tell SM we failed. + * Tell the SM we failed. */ - NtTerminateProcess( NtCurrentProcess(), 0 ); + NtTerminateProcess (NtCurrentProcess(), 0); } } _____ Modified: trunk/reactos/subsys/csrss/include/api.h --- trunk/reactos/subsys/csrss/include/api.h 2005-02-25 21:22:05 UTC (rev 13747) +++ trunk/reactos/subsys/csrss/include/api.h 2005-02-26 15:06:19 UTC (rev 13748) @@ -96,7 +96,8 @@ VOID FASTCALL CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_API_REQUEST Request, PCSRSS_API_REPLY Reply); -VOID STDCALL ServerApiPortThead(PVOID PortHandle); +VOID STDCALL ServerApiPortThread (PVOID PortHandle); +VOID STDCALL ServerSbApiPortThread (PVOID PortHandle); VOID Console_Api( DWORD Ignored ); extern HANDLE CsrssApiHeap; _____ Modified: trunk/reactos/subsys/csrss/init.c --- trunk/reactos/subsys/csrss/init.c 2005-02-25 21:22:05 UTC (rev 13747) +++ trunk/reactos/subsys/csrss/init.c 2005-02-26 15:06:19 UTC (rev 13748) @@ -335,7 +335,7 @@ 0, NULL, NULL, - (PTHREAD_START_ROUTINE)ServerApiPortThead, + (PTHREAD_START_ROUTINE)ServerApiPortThread, ApiPortHandle, NULL, NULL);

1 0

[chorns] 13747: Move to media directory
by chorns＠svn.reactos.com 25 Feb '05

25 Feb '05

Move to media directory Deleted: trunk/ReactOS Wallpapers.txt Added: trunk/reactos/media/wallpapers/ Added: trunk/reactos/media/wallpapers/wallpapers.txt _____ Deleted: trunk/ReactOS Wallpapers.txt --- trunk/ReactOS Wallpapers.txt 2005-02-25 21:21:53 UTC (rev 13746) +++ trunk/ReactOS Wallpapers.txt 2005-02-25 21:22:05 UTC (rev 13747) @@ -1,65 +0,0 @@ -ReactOS Wallpapers suggestion: - - - -ReactOS Wallpapers for Version 0.2.6: - -* ReactOS Wallpaper (original with new text; GNU GPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=92 - -* ReactOS Computer Wallpaper #1 (GNU GPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=98 - -* hill and water (BSD-license) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=88 - -* ReactOS wallpaper - 3d with holes (GNU LGPL) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=65 - -* ReactOS Wallpapers (Earth) - http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=36 - - - -GPL Wallpapers from kde-look.org: - -* Nature #1 (Fruit) - http://www.kde-look.org/content/files/16183-green.jpg - -* Nature #2 (Wood) - http://www.kde-look.org/content/files/10274-p1010076.jpg - -* Nature #3 (Sea) - http://arg0.net/users/vgough/images/2007-taupo.png - -* Nature #4 (Bees #1) - http://kdelook.org/content/files/16382-img_0511c1_xga.jpg - -* Nature #5 (Bees #2) - http://www.kde-look.org/content/files/16498-Beon.jpg - -* Nature #6 (Bees #3) - http://www.kde-look.org/content/files/6524-Bee%20in%20Flower.jpg - -* Nature #7 (Summer) - http://www.kde-look.org/content/files/20979-altabadia_summer_1200.jpg - - - -Some useful links: - -* GNOME-LOOK.ORG - http://www.gnome-look.org - -* KDE-LOOK.ORG - http://www.kde-look.org/ - -* Frik85's ReactOS Fanpage - http://frik85.reactos.at - (-> http://reactosde.re.funpic.de/mediagroup.php?sec=Graphic%20arts) - - - -History: - -2005-02-25 Klemens Friedl _____ Copied: trunk/reactos/media/wallpapers/wallpapers.txt (from rev 13745, trunk/ReactOS Wallpapers.txt)

1 0

[royce] 13746: fix NUL, move macros to the bootstrap makefile as necessary
by royce＠svn.reactos.com 25 Feb '05

25 Feb '05

fix NUL, move macros to the bootstrap makefile as necessary Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-25 20:53:00 UTC (rev 13745) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-25 21:21:53 UTC (rev 13746) @@ -1,27 +1,47 @@ +host_gcc = gcc +host_gpp = g++ +host_ld = ld +host_ar = ar +host_objcopy = objcopy ifeq ($(HOST),mingw32-linux) + EXEPREFIX = ./ EXEPOSTFIX = SEP = / - host_gcc = gcc - host_gpp = g++ nmkdir = mkdir -p - rm = rm + gcc = mingw32-gcc + gpp = mingw32-g++ + ld = mingw32-ld + ar = mingw32-ar + objcopy = mingw32-objcopy + dlltool = mingw32-dlltool + windres = mingw32-windres + rm = rm -f + NUL = /dev/null else # mingw32-windows + EXEPREFIX = EXEPOSTFIX = .exe SEP = \$(EMPTY_VAR) - host_gcc = gcc - host_gpp = g++ nmkdir = mkdir + gcc = gcc + gpp = g++ + ld = ld + ar = ar + objcopy = objcopy + dlltool = dlltool + windres = windres rm = del /f /q + NUL = NUL endif +.PHONY: all +.PHONY: clean + all: Makefile.auto ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) -else -$(ROS_INTERMEDIATE)tools: + ${nmkdir} $(ROS_INTERMEDIATE)tools endif - ${nmkdir} $(ROS_INTERMEDIATE)tools ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE): _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-02-25 20:53:00 UTC (rev 13745) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-02-25 21:21:53 UTC (rev 13746) @@ -80,7 +80,7 @@ " -I%s", includes[i]->directory.c_str() ); } - + for ( i = 0; i < defines.size(); i++ ) { Define& d = *defines[i]; @@ -138,7 +138,7 @@ rIf.includes, rIf.defines, rIf.ifs ); - fprintf ( + fprintf ( fMakefile, "endif\n\n" ); } @@ -162,37 +162,7 @@ void MingwBackend::GenerateGlobalVariables () const { - fprintf ( fMakefile, "EXEPREFIX = " EXEPREFIX "\n" ); - fprintf ( fMakefile, "EXEPOSTFIX = " EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "SEP = " SSEP "$(EMPTY_VAR)\n" ); - fprintf ( fMakefile, "host_gcc = gcc\n" ); - fprintf ( fMakefile, "host_gpp = g++\n" ); - fprintf ( fMakefile, "host_ld = ld\n" ); - fprintf ( fMakefile, "host_ar = ar\n" ); - fprintf ( fMakefile, "host_objcopy = objcopy\n" ); -#ifdef WIN32 - fprintf ( fMakefile, "nmkdir = mkdir\n" ); - fprintf ( fMakefile, "rm = del /f /q\n" ); - fprintf ( fMakefile, "gcc = gcc\n" ); - fprintf ( fMakefile, "gpp = g++\n" ); - fprintf ( fMakefile, "ld = ld\n" ); - fprintf ( fMakefile, "ar = ar\n" ); - fprintf ( fMakefile, "objcopy = objcopy\n" ); - fprintf ( fMakefile, "dlltool = dlltool\n" ); - fprintf ( fMakefile, "windres = windres\n" ); -#else - fprintf ( fMakefile, "nmkdir = mkdir -p\n" ); - fprintf ( fMakefile, "rm = rm -f\n" ); - fprintf ( fMakefile, "gcc = mingw32-gcc\n" ); - fprintf ( fMakefile, "gpp = mingw32-g++\n" ); - fprintf ( fMakefile, "ld = mingw32-ld\n" ); - fprintf ( fMakefile, "ar = mingw32-ar\n" ); - fprintf ( fMakefile, "objcopy = mingw32-objcopy\n" ); - fprintf ( fMakefile, "dlltool = mingw32-dlltool\n" ); - fprintf ( fMakefile, "windres = mingw32-windres\n" ); -#endif fprintf ( fMakefile, "mkdir = tools" SSEP "rmkdir" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "NUL=NUL\n" ); fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "cabman = tools" SSEP "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); @@ -208,8 +178,6 @@ fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "\n" ); - - fprintf ( fMakefile, ".PHONY: clean\n\n" ); } bool @@ -257,7 +225,7 @@ } return dependencies; } - + void MingwBackend::GenerateInitTarget () const {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs