From 617e618fda50a2ee3261bc5a0c7099935d11e4e2 Mon Sep 17 00:00:00 2001 From: Robert Dickenson Date: Wed, 1 Jan 2003 11:11:49 +0000 Subject: [PATCH] Minor mods. svn path=/trunk/; revision=3911 --- reactos/apps/utils/ps/ps.cpp | 13 ++++++++++-- reactos/drivers/lib/bzip2/Makefile | 21 ++++++++++++++++-- reactos/drivers/lib/zlib/Makefile | 4 +++- reactos/install.bat | 34 ++++++++++++++++++------------ reactos/installwine.bat | 3 ++- 5 files changed, 55 insertions(+), 20 deletions(-) diff --git a/reactos/apps/utils/ps/ps.cpp b/reactos/apps/utils/ps/ps.cpp index 568b053d870..59ed31f2048 100644 --- a/reactos/apps/utils/ps/ps.cpp +++ b/reactos/apps/utils/ps/ps.cpp @@ -4,7 +4,7 @@ static char* title = " PID PARENT TIME NAME\n"; char buf[256]; -void main() +int main() { HANDLE stdout = GetStdHandle(STD_OUTPUT_HANDLE); @@ -39,4 +39,13 @@ void main() } while( Process32Next(pl,&pe)); CloseHandle(pl); -} \ No newline at end of file +} +/* +WINBOOL +STDCALL +FileTimeToDosDateTime( + CONST FILETIME *lpFileTime, + LPWORD lpFatDate, + LPWORD lpFatTime + ); + */ diff --git a/reactos/drivers/lib/bzip2/Makefile b/reactos/drivers/lib/bzip2/Makefile index c933adbc8a5..f9c85b8ed3a 100644 --- a/reactos/drivers/lib/bzip2/Makefile +++ b/reactos/drivers/lib/bzip2/Makefile @@ -1,18 +1,35 @@ +# $Id: Makefile,v 1.4 2003/01/01 11:11:48 robd Exp $ + PATH_TO_TOP = ../../.. + TARGET_TYPE = export_driver + TARGET_NAME = unbzip2 + TARGET_NORC = yes -TARGET_CFLAGS=-Wall -Winline -Os -fomit-frame-pointer -fno-strength-reduce -DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY $(BIGFILES) -g +TARGET_CFLAGS = \ + -Wall -Winline -Os -fomit-frame-pointer -fno-strength-reduce \ + -DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY $(BIGFILES) -g -TARGET_OBJECTS = bzlib.o randtable.o crctable.o decompress.o huffman.o dllmain.o +TARGET_OBJECTS = \ + bzlib.o \ + randtable.o \ + crctable.o \ + decompress.o \ + huffman.o \ + dllmain.o TARGET_GCCLIBS = gcc include $(PATH_TO_TOP)/rules.mak + include $(TOOLS_PATH)/helper.mk test.exe: test.o ../../dk/w32/lib/unbzip2.a $(CC) -s -Os -o test.exe test.o ../../dk/w32/lib/unbzip2.a + test.o: test.c $(CC) -s -Os -c test.c + +# EOF diff --git a/reactos/drivers/lib/zlib/Makefile b/reactos/drivers/lib/zlib/Makefile index 3f7415b8e66..ade75234ba0 100644 --- a/reactos/drivers/lib/zlib/Makefile +++ b/reactos/drivers/lib/zlib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 2002/08/17 01:42:01 dwelch Exp $ +# $Id: Makefile,v 1.6 2003/01/01 11:11:48 robd Exp $ PATH_TO_TOP = ../../.. @@ -6,6 +6,8 @@ TARGET_TYPE = library TARGET_NAME = zlib +TARGET_NORC = yes + TARGET_CFLAGS = \ -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes diff --git a/reactos/install.bat b/reactos/install.bat index f99bad9484f..171ec0ee3a9 100644 --- a/reactos/install.bat +++ b/reactos/install.bat @@ -39,6 +39,8 @@ copy drivers\bus\acpi\acpi.sys %ROS_INSTALL%\system32\drivers copy drivers\bus\isapnp\isapnp.sys %ROS_INSTALL%\system32\drivers copy drivers\bus\pci\pci.sys %ROS_INSTALL%\system32\drivers copy drivers\dd\floppy\floppy.sys %ROS_INSTALL%\system32\drivers +copy drivers\lib\bzip2\unbzip2.sys %ROS_INSTALL%\system32\drivers +copy drivers\lib\zlib\zlib.a %ROS_INSTALL%\system32 copy drivers\input\keyboard\keyboard.sys %ROS_INSTALL%\system32\drivers copy drivers\input\mouclass\mouclass.sys %ROS_INSTALL%\system32\drivers copy drivers\input\psaux\psaux.sys %ROS_INSTALL%\system32\drivers @@ -55,6 +57,7 @@ copy drivers\net\dd\ne2000\ne2000.sys %ROS_INSTALL%\system32\drivers copy drivers\net\dd\miniport\nscirda\nscirda.sys %ROS_INSTALL%\system32\drivers copy drivers\net\ndis\ndis.sys %ROS_INSTALL%\system32\drivers copy drivers\net\packet\packet.sys %ROS_INSTALL%\system32\drivers +copy drivers\net\tdi\tdi.sys %ROS_INSTALL%\system32\drivers copy drivers\net\tcpip\tcpip.sys %ROS_INSTALL%\system32\drivers copy drivers\net\wshtcpip\wshtcpip.dll %ROS_INSTALL%\system32 copy drivers\storage\atapi\atapi.sys %ROS_INSTALL%\system32\drivers @@ -84,6 +87,7 @@ copy lib\secur32\secur32.dll %ROS_INSTALL%\system32 copy lib\shell32\roshel32.dll %ROS_INSTALL%\system32 copy lib\snmpapi\snmpapi.dll %ROS_INSTALL%\system32 copy lib\user32\user32.dll %ROS_INSTALL%\system32 +copy lib\version\version.dll %ROS_INSTALL%\system32 copy lib\winmm\winmm.dll %ROS_INSTALL%\system32 copy lib\ws2_32\ws2_32.dll %ROS_INSTALL%\system32 copy lib\ws2help\ws2help.dll %ROS_INSTALL%\system32 @@ -91,7 +95,9 @@ copy lib\wshirda\wshirda.dll %ROS_INSTALL%\system32 copy lib\wsock32\wsock32.dll %ROS_INSTALL%\system32 copy subsys\smss\smss.exe %ROS_INSTALL%\system32 copy subsys\csrss\csrss.exe %ROS_INSTALL%\system32 +copy subsys\ntvdm\ntvdm.exe %ROS_INSTALL%\system32 copy subsys\win32k\win32k.sys %ROS_INSTALL%\system32\drivers +copy subsys\system\usetup\usetup.exe %ROS_INSTALL%\system32 copy apps\utils\cat\cat.exe %ROS_INSTALL%\bin copy apps\utils\partinfo\partinfo.exe %ROS_INSTALL%\bin copy apps\utils\objdir\objdir.exe %ROS_INSTALL%\bin @@ -111,26 +117,26 @@ copy apps\tests\event\event.exe %ROS_INSTALL%\bin copy apps\tests\file\file.exe %ROS_INSTALL%\bin copy apps\tests\pteb\pteb.exe %ROS_INSTALL%\bin copy apps\tests\consume\consume.exe %ROS_INSTALL%\bin -copy apps\tests\vmtest\vmtest.exe %ROS_INSTALL%\bin -copy apps\tests\gditest\gditest.exe %ROS_INSTALL%\bin -copy apps\tests\dibtest\dibtest.exe %ROS_INSTALL%\bin -copy apps\tests\mstest\msserver.exe %ROS_INSTALL%\bin -copy apps\tests\mstest\msclient.exe %ROS_INSTALL%\bin -copy apps\tests\nptest\npserver.exe %ROS_INSTALL%\bin -copy apps\tests\nptest\npclient.exe %ROS_INSTALL%\bin -copy apps\tests\atomtest\atomtest.exe %ROS_INSTALL%\bin +copy apps\tests\vmtest\vmtest.exe %ROS_INSTALL_TESTS% +copy apps\tests\gditest\gditest.exe %ROS_INSTALL_TESTS% +copy apps\tests\dibtest\dibtest.exe %ROS_INSTALL_TESTS% +copy apps\tests\mstest\msserver.exe %ROS_INSTALL_TESTS% +copy apps\tests\mstest\msclient.exe %ROS_INSTALL_TESTS% +copy apps\tests\nptest\npserver.exe %ROS_INSTALL_TESTS% +copy apps\tests\nptest\npclient.exe %ROS_INSTALL_TESTS% +copy apps\tests\atomtest\atomtest.exe %ROS_INSTALL_TESTS% copy apps\tests\mutex\mutex.exe %ROS_INSTALL%\bin copy apps\tests\winhello\winhello.exe %ROS_INSTALL%\bin -copy apps\tests\sectest\sectest.exe %ROS_INSTALL%\bin -copy apps\tests\isotest\isotest.exe %ROS_INSTALL%\bin -copy apps\tests\regtest\regtest.exe %ROS_INSTALL%\bin -copy apps\tests\restest\restest.exe %ROS_INSTALL%\bin -copy apps\tests\tokentest\tokentest.exe %ROS_INSTALL%\bin +copy apps\tests\sectest\sectest.exe %ROS_INSTALL_TESTS% +copy apps\tests\isotest\isotest.exe %ROS_INSTALL_TESTS% +copy apps\tests\regtest\regtest.exe %ROS_INSTALL_TESTS% +copy apps\tests\restest\restest.exe %ROS_INSTALL_TESTS% +copy apps\tests\tokentest\tokentest.exe %ROS_INSTALL_TESTS% copy apps\testsets\msvcrt\fileio\fileio.exe %ROS_INSTALL_TESTS% copy apps\testsets\msvcrt\mbtowc\mbtowc.exe %ROS_INSTALL_TESTS% copy apps\testsets\test\test.exe %ROS_INSTALL_TESTS% copy apps\testsets\testperl\testperl.exe %ROS_INSTALL_TESTS% copy media\fonts\helb____.ttf %ROS_INSTALL%\media\fonts copy media\fonts\timr____.ttf %ROS_INSTALL%\media\fonts -copy media\nls\*.nls %ROS_INSTALL%\system32 +rem copy media\nls\*.nls %ROS_INSTALL%\system32 copy ntoskrnl\ntoskrnl.map %ROS_INSTALL%\symbols diff --git a/reactos/installwine.bat b/reactos/installwine.bat index da6bf9b2f2a..d811f281631 100644 --- a/reactos/installwine.bat +++ b/reactos/installwine.bat @@ -30,6 +30,7 @@ copy ..\wine\dlls\dplayx\dplayx.dll %WINE_INSTALL% copy ..\wine\dlls\mapi32\mapi32.dll %WINE_INSTALL% copy ..\wine\dlls\mpr\mpr.dll %WINE_INSTALL% copy ..\wine\dlls\netapi32\netapi32.dll %WINE_INSTALL% +copy ..\wine\dlls\odbc32\odbc32.dll %WINE_INSTALL% copy ..\wine\dlls\ole32\ole32.dll %WINE_INSTALL% copy ..\wine\dlls\oleaut32\oleaut32.dll %WINE_INSTALL% copy ..\wine\dlls\olecli\olecli32.dll %WINE_INSTALL% @@ -46,7 +47,7 @@ copy ..\wine\dlls\shfolder\shfolder.dll %WINE_INSTALL% copy ..\wine\dlls\shlwapi\shlwapi.dll %WINE_INSTALL% copy ..\wine\dlls\tapi32\tapi32.dll %WINE_INSTALL% copy ..\wine\dlls\urlmon\urlmon.dll %WINE_INSTALL% -copy ..\wine\dlls\version\version.dll %WINE_INSTALL% +REMcopy ..\wine\dlls\version\version.dll %WINE_INSTALL% copy ..\wine\dlls\wintrust\wintrust.dll %WINE_INSTALL% copy ..\wine\dlls\winspool\winspool.drv %WINE_INSTALL% REM