Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 73: fixed security issues - fixes bug 1307
by gedmurphy＠svn.reactos.org 03 Feb '06

03 Feb '06

fixed security issues - fixes bug 1307 fixed unicode over network issues Modified: trunk/reactos/base/services/tcpsvcs/chargen.c Modified: trunk/reactos/base/services/tcpsvcs/daytime.c Modified: trunk/reactos/base/services/tcpsvcs/discard.c Modified: trunk/reactos/base/services/tcpsvcs/echo.c Modified: trunk/reactos/base/services/tcpsvcs/qotd.c Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.h _____ Modified: trunk/reactos/base/services/tcpsvcs/chargen.c --- trunk/reactos/base/services/tcpsvcs/chargen.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/chargen.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/chargen.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "tcpsvcs.h" @@ -30,7 +30,7 @@ LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE); RetVal = 1; } - + LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); @@ -73,8 +73,8 @@ charIndex++; } - Line[LINESIZ - 2] = L'\r'; - Line[LINESIZ - 1] = L'\n'; + Line[LINESIZ - 2] = '\r'; + Line[LINESIZ - 1] = '\n'; if (! SendLine(Sock, Line)) break; @@ -82,14 +82,14 @@ /* increment loop index to start printing from next char in ring */ loopIndex++; } - + if (bShutDown) return FALSE; else return TRUE; } -BOOL SendLine(SOCKET Sock, TCHAR* Line) +BOOL SendLine(SOCKET Sock, char* Line) { INT RetVal; INT SentBytes; _____ Modified: trunk/reactos/base/services/tcpsvcs/daytime.c --- trunk/reactos/base/services/tcpsvcs/daytime.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/daytime.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/daytime.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "tcpsvcs.h" @@ -13,14 +13,14 @@ { struct tm *newtime; time_t aclock; - TCHAR *pszTime; + CHAR *pszTime; DWORD RetVal = 0; SOCKET Sock = (SOCKET)Sock_; - + time(&aclock); newtime = localtime(&aclock); - pszTime = _tasctime(newtime); - + pszTime = asctime(newtime); + SendTime(Sock, pszTime); LogEvent(_T("DayTime: Shutting connection down...\n"), 0, FALSE); @@ -31,17 +31,17 @@ LogEvent(_T("DayTime: Connection shutdown failed\n"), 0, FALSE); RetVal = 1; } - + LogEvent(_T("DayTime: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } -BOOL SendTime(SOCKET Sock, TCHAR *time) +BOOL SendTime(SOCKET Sock, CHAR *time) { - INT StringSize = (INT)_tcsclen(time); - INT RetVal = send(Sock, time, sizeof(TCHAR) * StringSize, 0); - + INT StringSize = (INT)strlen(time); + INT RetVal = send(Sock, time, sizeof(CHAR) * StringSize, 0); + if (RetVal == SOCKET_ERROR) return FALSE; _____ Modified: trunk/reactos/base/services/tcpsvcs/discard.c --- trunk/reactos/base/services/tcpsvcs/discard.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/discard.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/discard.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "tcpsvcs.h" @@ -30,7 +30,7 @@ LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE); RetVal = 1; } - + LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } @@ -39,7 +39,7 @@ BOOL RecieveIncomingPackets(SOCKET Sock) { - TCHAR ReadBuffer[BUF]; + char ReadBuffer[BUF]; TCHAR buf[256]; INT ReadBytes; @@ -53,7 +53,7 @@ } else if (ReadBytes == SOCKET_ERROR) { - _stprintf(buf, ("Socket Error: %d\n"), WSAGetLastError()); + _stprintf(buf, _T("Socket Error: %d\n"), WSAGetLastError()); LogEvent(buf, 0, TRUE); return FALSE; } _____ Modified: trunk/reactos/base/services/tcpsvcs/echo.c --- trunk/reactos/base/services/tcpsvcs/echo.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/echo.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/echo.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "tcpsvcs.h" @@ -22,7 +22,7 @@ } LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE); - + if (ShutdownConnection(Sock, TRUE)) LogEvent(_T("Echo: Connection is down\n"), 0, FALSE); else @@ -30,7 +30,7 @@ LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE); RetVal = 1; } - + LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE); ExitThread(RetVal); } @@ -39,7 +39,7 @@ BOOL EchoIncomingPackets(SOCKET Sock) { - TCHAR ReadBuffer[BUF]; + char ReadBuffer[BUF]; TCHAR buf[256]; // temp for holding LogEvent text INT Temp; INT ReadBytes; _____ Modified: trunk/reactos/base/services/tcpsvcs/qotd.c --- trunk/reactos/base/services/tcpsvcs/qotd.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/qotd.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,21 +4,21 @@ * FILE: /base/services/tcpsvcs/qotd.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "tcpsvcs.h" -#define QBUFSIZ 160 +#define QBUFSIZ 60 -LPCTSTR FilePath = _T("\\drivers\\etc\\quotes"); +LPCTSTR FilePath = _T("\\drivers\\etc\\quotes"); /* 19 chars */ DWORD WINAPI QotdHandler(VOID* Sock_) { FILE *fp; SOCKET Sock; - TCHAR Sys[MAX_PATH]; - TCHAR Quote[60][BUFSIZ]; // need to set this dynamically + TCHAR Sys[MAX_PATH + 20]; + char Quote[QBUFSIZ][BUFSIZ]; // need to set this dynamically INT QuoteToPrint; INT NumQuotes; @@ -29,15 +29,15 @@ LogEvent(_T("QOTD: Getting system path failed.\n"), 0, TRUE); ExitThread(1); } - - _tcscat(Sys, FilePath); + _tcsncat(Sys, FilePath, _tcslen(FilePath)); + LogEvent(_T("QOTD: Opening quotes file\n"), 0, FALSE); - if ((fp = _tfopen(Sys, "r")) == NULL) + if ((fp = _tfopen(Sys, _T("r"))) == NULL) { - TCHAR buf[256]; + TCHAR buf[320]; - _stprintf(buf, _T("QOTD: Error opening quote file : %s\n"), Sys); + _sntprintf(buf, 320, _T("QOTD: Error opening quote file : %s\n"), Sys); LogEvent(buf, 0, TRUE); LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(1); @@ -45,7 +45,8 @@ /* read all quotes in the file into an array */ NumQuotes = 0; - while (_fgetts(Quote[NumQuotes], QBUFSIZ, fp) != NULL) + while ((fgets(Quote[NumQuotes], QBUFSIZ, fp) != NULL) && + (NumQuotes != QBUFSIZ)) NumQuotes++; LogEvent(_T("QOTD: Closing quotes file\n"), 0, FALSE); @@ -68,21 +69,20 @@ LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(1); } - + LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE); ExitThread(0); - //return Retval; } -BOOL SendQuote(SOCKET Sock, TCHAR* Quote) +BOOL SendQuote(SOCKET Sock, char* Quote) { INT StringSize; INT RetVal; - StringSize = (INT)_tcsclen(Quote); - RetVal = send(Sock, Quote, sizeof(TCHAR) * StringSize, 0); + StringSize = (INT)strlen(Quote); + RetVal = send(Sock, Quote, sizeof(char) * StringSize, 0); if (RetVal == SOCKET_ERROR) return FALSE; _____ Modified: trunk/reactos/base/services/tcpsvcs/skelserver.c --- trunk/reactos/base/services/tcpsvcs/skelserver.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/skelserver.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/skelserver.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "tcpsvcs.h" @@ -24,7 +24,7 @@ ListeningSocket = SetUpListener(htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { - LogEvent("Socket error when setting up listener\n", 0, TRUE); + LogEvent(_T("Socket error when setting up listener\n"), 0, TRUE); return 3; } @@ -131,7 +131,7 @@ } WaitForSingleObject(hThread, INFINITE); - + CloseHandle(hThread); } else _____ Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/tcpsvcs.c * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ /* * TODO: @@ -31,7 +31,7 @@ BOOL bShutDown = FALSE; BOOL bPause = FALSE; -LPCTSTR LogFileName = "\\tcpsvcs_log.log"; +LPCTSTR LogFileName = _T("\\tcpsvcs_log.log"); LPTSTR ServiceName = _T("Simp Tcp"); //LPTSTR DisplayName = _T("Simple TCP/IP Services"); @@ -69,19 +69,19 @@ VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]) { - TCHAR LogFilePath[MAX_PATH]; + TCHAR LogFilePath[MAX_PATH + 17]; if(! GetSystemDirectory(LogFilePath, MAX_PATH)) return; - _tcscat(LogFilePath, LogFileName); + _tcsncat(LogFilePath, LogFileName, 17); - hLogFile = fopen(LogFilePath, _T("a+")); + hLogFile = _tfopen(LogFilePath, _T("a+")); if (hLogFile == NULL) { - TCHAR buf[50]; + TCHAR buf[300]; - _stprintf(buf, _T("Could not open log file: %s\n"), LogFilePath); + _sntprintf(buf, 300, _T("Could not open log file: %s\n"), LogFilePath); MessageBox(NULL, buf, NULL, MB_OK); return; } @@ -120,7 +120,7 @@ UpdateStatus (SERVICE_STOPPED, 0); LogEvent(_T("Service status set to SERVICE_STOPPED\n"), 0, FALSE); LogEvent(_T("Leaving ServiceMain\n"), 0, FALSE); - + fclose(hLogFile); return; @@ -232,10 +232,10 @@ { CloseHandle(hThread[i]); } - + LogEvent(_T("Detaching Winsock2...\n"), 0, FALSE); WSACleanup(); - + return 0; } @@ -247,7 +247,7 @@ { DWORD eMsgLen, ErrNum = GetLastError (); LPTSTR lpvSysMsg; - TCHAR MessageBuffer[512]; + TCHAR MessageBuffer[1024]; @@ -258,16 +258,16 @@ ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpvSysMsg, 0, NULL); - _stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %d."), + _sntprintf(MessageBuffer, 1024, _T("%s %s ErrNum = %lu. ExitCode = %d."), UserMessage, lpvSysMsg, ErrNum, ExitCode); HeapFree(GetProcessHeap (), 0, lpvSysMsg); } else { - _stprintf(MessageBuffer, _T("%s"), UserMessage); + _sntprintf(MessageBuffer, 1024, _T("%s"), UserMessage); } - fputs (MessageBuffer, hLogFile); + _fputts(MessageBuffer, hLogFile); if (ExitCode != 0) ExitProcess(ExitCode); _____ Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.h --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.h 2006-02-02 20:20:51 UTC (rev 72) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.h 2006-02-03 17:36:44 UTC (rev 73) @@ -4,7 +4,7 @@ * FILE: /base/services/tcpsvcs/tcpsvcs.h * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include <stdio.h> @@ -12,9 +12,6 @@ #include <tchar.h> #include <time.h> -#define UNICODE -#define _UNICODE - /* default port numbers */ #define ECHO_PORT 7 #define DISCARD_PORT 9 @@ -63,11 +60,11 @@ /* chargen functions */ DWORD WINAPI ChargenHandler(VOID* Sock_); BOOL GenerateChars(SOCKET Sock); -BOOL SendLine(SOCKET Sock, TCHAR* Line); +BOOL SendLine(SOCKET Sock, char* Line); /* daytime functions */ DWORD WINAPI DaytimeHandler(VOID* Sock_); -BOOL SendTime(SOCKET Sock, TCHAR *time); +BOOL SendTime(SOCKET Sock, char *time); /* echo functions */ DWORD WINAPI EchoHandler(VOID* Sock_); @@ -79,4 +76,4 @@ /* qotd functions */ DWORD WINAPI QotdHandler(VOID* Sock_); -BOOL SendQuote(SOCKET Sock, TCHAR* Quote); +BOOL SendQuote(SOCKET Sock, char* Quote);

1 0

[martinf] 72: convert *.rbuild files into valid XML files by inserting XML headers and a <rbuild> root nodes
by martinf＠svn.reactos.org 02 Feb '06

02 Feb '06

convert *.rbuild files into valid XML files by inserting XML headers and a <rbuild> root nodes Modified: trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/ibrowser/ibrowser.rbuild Modified: trunk/reactos/base/applications/network/arp/arp.rbuild Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild Modified: trunk/reactos/base/applications/network/netstat/netstat.rbuild Modified: trunk/reactos/base/applications/network/tracert/tracert.rbuild Modified: trunk/reactos/base/applications/winefile/winefile.rbuild Modified: trunk/reactos/base/base.rbuild Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild Modified: trunk/reactos/base/shell/shell.rbuild Modified: trunk/reactos/base/system/msconfig/msconfig.rbuild Modified: trunk/reactos/base/system/sc/sc.rbuild Modified: trunk/reactos/base/system/servman/servman.rbuild Modified: trunk/reactos/base/system/system.rbuild Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/boot/boot.rbuild Modified: trunk/reactos/boot/bootcd/bootcd.rbuild Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild Modified: trunk/reactos/boot/freeldr/freeldr.rbuild Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/drivers/base/null/null.rbuild Modified: trunk/reactos/lib/directory.rbuild Modified: trunk/reactos/lib/inflib/inflib.rbuild Modified: trunk/reactos/lib/rossym/rossym.rbuild Modified: trunk/reactos/subsystems/subsystems.rbuild _____ Modified: trunk/reactos/ReactOS-ppc.rbuild --- trunk/reactos/ReactOS-ppc.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/ReactOS-ppc.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,88 +1,88 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config-ppc.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> + <xi:include href="config-ppc.rbuild"> + <xi:fallback> + <xi:include href="config.template.rbuild" /> + </xi:fallback> + </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="baseaddress.rbuild" /> - <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> - <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> - <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" /> - <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" /> + <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> + <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> + <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" /> + <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" /> - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="_REACTOS_" /> - <define name="__MINGW_IMPORT" empty="true" /> - <define name="__restrict__" empty="true" /> - <compilerflag>-v</compilerflag> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <compilerflag>-Wpointer-arith</compilerflag> + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> + <define name="_REACTOS_" /> + <define name="__MINGW_IMPORT" empty="true" /> + <define name="__restrict__" empty="true" /> + <compilerflag>-v</compilerflag> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Wpointer-arith</compilerflag> - <include>.</include> - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>w32api/include</include> - <include>w32api/include/crt</include> - <include>w32api/include/ddk</include> + <include>.</include> + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>include/ndk</include> + <include>w32api/include</include> + <include>w32api/include/crt</include> + <include>w32api/include/ddk</include> - <directory name="apps"> - <xi:include href="apps/directory.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/directory.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/directory.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/directory.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/directory.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.rbuild" /> - </directory> - <directory name="services"> - <xi:include href="services/directory.rbuild" /> - </directory> - <directory name="subsys"> - <xi:include href="subsys/directory.rbuild" /> - </directory> + <directory name="apps"> + <xi:include href="apps/directory.rbuild" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/directory.rbuild" /> + </directory> + <directory name="hal"> + <xi:include href="hal/directory.rbuild" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.rbuild" /> + </directory> + <directory name="media"> + <xi:include href="media/directory.rbuild" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="services/directory.rbuild" /> + </directory> + <directory name="subsys"> + <xi:include href="subsys/directory.rbuild" /> + </directory> </project> _____ Modified: trunk/reactos/ReactOS.rbuild --- trunk/reactos/ReactOS.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/ReactOS.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,94 +1,94 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> + <xi:include href="config.rbuild"> + <xi:fallback> + <xi:include href="config.template.rbuild" /> + </xi:fallback> + </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="baseaddress.rbuild" /> - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> + <define name="_M_IX86" /> + <define name="_X86_" /> + <define name="__i386__" /> + <define name="_REACTOS_" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> - <include>.</include> - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>w32api/include</include> - <include>w32api/include/crt</include> - <include>w32api/include/ddk</include> + <include>.</include> + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>include/ndk</include> + <include>w32api/include</include> + <include>w32api/include/crt</include> + <include>w32api/include/ddk</include>  - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory>  - <directory name="lib"> - <xi:include href="lib/directory.rbuild" /> - </directory> + <directory name="lib"> + <xi:include href="lib/directory.rbuild" /> + </directory>  - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> + <directory name="subsystems"> + <xi:include href="subsystems/subsystems.rbuild" /> + </directory> </project> _____ Modified: trunk/reactos/base/applications/applications.rbuild --- trunk/reactos/base/applications/applications.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/applications.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,16 +1,19 @@ -<group> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <group>  -</group> + </group> +</rbuild> _____ Modified: trunk/reactos/base/applications/ibrowser/ibrowser.rbuild --- trunk/reactos/base/applications/ibrowser/ibrowser.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/ibrowser/ibrowser.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,31 +1,34 @@ -<module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true"> - <linkerflag>-fexceptions</linkerflag> - <include base="ibrowser">.</include> - <include base="ReactOS">include/expat</include> - <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="WIN32" /> - <define name="_ROS_" /> - <define name="_WIN32_IE">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="WINVER">0x0500</define> - <library>uuid</library> - <library>kernel32</library> - <library>gdi32</library> - <library>comctl32</library> - <library>ole32</library> - <library>oleaut32</library> - <library>shell32</library> - <library>expat</library> - <pch>precomp.h</pch> - <directory name="utility"> - <file>utility.cpp</file> - <file>window.cpp</file> - <file>xmlstorage.cpp</file> - </directory> - <file>ibrowser.cpp</file> - <file>favorites.cpp</file> - <file>mainframe.cpp</file> - <file>webchild.cpp</file> - <file>ibrowser.rc</file> -</module> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true"> + <linkerflag>-fexceptions</linkerflag> + <include base="ibrowser">.</include> + <include base="ReactOS">include/expat</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="WIN32" /> + <define name="_ROS_" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0500</define> + <library>uuid</library> + <library>kernel32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>shell32</library> + <library>expat</library> + <pch>precomp.h</pch> + <directory name="utility"> + <file>utility.cpp</file> + <file>window.cpp</file> + <file>xmlstorage.cpp</file> + </directory> + <file>ibrowser.cpp</file> + <file>favorites.cpp</file> + <file>mainframe.cpp</file> + <file>webchild.cpp</file> + <file>ibrowser.rc</file> + </module> +</rbuild> _____ Modified: trunk/reactos/base/applications/network/arp/arp.rbuild --- trunk/reactos/base/applications/network/arp/arp.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/network/arp/arp.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,11 +1,13 @@ -<module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> - <include base="arp">.</include> - <define name="__USE_W32API" /> - <library>kernel32</library> - <library>iphlpapi</library> - <library>ws2_32</library> - <library>shlwapi</library> - <file>arp.c</file> - <file>arp.rc</file> -</module> - +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="arp" type="win32cui" installbase="system32" installname="arp.exe"> + <include base="arp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>iphlpapi</library> + <library>ws2_32</library> + <library>shlwapi</library> + <file>arp.c</file> + <file>arp.rc</file> + </module> +</rbuild> _____ Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,4 +1,6 @@ -<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true"> <include base="ipconfig">.</include> <define name="__USE_W32API" /> <library>kernel32</library> @@ -6,4 +8,5 @@ <library>iphlpapi</library> <file>ipconfig.c</file> <file>ipconfig.rc</file> -</module> + </module> +</rbuild> _____ Modified: trunk/reactos/base/applications/network/netstat/netstat.rbuild --- trunk/reactos/base/applications/network/netstat/netstat.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/network/netstat/netstat.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,4 +1,6 @@ -<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true"> <include base="netstat">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> @@ -10,4 +12,5 @@ <library>iphlpapi</library> <file>netstat.c</file> <file>netstat.rc</file> -</module> + </module> +</rbuild> _____ Modified: trunk/reactos/base/applications/network/tracert/tracert.rbuild --- trunk/reactos/base/applications/network/tracert/tracert.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/network/tracert/tracert.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,11 +1,14 @@ -<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe"> - <include base="tracert">.</include> - <define name="__USE_W32API" /> - <define name="__USE_W32_SOCKETS" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>ws2_32</library> - <file>tracert.c</file> - <file>tracert.rc</file> -</module> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe"> + <include base="tracert">.</include> + <define name="__USE_W32API" /> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <file>tracert.c</file> + <file>tracert.rc</file> + </module> +</rbuild> _____ Modified: trunk/reactos/base/applications/winefile/winefile.rbuild --- trunk/reactos/base/applications/winefile/winefile.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/applications/winefile/winefile.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,19 +1,22 @@ -<module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" allowwarnings="true"> - <include base="winefile">.</include> - <define name="UNICODE" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <library>uuid</library> - <library>kernel32</library> - <library>gdi32</library> - <library>user32</library> - <library>comctl32</library> - <library>comdlg32</library> - <library>shell32</library> - <library>ole32</library> - <library>version</library> - <library>mpr</library> - <file>winefile.c</file> - <file>winefile.rc</file> -</module> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="winefile" type="win32gui" installbase="system32" installname="winefile.exe" allowwarnings="true"> + <include base="winefile">.</include> + <define name="UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>uuid</library> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>comdlg32</library> + <library>shell32</library> + <library>ole32</library> + <library>version</library> + <library>mpr</library> + <file>winefile.c</file> + <file>winefile.rc</file> + </module> +</rbuild> _____ Modified: trunk/reactos/base/base.rbuild --- trunk/reactos/base/base.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/base.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,19 +1,22 @@ -<group> -<directory name="applications"> - <xi:include href="applications/applications.rbuild" /> -</directory> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <group> + <directory name="applications"> + <xi:include href="applications/applications.rbuild" /> + </directory>  -<directory name="shell"> - <xi:include href="shell/shell.rbuild" /> -</directory> -<directory name="system"> - <xi:include href="system/system.rbuild" /> -</directory> -</group> + <directory name="shell"> + <xi:include href="shell/shell.rbuild" /> + </directory> + <directory name="system"> + <xi:include href="system/system.rbuild" /> + </directory> + </group> +</rbuild> _____ Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,4 +1,6 @@ -<module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe"> <include base="arp">.</include> <define name="__USE_W32API" /> <library>kernel32</library> @@ -14,4 +16,5 @@ <file>chargen.c</file> <file>tcpsvcs.rc</file> <pch>tcpsvcs.h</pch> -</module> + </module> +</rbuild> _____ Modified: trunk/reactos/base/shell/explorer/explorer.rbuild --- trunk/reactos/base/shell/explorer/explorer.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/shell/explorer/explorer.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,74 +1,77 @@ -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> - <linkerflag>-luuid</linkerflag> - <linkerflag>-lstdc++</linkerflag> - <linkerflag>-fexceptions</linkerflag> - <include base="explorer">.</include> - <define name="__USE_W32API" /> - <define name="UNICODE" /> - <define name="WIN32" /> - <define name="_ROS_" /> - <define name="_WIN32_IE">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="WINVER">0x0500</define> - <define name="__WINDRES__" /> - <library>kernel32</library> - <library>gdi32</library> - <library>user32</library> - <library>ws2_32</library> - <library>msimg32</library> - <library>comctl32</library> - <library>ole32</library> - <library>oleaut32</library> - <library>shell32</library> - <library>expat</library> - <library>notifyhook</library> - <pch>precomp.h</pch> - <directory name="desktop"> - <file>desktop.cpp</file> - </directory> - <directory name="dialogs"> - <file>searchprogram.cpp</file> - <file>settings.cpp</file> - </directory> - <directory name="shell"> - <file>entries.cpp</file> - <file>fatfs.cpp</file> - <file>filechild.cpp</file> - <file>shellfs.cpp</file> - <file>mainframe.cpp</file> - <file>ntobjfs.cpp</file> - <file>pane.cpp</file> - <file>regfs.cpp</file> - <file>shellbrowser.cpp</file> - <file>unixfs.cpp</file> - <file>webchild.cpp</file> - <file>winfs.cpp</file> - </directory> - <directory name="services"> - <file>shellservices.cpp</file> - <file>startup.c</file> - </directory> - <directory name="taskbar"> - <file>desktopbar.cpp</file> - <file>favorites.cpp</file> - <file>taskbar.cpp</file> - <file>startmenu.cpp</file> - <file>traynotify.cpp</file> - <file>quicklaunch.cpp</file> - </directory> - <directory name="utility"> - <file>shellclasses.cpp</file> - <file>utility.cpp</file> - <file>window.cpp</file> - <file>dragdropimpl.cpp</file> - <file>shellbrowserimpl.cpp</file> - <file>xmlstorage.cpp</file> - </directory> - <file>explorer.cpp</file> - <file>i386-stub-win32.c</file> - <file>explorer.rc</file> -</module> -<installfile base=".">explorer-cfg-template.xml</installfile> -<directory name="notifyhook"> - <xi:include href="notifyhook/notifyhook.rbuild" /> -</directory> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> + <linkerflag>-luuid</linkerflag> + <linkerflag>-lstdc++</linkerflag> + <linkerflag>-fexceptions</linkerflag> + <include base="explorer">.</include> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="WIN32" /> + <define name="_ROS_" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x0500</define> + <define name="__WINDRES__" /> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <library>ws2_32</library> + <library>msimg32</library> + <library>comctl32</library> + <library>ole32</library> + <library>oleaut32</library> + <library>shell32</library> + <library>expat</library> + <library>notifyhook</library> + <pch>precomp.h</pch> + <directory name="desktop"> + <file>desktop.cpp</file> + </directory> + <directory name="dialogs"> + <file>searchprogram.cpp</file> + <file>settings.cpp</file> + </directory> + <directory name="shell"> + <file>entries.cpp</file> + <file>fatfs.cpp</file> + <file>filechild.cpp</file> + <file>shellfs.cpp</file> + <file>mainframe.cpp</file> + <file>ntobjfs.cpp</file> + <file>pane.cpp</file> + <file>regfs.cpp</file> + <file>shellbrowser.cpp</file> + <file>unixfs.cpp</file> + <file>webchild.cpp</file> + <file>winfs.cpp</file> + </directory> + <directory name="services"> + <file>shellservices.cpp</file> + <file>startup.c</file> + </directory> + <directory name="taskbar"> + <file>desktopbar.cpp</file> + <file>favorites.cpp</file> + <file>taskbar.cpp</file> + <file>startmenu.cpp</file> + <file>traynotify.cpp</file> + <file>quicklaunch.cpp</file> + </directory> + <directory name="utility"> + <file>shellclasses.cpp</file> + <file>utility.cpp</file> + <file>window.cpp</file> + <file>dragdropimpl.cpp</file> + <file>shellbrowserimpl.cpp</file> + <file>xmlstorage.cpp</file> + </directory> + <file>explorer.cpp</file> + <file>i386-stub-win32.c</file> + <file>explorer.rc</file> + </module> + <installfile base=".">explorer-cfg-template.xml</installfile> + <directory name="notifyhook"> + <xi:include href="notifyhook/notifyhook.rbuild" /> + </directory> +</rbuild> _____ Modified: trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild --- trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/shell/explorer/notifyhook/notifyhook.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,10 +1,13 @@ -<module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}" installbase="system32" installname="notifyhook.dll"> - <importlibrary definition="notifyhook.def" /> - <include base="notifyhook">.</include> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x0600</define> - <define name="_NOTIFYHOOK_IMPL" /> - <library>kernel32</library> - <file>notifyhook.c</file> - <file>notifyhook.rc</file> -</module> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}" installbase="system32" installname="notifyhook.dll"> + <importlibrary definition="notifyhook.def" /> + <include base="notifyhook">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_NOTIFYHOOK_IMPL" /> + <library>kernel32</library> + <file>notifyhook.c</file> + <file>notifyhook.rc</file> + </module> +</rbuild> _____ Modified: trunk/reactos/base/shell/shell.rbuild --- trunk/reactos/base/shell/shell.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/shell/shell.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,10 +1,13 @@ -<group> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <group>  -</group> + </group> +</rbuild> _____ Modified: trunk/reactos/base/system/msconfig/msconfig.rbuild --- trunk/reactos/base/system/msconfig/msconfig.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/system/msconfig/msconfig.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,26 +1,29 @@ -<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> - <include base="msconfig">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>advapi32</library> - <library>version</library> - <library>comctl32</library> - <library>shell32</library> - <compilationunit name="unit.c"> - <file>toolspage.c</file> - <file>srvpage.c</file> - <file>systempage.c</file> - <file>startuppage.c</file> - <file>freeldrpage.c</file> - <file>generalpage.c</file> - <file>msconfig.c</file> - </compilationunit> - <file>msconfig.rc</file> - <pch>precomp.h</pch> -</module> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> + <include base="msconfig">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>version</library> + <library>comctl32</library> + <library>shell32</library> + <compilationunit name="unit.c"> + <file>toolspage.c</file> + <file>srvpage.c</file> + <file>systempage.c</file> + <file>startuppage.c</file> + <file>freeldrpage.c</file> + <file>generalpage.c</file> + <file>msconfig.c</file> + </compilationunit> + <file>msconfig.rc</file> + <pch>precomp.h</pch> + </module> +</rbuild> _____ Modified: trunk/reactos/base/system/sc/sc.rbuild --- trunk/reactos/base/system/sc/sc.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/system/sc/sc.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,17 +1,20 @@ -<module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> - <define name="__USE_W32API" /> - <define name="DEFINE_GUID" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <library>kernel32</library> - <library>advapi32</library> - <file>sc.c</file> - <file>start.c</file> - <file>query.c</file> - <file>control.c</file> - <file>create.c</file> - <file>delete.c</file> - <file>usage.c</file> - <file>sc.rc</file> - <pch>sc.h</pch> -</module> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> + <define name="__USE_W32API" /> + <define name="DEFINE_GUID" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>kernel32</library> + <library>advapi32</library> + <file>sc.c</file> + <file>start.c</file> + <file>query.c</file> + <file>control.c</file> + <file>create.c</file> + <file>delete.c</file> + <file>usage.c</file> + <file>sc.rc</file> + <pch>sc.h</pch> + </module> +</rbuild> _____ Modified: trunk/reactos/base/system/servman/servman.rbuild --- trunk/reactos/base/system/servman/servman.rbuild 2006-02-01 22:07:06 UTC (rev 71) +++ trunk/reactos/base/system/servman/servman.rbuild 2006-02-02 20:20:51 UTC (rev 72) @@ -1,30 +1,33 @@ -<module name="servman" type="win32gui" installbase="system32" installname="servman.exe"> - <include base="servman">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <library>kernel32</library> - <library>user32</library> - <library>advapi32</library> - <library>version</library> - <library>comctl32</library> - <library>shell32</library> - <library>comdlg32</library> - <compilationunit name="unit.c"> - <file>about.c</file> - <file>control.c</file> - <file>create.c</file> [truncated at 1000 lines; 638 more skipped]

1 0

[gedmurphy] 71: fix writing to file
by gedmurphy＠svn.reactos.org 01 Feb '06

01 Feb '06

fix writing to file Modified: trunk/reactos/base/system/servman/export.c _____ Modified: trunk/reactos/base/system/servman/export.c --- trunk/reactos/base/system/servman/export.c 2006-02-01 19:41:17 UTC (rev 70) +++ trunk/reactos/base/system/servman/export.c 2006-02-01 22:07:06 UTC (rev 71) @@ -53,11 +53,11 @@ dwTextLength = GetTextFromListView(LVText, i, k); if (LVText != NULL) { - WriteFile(hFile, LVText, dwTextLength, &dwWritten, NULL); - WriteFile(hFile, &tab, 1, &dwWritten, NULL); + WriteFile(hFile, LVText, sizeof(TCHAR) * dwTextLength, &dwWritten, NULL); + WriteFile(hFile, &tab, sizeof(TCHAR), &dwWritten, NULL); } } - WriteFile(hFile, &newl, 1, &dwWritten, NULL); + WriteFile(hFile, &newl, sizeof(TCHAR), &dwWritten, NULL); } CloseHandle(hFile); bSuccess = TRUE;

1 0

[gedmurphy] 70: - set the button states according to the service
by gedmurphy＠svn.reactos.org 01 Feb '06

01 Feb '06

- set the button states according to the service - Set the main and popup menus according to the current environment or service - allow viewing in list or icon mode too Modified: trunk/reactos/base/system/servman/En.rc Modified: trunk/reactos/base/system/servman/export.c Modified: trunk/reactos/base/system/servman/propsheet.c Modified: trunk/reactos/base/system/servman/query.c Modified: trunk/reactos/base/system/servman/resource.h Modified: trunk/reactos/base/system/servman/servman.c _____ Modified: trunk/reactos/base/system/servman/En.rc --- trunk/reactos/base/system/servman/En.rc 2006-01-31 22:41:45 UTC (rev 69) +++ trunk/reactos/base/system/servman/En.rc 2006-02-01 19:41:17 UTC (rev 70) @@ -2,54 +2,59 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit",ID_EXIT + MENUITEM "E&xit", ID_EXIT END POPUP "Action" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART + MENUITEM "Start", ID_START, GRAYED + MENUITEM "Stop", ID_STOP, GRAYED + MENUITEM "Pause", ID_PAUSE, GRAYED + MENUITEM "Resume", ID_RESUME, GRAYED + MENUITEM "Restart", ID_RESTART, GRAYED MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP + MENUITEM "Properties", ID_PROP, GRAYED END POPUP "View" BEGIN - MENUITEM "Customize",ID_VIEW_CUSTOMIZE + MENUITEM "Large Icons", ID_VIEW_LARGE + MENUITEM "Small Icons", ID_VIEW_SMALL + MENUITEM "List", ID_VIEW_LIST + MENUITEM "Details", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "Customize", ID_VIEW_CUSTOMIZE, GRAYED END POPUP "Help" BEGIN - MENUITEM "About",ID_ABOUT + MENUITEM "About", ID_ABOUT END END IDR_POPUP MENU BEGIN POPUP "popup" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART + MENUITEM "Start", ID_START, GRAYED + MENUITEM "Stop", ID_STOP, GRAYED + MENUITEM "Pause", ID_PAUSE, GRAYED + MENUITEM "Resume", ID_RESUME, GRAYED + MENUITEM "Restart", ID_RESTART, GRAYED MENUITEM SEPARATOR POPUP "All tasks" BEGIN - MENUITEM "Start",ID_START - MENUITEM "Stop",ID_STOP - MENUITEM "Pause",ID_PAUSE - MENUITEM "Resume",ID_RESUME - MENUITEM "Restart",ID_RESTART - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Start", ID_START, GRAYED + MENUITEM "Stop", ID_STOP, GRAYED + MENUITEM "Pause", ID_PAUSE, GRAYED + MENUITEM "Resume", ID_RESUME, GRAYED + MENUITEM "Restart", ID_RESTART, GRAYED + MENUITEM "Refresh", ID_REFRESH, GRAYED END MENUITEM SEPARATOR - MENUITEM "Refresh",ID_REFRESH + MENUITEM "Refresh", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Properties",ID_PROP + MENUITEM "Properties", ID_PROP MENUITEM SEPARATOR - MENUITEM "Help",ID_HELP + MENUITEM "Help", ID_HELP END END @@ -58,7 +63,7 @@ FONT 8,"Tahoma",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.3\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -74,10 +79,10 @@ EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,11 - PUSHBUTTON "Start", IDC_START, 6, 155, 54, 15 - PUSHBUTTON "Stop", IDC_STOP, 68, 155, 54, 15 - PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15 - PUSHBUTTON "Resume", IDC_RESUME, 192, 155, 54, 15 + PUSHBUTTON "Start", IDC_START, 6, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Stop", IDC_STOP, 68, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED + PUSHBUTTON "Resume", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED LTEXT "Service name:", IDC_STATIC, 4, 11, 53, 11 LTEXT "Display name:", IDC_STATIC, 4, 29, 53, 11 LTEXT "Description:", IDC_STATIC, 4, 51, 53, 11 _____ Modified: trunk/reactos/base/system/servman/export.c --- trunk/reactos/base/system/servman/export.c 2006-01-31 22:41:45 UTC (rev 69) +++ trunk/reactos/base/system/servman/export.c 2006-02-01 19:41:17 UTC (rev 70) @@ -87,7 +87,8 @@ return; } - MessageBox(NULL, _T("Export to file failed"), NULL, 0); + if (CommDlgExtendedError() != CDERR_GENERALCODES) + MessageBox(NULL, _T("Export to file failed"), NULL, 0); } _____ Modified: trunk/reactos/base/system/servman/propsheet.c --- trunk/reactos/base/system/servman/propsheet.c 2006-01-31 22:41:45 UTC (rev 69) +++ trunk/reactos/base/system/servman/propsheet.c 2006-02-01 19:41:17 UTC (rev 70) @@ -29,6 +29,43 @@ +VOID SetButtonStates() +{ + HWND hButton; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + DWORD Flags, State; + + /* get pointer to selected service */ + Service = GetSelectedService(); + + Flags = Service->ServiceStatusProcess.dwControlsAccepted; + State = Service->ServiceStatusProcess.dwCurrentState; + + if (State == SERVICE_STOPPED) + { + hButton = GetDlgItem(hwndGenDlg, IDC_START); + EnableWindow (hButton, TRUE); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndGenDlg, IDC_STOP); + EnableWindow (hButton, TRUE); + } + + if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndGenDlg, IDC_PAUSE); + EnableWindow (hButton, TRUE); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + hButton = GetDlgItem(hwndGenDlg, IDC_PAUSE); + EnableWindow (hButton, TRUE); + } +} + /* * Fills the 'startup type' combo box with possible * values and sets it to value of the selected item @@ -163,43 +200,60 @@ { case WM_INITDIALOG: GetDlgInfo(); + SetButtonStates(); + break; - break; - case WM_COMMAND: switch(LOWORD(wParam)) { + case IDC_START_TYPE: + /* Enable the 'Apply' button */ + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + case IDC_START: SendMessage(hMainWnd, WM_COMMAND, ID_START, 0); - break; + break; case IDC_STOP: SendMessage(hMainWnd, WM_COMMAND, ID_STOP, 0); - break; + break; case IDC_PAUSE: SendMessage(hMainWnd, WM_COMMAND, ID_PAUSE, 0); - break; + break; case IDC_RESUME: SendMessage(hMainWnd, WM_COMMAND, ID_RESUME, 0); - break; + break; + + case IDC_START_PARAM: + /* Enable the 'Apply' button */ + //PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } break; case WM_DESTROY: - break; + break; case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; switch (lpnm->code) + { + case MCN_SELECT: + /* Enable the 'Apply' button */ + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; - default: + default: break; + } } - break; + break; } return FALSE; _____ Modified: trunk/reactos/base/system/servman/query.c --- trunk/reactos/base/system/servman/query.c 2006-01-31 22:41:45 UTC (rev 69) +++ trunk/reactos/base/system/servman/query.c 2006-02-01 19:41:17 UTC (rev 70) @@ -414,206 +414,3 @@ return NumServices; } - - - - - - - - - - - -/* - //WORD wCodePage; - //WORD wLangID; - //SC_HANDLE hService; - //DWORD dwHandle, dwLen; - //UINT BufLen; - //TCHAR* lpData; - //TCHAR* lpBuffer; - //TCHAR szStrFileInfo[80]; - //TCHAR FileName[MAX_PATH]; - //LPVOID pvData; - - //LPSERVICE_FAILURE_ACTIONS pServiceFailureActions = NULL; - //LPQUERY_SERVICE_CONFIG pServiceConfig = NULL; - - BytesNeeded = 0; - hService = OpenService(ScHandle, - pServiceStatus[Index].lpServiceName, - SC_MANAGER_CONNECT); - if (hService != INVALID_HANDLE_VALUE) - { - / * check if service is required by the system* / - if (!QueryServiceConfig2(hService, - SERVICE_CONFIG_FAILURE_ACTIONS, - (LPBYTE)pServiceFailureActions, - 0, - &BytesNeeded)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pServiceFailureActions = (LPSERVICE_FAILURE_ACTIONS) - HeapAlloc(GetProcessHeap(), 0, BytesNeeded); - if (pServiceFailureActions == NULL) - return FALSE; - - if (!QueryServiceConfig2(hService, - SERVICE_CONFIG_FAILURE_ACTIONS, - (LPBYTE)pServiceFailureActions, - BytesNeeded, - &BytesNeeded)) - { - HeapFree(GetProcessHeap(), 0, pServiceFailureActions); - return FALSE; - } - } - else / * exit on failure * / - { - return FALSE; - } - } - if (pServiceFailureActions->cActions) - { - if (pServiceFailureActions->lpsaActions[0].Type == SC_ACTION_REBOOT) - { - LoadString(hInstance, IDS_SERVICES_YES, szStatus, 128); - item.pszText = szStatus; - item.iSubItem = 1; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - } - - if (pServiceFailureActions != NULL) - { - HeapFree(GetProcessHeap(), 0, pServiceFailureActions); - pServiceFailureActions = NULL; - } - - / * get vendor of service binary * / - BytesNeeded = 0; - if (!QueryServiceConfig(hService, pServiceConfig, 0, &BytesNeeded)) - { - if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) - { - pServiceConfig = (LPQUERY_SERVICE_CONFIG) - HeapAlloc(GetProcessHeap(), 0, BytesNeeded); - if (pServiceConfig == NULL) - return FALSE; - - if (!QueryServiceConfig(hService, - pServiceConfig, - BytesNeeded, - &BytesNeeded)) - { - HeapFree(GetProcessHeap(), 0, pServiceConfig); - return FALSE; - } - } - else / * exit on failure * / - { - return FALSE; - } - } - - memset(&FileName, 0, MAX_PATH); - if (_tcscspn(pServiceConfig->lpBinaryPathName, _T("\""))) - { - _tcsncpy(FileName, pServiceConfig->lpBinaryPathName, - _tcscspn(pServiceConfig->lpBinaryPathName, _T(" ")) ); - } - else - { - _tcscpy(FileName, pServiceConfig->lpBinaryPathName); - } - - HeapFree(GetProcessHeap(), 0, pServiceConfig); - pServiceConfig = NULL; - - dwLen = GetFileVersionInfoSize(FileName, &dwHandle); - if (dwLen) - { - lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); - if (lpData == NULL) - return FALSE; - - if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { - HeapFree(GetProcessHeap(), 0, lpData); - return FALSE; - } - - if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), &pvData, (PUINT) &BufLen)) - { - wCodePage = LOWORD(*(DWORD*) pvData); - wLangID = HIWORD(*(DWORD*) pvData); - wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), wCodePage, wLangID); - } - - if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) { - item.pszText = lpBuffer; - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - HeapFree(GetProcessHeap(), 0, lpData); - } - else - { - LoadString(hInstance, IDS_SERVICES_UNKNOWN, szStatus, 128); - item.pszText = szStatus; - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - CloseServiceHandle(hService); - } - - - - - - - - HeapFree(GetProcessHeap(), 0, pServiceConfig); - pServiceConfig = NULL; - - dwLen = GetFileVersionInfoSize(FileName, &dwHandle); - if (dwLen) - { - lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); - if (lpData == NULL) - return FALSE; - - if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { - HeapFree(GetProcessHeap(), 0, lpData); - return FALSE; - } - - if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), - &pvData, (PUINT) &BufLen)) - { - wCodePage = LOWORD(*(DWORD*) pvData); - wLangID = HIWORD(*(DWORD*) pvData); - wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), - wCodePage, wLangID); - } - - if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) - { - item.pszText = lpBuffer; - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - HeapFree(GetProcessHeap(), 0, lpData); - } - else - { - LoadString(hInstance, IDS_SERVICES_UNKNOWN, szStatus, 128); - item.pszText = szStatus; - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - - -*/ - _____ Modified: trunk/reactos/base/system/servman/resource.h --- trunk/reactos/base/system/servman/resource.h 2006-01-31 22:41:45 UTC (rev 69) +++ trunk/reactos/base/system/servman/resource.h 2006-02-01 19:41:17 UTC (rev 70) @@ -24,6 +24,10 @@ #define IDR_MAINMENU 102 #define IDR_POPUP 103 #define ID_VIEW_CUSTOMIZE 4021 +#define ID_VIEW_LARGE 4022 +#define ID_VIEW_SMALL 4023 +#define ID_VIEW_LIST 4024 +#define ID_VIEW_DETAILS 4025 #define ID_ABOUT 4031 /* List view columns */ _____ Modified: trunk/reactos/base/system/servman/servman.c --- trunk/reactos/base/system/servman/servman.c 2006-01-31 22:41:45 UTC (rev 69) +++ trunk/reactos/base/system/servman/servman.c 2006-02-01 19:41:17 UTC (rev 70) @@ -18,7 +18,7 @@ HWND hTool; HWND hProgDlg; HMENU hShortcutMenu; -INT SelectedItem; +INT SelectedItem = -1; extern HWND hwndGenDlg; @@ -28,7 +28,77 @@ return SelectedItem; } +VOID SetView(DWORD View) +{ + DWORD Style = GetWindowLong(hListView, GWL_STYLE); + if ((Style & LVS_TYPEMASK) != View) + SetWindowLong(hListView, GWL_STYLE, (Style & ~LVS_TYPEMASK) | View); +} + + +VOID SetMenuAndButtonStates() +{ + HMENU hMainMenu; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + DWORD Flags, State; + + /* get handle to menu */ + hMainMenu = GetMenu(hMainWnd); + + /* set all to greyed */ + EnableMenuItem(hMainMenu, ID_START, MF_GRAYED); + EnableMenuItem(hMainMenu, ID_STOP, MF_GRAYED); + EnableMenuItem(hMainMenu, ID_PAUSE, MF_GRAYED); + EnableMenuItem(hMainMenu, ID_RESUME, MF_GRAYED); + EnableMenuItem(hMainMenu, ID_RESTART, MF_GRAYED); + + EnableMenuItem(hShortcutMenu, ID_START, MF_GRAYED); + EnableMenuItem(hShortcutMenu, ID_STOP, MF_GRAYED); + EnableMenuItem(hShortcutMenu, ID_PAUSE, MF_GRAYED); + EnableMenuItem(hShortcutMenu, ID_RESUME, MF_GRAYED); + EnableMenuItem(hShortcutMenu, ID_RESTART, MF_GRAYED); + + //EnableWindow(hTool, FALSE); + + if (GetSelectedItem() != -1) + { + /* get pointer to selected service */ + Service = GetSelectedService(); + + Flags = Service->ServiceStatusProcess.dwControlsAccepted; + State = Service->ServiceStatusProcess.dwCurrentState; + + if (State == SERVICE_STOPPED) + { + EnableMenuItem(hMainMenu, ID_START, MF_ENABLED); + EnableMenuItem(hShortcutMenu, ID_START, MF_ENABLED); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_STOP, MF_ENABLED); + EnableMenuItem(hShortcutMenu, ID_STOP, MF_ENABLED); + } + + if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_PAUSE, MF_ENABLED); + EnableMenuItem(hShortcutMenu, ID_PAUSE, MF_ENABLED); + } + + if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) ) + { + EnableMenuItem(hMainMenu, ID_RESTART, MF_ENABLED); + EnableMenuItem(hShortcutMenu, ID_RESTART, MF_ENABLED); + } + } + else + EnableMenuItem(hMainMenu, ID_PROP, MF_GRAYED); + +} + + LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) @@ -83,6 +153,7 @@ MessageBox(hwnd, _T("Could not create tool bar."), _T("Error"), MB_OK | MB_ICONERROR); /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ + SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); /* Add custom images */ @@ -249,9 +320,28 @@ case LVN_ITEMCHANGED: { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + HMENU hMainMenu; + /* get handle to menu */ + hMainMenu = GetMenu(hMainWnd); + + /* activate properties menu item, if not already */ + if (GetMenuState(hMainMenu, ID_PROP, MF_BYCOMMAND) != MF_ENABLED) + EnableMenuItem(hMainMenu, ID_PROP, MF_ENABLED); + + /* globally set selected service */ SelectedItem = pnmv->iItem; + /* alter options for the service */ + SetMenuAndButtonStates(); + + /* get pointer to selected service */ + Service = GetSelectedService(); + + /* set current selected service in the status bar */ + SendMessage(hStatus, SB_SETTEXT, 1, (LPARAM)Service->lpDisplayName); + } break; @@ -334,12 +424,21 @@ switch(LOWORD(wParam)) { case ID_PROP: - OpenPropSheet(hwnd); + if (GetSelectedItem() != -1) + OpenPropSheet(hwnd); break; case ID_REFRESH: RefreshServiceList(); + SelectedItem = -1; + + /* disable menus and buttons */ + SetMenuAndButtonStates(); + + /* clear the service in the status bar */ + SendMessage(hStatus, SB_SETTEXT, 1, _T('\0')); + break; case ID_EXPORT: @@ -356,7 +455,9 @@ case ID_START: { - + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + TCHAR ProgDlgBuf[100]; + /* open the progress dialog */ hProgDlg = CreateDialog(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DLG_PROGRESS), @@ -364,9 +465,6 @@ (DLGPROC)ProgressDialogProc); if (hProgDlg != NULL) { - ENUM_SERVICE_STATUS_PROCESS *Service = NULL; - TCHAR ProgDlgBuf[100]; - ShowWindow(hProgDlg, SW_SHOW); /* write the info to the progress dialog */ @@ -385,11 +483,10 @@ if ( DoStartService(hProgDlg) ) { - LVITEM item; TCHAR szStatus[64]; TCHAR buf[25]; - + LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, sizeof(szStatus) / sizeof(TCHAR)); item.pszText = szStatus; @@ -414,6 +511,9 @@ case ID_STOP: { + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + TCHAR ProgDlgBuf[100]; + /* open the progress dialog */ hProgDlg = CreateDialog(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DLG_PROGRESS), @@ -421,9 +521,6 @@ (DLGPROC)ProgressDialogProc); if (hProgDlg != NULL) { - ENUM_SERVICE_STATUS_PROCESS *Service = NULL; - TCHAR ProgDlgBuf[100]; - ShowWindow(hProgDlg, SW_SHOW); /* write the info to the progress dialog */ @@ -442,11 +539,10 @@ if( Control(hProgDlg, SERVICE_CONTROL_STOP) ) { - LVITEM item; TCHAR buf[25]; - item.pszText = '\0'; + item.pszText = _T('\0'); item.iItem = GetSelectedItem(); item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); @@ -488,6 +584,22 @@ PostMessage(hwnd, WM_CLOSE, 0, 0); break; + case ID_VIEW_LARGE: + SetView(LVS_ICON); + break; + + case ID_VIEW_SMALL: + SetView(LVS_SMALLICON); + break; + + case ID_VIEW_LIST: + SetView(LVS_LIST); + break; + + case ID_VIEW_DETAILS: + SetView(LVS_REPORT); + break; + case ID_VIEW_CUSTOMIZE: break; @@ -496,7 +608,7 @@ MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogProc); - break; + break; } break;

1 0

[gedmurphy] 69: add missing library
by gedmurphy＠svn.reactos.org 31 Jan '06

31 Jan '06

add missing library Modified: trunk/reactos/base/system/servman/servman.rbuild _____ Modified: trunk/reactos/base/system/servman/servman.rbuild --- trunk/reactos/base/system/servman/servman.rbuild 2006-01-31 20:43:06 UTC (rev 68) +++ trunk/reactos/base/system/servman/servman.rbuild 2006-01-31 22:41:45 UTC (rev 69) @@ -12,6 +12,7 @@ <library>version</library> <library>comctl32</library> <library>shell32</library> + <library>comdlg32</library> <compilationunit name="unit.c"> <file>about.c</file> <file>control.c</file>

1 0

[gedmurphy] 68: - write services to file
by gedmurphy＠svn.reactos.org 31 Jan '06

31 Jan '06

- write services to file - added a roadmap for fun Modified: trunk/reactos/base/system/servman/export.c Added: trunk/reactos/base/system/servman/roadmap.txt _____ Modified: trunk/reactos/base/system/servman/export.c --- trunk/reactos/base/system/servman/export.c 2006-01-31 19:25:52 UTC (rev 67) +++ trunk/reactos/base/system/servman/export.c 2006-01-31 20:43:06 UTC (rev 68) @@ -3,24 +3,64 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/servman/export.c * PURPOSE: Save services to a file - * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * */ #include "servman.h" +extern HWND hListView; -BOOL SaveServicesToFile(HWND hListView, LPCTSTR pszFileName) + +DWORD GetTextFromListView(TCHAR Text[500], INT row, INT col) { + LVITEM item; + DWORD NumChars; + + ZeroMemory(&item, sizeof(item)); + item.mask = LVIF_TEXT; + item.iSubItem = col; + item.pszText = Text; + item.cchTextMax = 500; + NumChars = (INT)SendMessage(hListView, LVM_GETITEMTEXT, row, (LPARAM)&item); + + return NumChars; +} + + +BOOL SaveServicesToFile(LPCTSTR pszFileName) +{ HANDLE hFile; BOOL bSuccess = FALSE; hFile = CreateFile(pszFileName, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile != INVALID_HANDLE_VALUE) { + TCHAR LVText[500]; + TCHAR newl = _T('\n'); + TCHAR tab = _T('\t'); + DWORD dwTextLength, dwWritten; + INT NumListedServ = 0; + INT i, k; + NumListedServ = ListView_GetItemCount(hListView); + + for (i=0; i < NumListedServ; i++) + { + for (k=0; k<5; k++) + { + dwTextLength = GetTextFromListView(LVText, i, k); + if (LVText != NULL) + { + WriteFile(hFile, LVText, dwTextLength, &dwWritten, NULL); + WriteFile(hFile, &tab, 1, &dwWritten, NULL); + } + } + WriteFile(hFile, &newl, 1, &dwWritten, NULL); + } CloseHandle(hFile); + bSuccess = TRUE; } return bSuccess; } @@ -35,7 +75,7 @@ ofn.lStructSize = sizeof(OPENFILENAME); ofn.hwndOwner = hwnd; - ofn.lpstrFilter = _T("Text Files (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"); + ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0"); ofn.lpstrFile = szFileName; ofn.nMaxFile = MAX_PATH; ofn.lpstrDefExt = _T("txt"); @@ -43,8 +83,11 @@ if(GetSaveFileName(&ofn)) { - SaveServicesToFile(hwnd, szFileName); + if (SaveServicesToFile(szFileName)) + return; } + + MessageBox(NULL, _T("Export to file failed"), NULL, 0); } _____ Added: trunk/reactos/base/system/servman/roadmap.txt --- trunk/reactos/base/system/servman/roadmap.txt 2006-01-31 19:25:52 UTC (rev 67) +++ trunk/reactos/base/system/servman/roadmap.txt 2006-01-31 20:43:06 UTC (rev 68) @@ -0,0 +1,13 @@ +Release Criteria +------- -------- + 0.1 list all services. Provide basic starting and stopping of services (complete 12/05) + 0.2 Working properties dialog (complete 01/06) + 0.3 Export services to a text file (complete 01/06) + 0.4 Creation of new services + 0.5 Safe deletion of existing services + 0.6 Sort all services by column + 0.7 Show services in all 4 views, not just report view. Needs toolbar additions + 0.8 Complete dependancy dialog + + 1.0 Security audited & bug tested + 1.1 Write help file \ No newline at end of file

1 0

[sedwards] 67: added makefiles for freeldr isoboot
by sedwards＠svn.reactos.org 31 Jan '06

31 Jan '06

added makefiles for freeldr isoboot Modified: trunk/reactos/boot/boot.rbuild Added: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild Added: trunk/reactos/boot/freeldr/freeldr.rbuild _____ Modified: trunk/reactos/boot/boot.rbuild --- trunk/reactos/boot/boot.rbuild 2006-01-31 19:09:28 UTC (rev 66) +++ trunk/reactos/boot/boot.rbuild 2006-01-31 19:25:52 UTC (rev 67) @@ -2,4 +2,7 @@ <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> +<directory name="freeldr"> + <xi:include href="freeldr/freeldr.rbuild" /> +</directory> </group> _____ Added: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild --- trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild 2006-01-31 19:09:28 UTC (rev 66) +++ trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild 2006-01-31 19:25:52 UTC (rev 67) @@ -0,0 +1,30 @@ + +<module name="isoboot" type="bootsector"> + <bootstrap base="loader" nameoncd="isoboot.bin" /> + <file>isoboot.asm</file> +</module> + _____ Added: trunk/reactos/boot/freeldr/freeldr.rbuild --- trunk/reactos/boot/freeldr/freeldr.rbuild 2006-01-31 19:09:28 UTC (rev 66) +++ trunk/reactos/boot/freeldr/freeldr.rbuild 2006-01-31 19:25:52 UTC (rev 67) @@ -0,0 +1,17 @@ +<directory name="bootsect"> + <xi:include href="bootsect/bootsect.rbuild" /> +</directory> +

1 0

[sedwards] 66: did not notice this has older style BSD license. Removed until we can contact vendor about dual license
by sedwards＠svn.reactos.org 31 Jan '06

31 Jan '06

did not notice this has older style BSD license. Removed until we can contact vendor about dual license Deleted: trunk/reactos/boot/freeldr/bootsect/ofwboot.s _____ Deleted: trunk/reactos/boot/freeldr/bootsect/ofwboot.s --- trunk/reactos/boot/freeldr/bootsect/ofwboot.s 2006-01-31 19:04:20 UTC (rev 65) +++ trunk/reactos/boot/freeldr/bootsect/ofwboot.s 2006-01-31 19:09:28 UTC (rev 66) @@ -1,1242 +0,0 @@ - .section .text -_start: - .long 0xe00000 + 12 - .long 0 - .long 0 - -/* - * LIFTED FROM arch/macppc/stand/ofwboot/Locore.c - * Copyright (C) 1995, 1996 Wolfgang Solfrank. - * Copyright (C) 1995, 1996 TooLs GmbH. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by TooLs GmbH. - * 4. The name of TooLs GmbH may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -_begin: - sync - isync - - lis %r1,stack@ha - addi %r1,%r1,stack@l - addi %r1,%r1,16384 - 0x10 - - mfmsr %r8 - li %r0,0 - mtmsr %r0 - isync - - mtibatu 0,%r0 - mtibatu 1,%r0 - mtibatu 2,%r0 - mtibatu 3,%r0 - mtdbatu 0,%r0 - mtdbatu 1,%r0 - mtdbatu 2,%r0 - mtdbatu 3,%r0 - - li %r9,0x12 /* BATL(0, BAT_M, BAT_PP_RW) */ - mtibatl 0,%r9 - mtdbatl 0,%r9 - li %r10,0x1ffe /* BATU(0, BAT_BL_256M, BAT_Vs) */ - mtibatu 0,%r10 - mtdbatu 0,%r10 - - isync - - li %r8,0x3030 - mtmsr %r8 - - /* Store ofw call addr */ - mr %r21,%r5 - lis %r10,0xe00000@ha - stw %r5,ofw_call_addr - _start@l(%r10) - - lis %r4,_binary_freeldr_tmp_end@ha - addi %r4,%r4,_binary_freeldr_tmp_end@l - lis %r3,_binary_freeldr_tmp_start@ha - addi %r3,%r3,_binary_freeldr_tmp_start@l - - lis %r5,0x8000@ha - addi %r5,%r5,0x8000@l - - bl copy_bits - - bl zero_registers - - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_banner - _start - - bl ofw_print_string - - bl ofw_print_eol - - bl setup_exc - - /* Zero CTR */ - mtcr %r31 - - lis %r3,0x8000@ha - addi %r3,%r3,0x8000@l - - mtlr %r3 - - lis %r3,call_ofw@ha - addi %r3,%r3,call_ofw - _start - - b call_freeldr - - .align 4 -call_freeldr: - /* Get the address of the functions list -- - * Note: - * Because of little endian switch we must use an even number of - * instructions here.. Pad with a nop if needed. */ - mfmsr %r10 - ori %r10,%r10,1 - mtmsr %r10 - - nop - - /* Note that this is little-endian from here on */ - blr - nop - - .align 4 -call_ofw: - /* R3 has the function offset to call (n * 4) - * Other arg registers are unchanged. - * Note that these 4 instructions are in reverse order due to - * little-endian convention */ - andi. %r0,%r0,65534 - mfmsr %r0 - mtmsr %r0 - /* Now normal ordering resumes */ - subi %r1,%r1,0x100 - - stw %r8,4(%r1) - stw %r9,8(%r1) - stw %r10,12(%r1) - mflr %r8 - stw %r8,16(%r1) - - lis %r10,0xe00000@ha - add %r9,%r3,%r10 - lwz %r3,ofw_functions - _start@l(%r9) - mtctr %r3 - - mr %r3,%r4 - mr %r4,%r5 - mr %r5,%r6 - mr %r6,%r7 - mr %r7,%r8 - - /* Goto the swapped function */ - bctrl - - lwz %r8,16(%r1) - mtlr %r8 - - lwz %r8,4(%r1) - lwz %r9,8(%r1) - lwz %r10,12(%r1) - - addi %r1,%r1,0x100 - /* Ok, go back to little endian */ - mfmsr %r0 - ori %r0,%r0,1 - mtmsr %r0 - - /* Note that this is little-endian from here on */ - blr - nop - -zero_registers: - xor %r2,%r2,%r2 - mr %r0,%r2 - mr %r3,%r2 - - mr %r4,%r2 - mr %r5,%r2 - mr %r6,%r2 - mr %r7,%r2 - - mr %r8,%r2 - mr %r9,%r2 - mr %r10,%r2 - mr %r11,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r16,%r2 - mr %r17,%r2 - mr %r18,%r2 - mr %r19,%r2 - - mr %r20,%r2 - mr %r21,%r2 - mr %r22,%r2 - mr %r23,%r2 - - mr %r24,%r2 - mr %r25,%r2 - mr %r26,%r2 - mr %r27,%r2 - - mr %r28,%r2 - mr %r29,%r2 - mr %r30,%r2 - mr %r31,%r2 - - blr - -prim_strlen: - mr %r5,%r3 -prim_strlen_loop: - lbz %r4,0(%r3) - cmpi 0,0,%r4,0 - beq prim_strlen_done - addi %r3,%r3,1 - b prim_strlen_loop - -prim_strlen_done: - sub %r3,%r3,%r5 - blr - -copy_bits: - cmp 0,0,%r3,%r4 - beqlr - lwz %r6,0(%r3) - stw %r6,0(%r5) - addi %r3,%r3,4 - addi %r5,%r5,4 - b copy_bits - -ofw_print_string_hook: - bl ofw_print_number - bl ofw_exit - -ofw_print_string: - /* Reserve some stack space */ - subi %r1,%r1,32 - - /* Save args */ - stw %r3,0(%r1) - - /* Save the lr, a scratch register */ - stw %r8,8(%r1) - mflr %r8 - stw %r8,12(%r1) - - /* Load the package name */ - lis %r3,0xe00000@ha - addi %r3,%r3,ofw_chosen_name - _start - - /* Fire */ - bl ofw_finddevice - - /* Load up for getprop */ - stw %r3,16(%r1) - - lis %r4,0xe00000@ha - addi %r4,%r4,ofw_stdout_name - _start - - addi %r5,%r1,20 - - li %r6,4 - - bl ofw_getprop - - /* Measure the string and remember the length */ - lwz %r3,0(%r1) - bl prim_strlen - mr %r5,%r3 - - lwz %r3,20(%r1) - lwz %r4,0(%r1) - - /* Write the string */ - bl ofw_write - - /* Return */ - lwz %r8,12(%r1) - mtlr %r8 - lwz %r8,8(%r1) - - addi %r1,%r1,32 - blr - - /* Print 8 hex digits representing a number in r3 */ -ofw_print_number: - subi %r1,%r1,32 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - stw %r9,8(%r1) - - xor %r9,%r9,%r9 - stw %r9,12(%r1) - - /* Set up and, devide, shift */ - mr %r8,%r3 - lis %r6,0xf0000000@ha - lis %r7,0x10000000@ha - li %r9,8 - -ofw_number_loop: - nop - cmpi 0,0,%r9,0 - beq ofw_number_return - subi %r9,%r9,1 - - /* Body: isolate digit, divide, print */ - and %r5,%r6,%r8 - divwu %r4,%r5,%r7 - srwi %r6,%r6,4 - srwi %r7,%r7,4 - - nop - - cmpi 0,0,%r4,10 - bge ofw_number_letter - addi %r4,%r4,'0' - b ofw_number_digit_out - -ofw_number_letter: - addi %r4,%r4,'A' - 10 - -ofw_number_digit_out: - stb %r4,12(%r1) - addi %r3,%r1,12 - - stw %r6,16(%r1) - stw %r7,20(%r1) - stw %r8,24(%r1) - stw %r9,28(%r1) - - bl ofw_print_string - - lwz %r6,16(%r1) - lwz %r7,20(%r1) - lwz %r8,24(%r1) - lwz %r9,28(%r1) - - b ofw_number_loop - -ofw_number_return: - /* Return */ - lwz %r9,8(%r1) - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,32 - blr - -ofw_print_eol: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x0d0a - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_nothing: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_space: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x2000 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_regs: - /* Construct ofw exit call */ - subi %r1,%r1,0xa0 - - stw %r0,0(%r1) - stw %r1,4(%r1) - stw %r2,8(%r1) - stw %r3,12(%r1) - - stw %r4,16(%r1) - stw %r5,20(%r1) - stw %r6,24(%r1) - stw %r7,28(%r1) - - stw %r8,32(%r1) - stw %r9,36(%r1) - stw %r10,40(%r1) - stw %r11,44(%r1) - - stw %r12,48(%r1) - stw %r13,52(%r1) - stw %r14,56(%r1) - stw %r15,60(%r1) - - stw %r16,64(%r1) - stw %r17,68(%r1) - stw %r18,72(%r1) - stw %r19,76(%r1) - - stw %r20,80(%r1) - stw %r21,84(%r1) - stw %r22,88(%r1) - stw %r23,92(%r1) - - stw %r24,96(%r1) - stw %r25,100(%r1) - stw %r26,104(%r1) - stw %r27,108(%r1) - - stw %r28,112(%r1) - stw %r29,116(%r1) - stw %r30,120(%r1) - stw %r31,124(%r1) - - mflr %r0 - stw %r0,128(%r1) - mfcr %r0 - stw %r0,132(%r1) - mfctr %r0 - stw %r0,136(%r1) - mfmsr %r0 - stw %r0,140(%r1) - - /* Count at zero */ - xor %r0,%r0,%r0 - stw %r0,144(%r1) - mr %r3,%r1 - stw %r3,148(%r1) - - /* Body, print the regname, then the register */ -ofw_register_loop: - lwz %r3,144(%r1) - cmpi 0,0,%r3,32 - beq ofw_register_special - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_init - _start - bl ofw_print_string - lwz %r3,144(%r1) - bl ofw_print_number - bl ofw_print_space - lwz %r3,144(%r1) - mulli %r3,%r3,4 - add %r3,%r1,%r3 - lwz %r3,0(%r3) - stw %r3,152(%r1) - bl ofw_print_number - lwz %r3,144(%r1) - addi %r3,%r3,1 - stw %r3,144(%r1) - b done_dump - -dump_optional: - bl ofw_print_space - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,0(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,4(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,8(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,12(%r3) - bl ofw_print_number - bl ofw_print_space -done_dump: - bl ofw_print_eol - b ofw_register_loop - -ofw_register_special: - /* LR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_lr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,128(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_cr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,132(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CTR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_ctr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,136(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* MSR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_msr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,140(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* Return */ - lwz %r0,128(%r1) - mtlr %r0 - - lwz %r0,0(%r1) - lwz %r2,8(%r1) - lwz %r3,12(%r1) - - lwz %r4,16(%r1) - lwz %r5,20(%r1) - lwz %r6,24(%r1) - lwz %r7,28(%r1) - - addi %r1,%r1,0xa0 - - blr - -ofw_finddevice_hook: - subi %r1,%r1,32 - stw %r3,0(%r1) - mflr %r3 - stw %r3,4(%r1) - lwz %r3,0(%r1) - bl ofw_finddevice - stw %r3,0(%r1) - lwz %r3,4(%r1) - mtlr %r3 - lwz %r3,0(%r1) - addi %r1,%r1,32 - blr - -ofw_finddevice: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get finddevice name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_finddevice_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_open: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get open name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_open_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_getprop_hook: - /* Reserve stack space: - * 32 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - /* Store r8, r9, lr */ - stw %r8,32(%r1) - stw %r9,36(%r1) - mflr %r8 - stw %r8,40(%r1) - - /* Get getprop name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_getprop_name - _start - stw %r9,0(%r1) - - /* 4 Argument and 1 return */ - li %r9,4 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) /* Package */ - stw %r4,16(%r1) /* Property */ - stw %r5,20(%r1) /* Return buffer */ - stw %r6,24(%r1) /* Buffer size */ - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Workaround to a wierd crash ... not sure what causes it. - * XXX investigate me */ - bl ofw_print_nothing - - /* Return */ - lwz %r3,28(%r1) - - /* Restore registers */ - lwz %r8,40(%r1) - mtlr %r8 - lwz %r9,36(%r1) - lwz %r8,32(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_getprop: - /* Reserve stack space: - * 32 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - /* Store r8, r9, lr */ - stw %r8,32(%r1) - stw %r9,36(%r1) - mflr %r8 - stw %r8,40(%r1) - - /* Get getprop name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_getprop_name - _start - stw %r9,0(%r1) - - /* 4 Argument and 1 return */ - li %r9,4 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) /* Package */ - stw %r4,16(%r1) /* Property */ - stw %r5,20(%r1) /* Return buffer */ - stw %r6,24(%r1) /* Buffer size */ - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Return */ - lwz %r3,28(%r1) - - /* Restore registers */ - lwz %r8,40(%r1) - - mtlr %r8 - lwz %r9,36(%r1) - lwz %r8,32(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_write: - /* Reserve stack space: - * 28 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - nop - - /* Store r8, r9, lr */ - stw %r8,28(%r1) - stw %r9,32(%r1) - mflr %r8 - stw %r8,36(%r1) - - /* Get write name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_write_name - _start - stw %r9,0(%r1) - - /* 3 Arguments and 1 return */ - li %r9,3 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) - stw %r4,16(%r1) - stw %r5,20(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Return */ - lwz %r3,24(%r1) - - /* Restore registers */ - lwz %r8,36(%r1) - mtlr %r8 - lwz %r9,32(%r1) - lwz %r8,28(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_read: - /* Reserve stack space: - * 28 bytes for the ofw call - * 12 bytes for r8, r9, lr - */ - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,48 - - nop - - /* Store r8, r9, lr */ - stw %r8,28(%r1) - stw %r9,32(%r1) - mflr %r8 - stw %r8,36(%r1) - - /* Get read name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_read_name - _start - stw %r9,0(%r1) - - /* 3 Arguments and 1 return */ - li %r9,3 - stw %r9,4(%r1) - li %r9,1 - stw %r9,8(%r1) - - stw %r3,12(%r1) - stw %r4,16(%r1) - stw %r5,20(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - /* Return */ - lwz %r3,24(%r1) - - /* Restore registers */ - lwz %r8,36(%r1) - mtlr %r8 - lwz %r9,32(%r1) - lwz %r8,28(%r1) - - addi %r1,%r1,48 - - /* Return */ - blr - -ofw_exit: - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_halt - _start - - bl ofw_print_string -/* -ofw_exit_loop: - b ofw_exit_loop -*/ - /* Load the exit name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_exit_name - _start - stw %r9,0(%r1) - - /* Zero args, zero returns */ - xor %r9,%r9,%r9 - stw %r9,4(%r1) - stw %r9,8(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - mr %r3,%r1 - - /* Fire */ - blrl - /* No return from exit */ - -ofw_child: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - - /* Store r8, r9, lr */ - stw %r8,20(%r1) - stw %r9,24(%r1) - mflr %r8 - stw %r8,28(%r1) - - /* Get child name */ - lis %r8,0xe00000@ha - addi %r9,%r8,ofw_child_name - _start - stw %r9,0(%r1) - - /* 1 Argument and 1 return */ - li %r9,1 - stw %r9,4(%r1) - stw %r9,8(%r1) - - stw %r3,12(%r1) - - /* Load up the call address */ - lwz %r9,ofw_call_addr - _start(%r8) - mtlr %r9 - - /* Set argument */ - mr %r3,%r1 - - /* Fire */ - blrl - - lwz %r3,16(%r1) - - /* Restore registers */ - lwz %r8,28(%r1) - mtlr %r8 - lwz %r9,24(%r1) - lwz %r8,20(%r1) - - addi %r1,%r1,32 - - /* Return */ - blr - -ofw_peer: - /* Reserve stack space ... - * 20 bytes for the ofw call, - * r8, r9, and lr */ - subi %r1,%r1,32 - [truncated at 1000 lines; 247 more skipped]

1 0

[sedwards] 65: reformat
by sedwards＠svn.reactos.org 31 Jan '06

31 Jan '06

reformat Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c _____ Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c --- trunk/reactos/boot/freeldr/fdebug/fdebug.c 2006-01-31 18:58:49 UTC (rev 64) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c 2006-01-31 19:04:20 UTC (rev 65) @@ -13,68 +13,68 @@ #define MAX_LOADSTRING 100 // Global Variables: -HINSTANCE hInst; // current instance -TCHAR szTitle[MAX_LOADSTRING]; // The title bar text -TCHAR szWindowClass[MAX_LOADSTRING]; // The title bar text -HWND hMainWnd; // The main window handle -HWND hDisplayWnd; // The window to display the incoming data -HWND hEditWnd; // The edit window to get input from the user -TCHAR strComPort[MAX_PATH] = TEXT("COM1"); // The COM port to use -TCHAR strBaudRate[MAX_PATH] = TEXT("115200"); // The baud rate to use -TCHAR strCaptureFileName[MAX_PATH] = TEXT(""); // The file name to capture to -BOOL bConnected = FALSE; // Tells us if we are currently connected -BOOL bCapturing = FALSE; // Tells us if we are currently capturing data -BOOL bLocalEcho = FALSE; // Tells us if local echo is currently enabled -HANDLE hCaptureFile; // Handle to the capture file -DWORD dwThreadId = 0; // Thread id of RS232 communication thread +HINSTANCE hInst; // current instance +TCHAR szTitle[MAX_LOADSTRING]; // The title bar text +TCHAR szWindowClass[MAX_LOADSTRING]; // The title bar text +HWND hMainWnd; // The main window handle +HWND hDisplayWnd; // The window to display the incoming data +HWND hEditWnd; // The edit window to get input from the user +TCHAR strComPort[MAX_PATH] = TEXT("COM1"); // The COM port to use +TCHAR strBaudRate[MAX_PATH] = TEXT("115200"); // The baud rate to use +TCHAR strCaptureFileName[MAX_PATH] = TEXT(""); // The file name to capture to +BOOL bConnected = FALSE; // Tells us if we are currently connected +BOOL bCapturing = FALSE; // Tells us if we are currently capturing data +BOOL bLocalEcho = FALSE; // Tells us if local echo is currently enabled +HANDLE hCaptureFile; // Handle to the capture file +DWORD dwThreadId = 0; // Thread id of RS232 communication thread // Foward declarations of functions included in this code module: -ATOM MyRegisterClass(HINSTANCE hInstance); -BOOL InitInstance(HINSTANCE, int); -LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM); -LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM); -VOID EnableConnectMenuItem(BOOL Enable); -VOID EnableDisconnectMenuItem(BOOL Enable); -VOID EnableStartCaptureMenuItem(BOOL Enable); -VOID EnableStopCaptureMenuItem(BOOL Enable); -VOID CheckLocalEchoMenuItem(BOOL Checked); -VOID Rs232Thread(VOID* Parameter); +ATOM MyRegisterClass(HINSTANCE hInstance); +BOOL InitInstance(HINSTANCE, int); +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM); +LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM); +VOID EnableConnectMenuItem(BOOL Enable); +VOID EnableDisconnectMenuItem(BOOL Enable); +VOID EnableStartCaptureMenuItem(BOOL Enable); +VOID EnableStopCaptureMenuItem(BOOL Enable); +VOID CheckLocalEchoMenuItem(BOOL Checked); +VOID Rs232Thread(VOID* Parameter); int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - // TODO: Place code here. - MSG msg; - HACCEL hAccelTable; + // TODO: Place code here. + MSG msg; + HACCEL hAccelTable; - // Initialize global strings - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadString(hInstance, IDC_FDEBUG, szWindowClass, MAX_LOADSTRING); - MyRegisterClass(hInstance); + // Initialize global strings + LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); + LoadString(hInstance, IDC_FDEBUG, szWindowClass, MAX_LOADSTRING); + MyRegisterClass(hInstance); - // Perform application initialization: - if (!InitInstance (hInstance, nCmdShow)) - { - return FALSE; - } + // Perform application initialization: + if (!InitInstance (hInstance, nCmdShow)) + { + return FALSE; + } - hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FDEBUG); + hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_FDEBUG); - // Main message loop: - while (GetMessage(&msg, NULL, 0, 0)) - { - if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } + // Main message loop: + while (GetMessage(&msg, NULL, 0, 0)) + { + if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } - return msg.wParam; + return msg.wParam; } @@ -94,23 +94,23 @@ // ATOM MyRegisterClass(HINSTANCE hInstance) { - WNDCLASSEX wcex; + WNDCLASSEX wcex; - wcex.cbSize = sizeof(WNDCLASSEX); + wcex.cbSize = sizeof(WNDCLASSEX); - wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = (WNDPROC)WndProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, (LPCTSTR)IDI_FDEBUG); - wcex.hCursor = LoadCursor(NULL, IDC_ARROW); - wcex.hbrBackground = NULL;//(HBRUSH)(COLOR_WINDOW+1); - wcex.lpszMenuName = (LPCSTR)IDC_FDEBUG; - wcex.lpszClassName = szWindowClass; - wcex.hIconSm = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL); + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = (WNDPROC)WndProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = LoadIcon(hInstance, (LPCTSTR)IDI_FDEBUG); + wcex.hCursor = LoadCursor(NULL, IDC_ARROW); + wcex.hbrBackground = NULL;//(HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = (LPCSTR)IDC_FDEBUG; + wcex.lpszClassName = szWindowClass; + wcex.hIconSm = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL); - return RegisterClassEx(&wcex); + return RegisterClassEx(&wcex); } // @@ -147,408 +147,408 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - int wmId, wmEvent; - PAINTSTRUCT ps; - HDC hdc; - RECT rc; - TCHAR WndText[MAX_PATH]; - DWORD Index; - NONCLIENTMETRICS ncm; - HFONT hFont; + int wmId, wmEvent; + PAINTSTRUCT ps; + HDC hdc; + RECT rc; + TCHAR WndText[MAX_PATH]; + DWORD Index; + NONCLIENTMETRICS ncm; + HFONT hFont; - switch (message) - { - case WM_CREATE: + switch (message) + { + case WM_CREATE: - hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); - hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); + hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); + hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); - memset(&ncm, 0, sizeof(NONCLIENTMETRICS)); - ncm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); + memset(&ncm, 0, sizeof(NONCLIENTMETRICS)); + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); - hFont = CreateFontIndirect(&ncm.lfMessageFont); + hFont = CreateFontIndirect(&ncm.lfMessageFont); - SendMessage(hEditWnd, WM_SETFONT, (WPARAM)hFont, TRUE); - SendMessage(hDisplayWnd, WM_SETFONT, (WPARAM)hFont, TRUE); + SendMessage(hEditWnd, WM_SETFONT, (WPARAM)hFont, TRUE); + SendMessage(hDisplayWnd, WM_SETFONT, (WPARAM)hFont, TRUE); - break; - case WM_COMMAND: - wmId = LOWORD(wParam); - wmEvent = HIWORD(wParam); + break; + case WM_COMMAND: + wmId = LOWORD(wParam); + wmEvent = HIWORD(wParam); - if (lParam == (LPARAM)hEditWnd && wmEvent == EN_CHANGE) - { - GetWindowText(hEditWnd, WndText, MAX_PATH); + if (lParam == (LPARAM)hEditWnd && wmEvent == EN_CHANGE) + { + GetWindowText(hEditWnd, WndText, MAX_PATH); - if (_tcslen(WndText) > 0) - { - SetWindowText(hEditWnd, TEXT("")); + if (_tcslen(WndText) > 0) + { + SetWindowText(hEditWnd, TEXT("")); - if (!bConnected) - { - MessageBox(hWnd, TEXT("You are not currently connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); - break; - } + if (!bConnected) + { + MessageBox(hWnd, TEXT("You are not currently connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); + break; + } - for (Index=0; Index<_tcslen(WndText); Index++) - { - if (dwThreadId != 0) - { - PostThreadMessage(dwThreadId, WM_CHAR, (WPARAM)WndText[Index], (LPARAM)0); - } - } - } - } + for (Index=0; Index<_tcslen(WndText); Index++) + { + if (dwThreadId != 0) + { + PostThreadMessage(dwThreadId, WM_CHAR, (WPARAM)WndText[Index], (LPARAM)0); + } + } + } + } - // Parse the menu selections: - switch (wmId) - { - case IDM_ABOUT: - DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About); - break; - case IDM_EXIT: - DestroyWindow(hWnd); - break; - case ID_FILE_CONNECT: - if (bConnected) - { - MessageBox(hWnd, TEXT("You are already connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); - } - else - { - if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK) - { - bConnected = TRUE; - EnableDisconnectMenuItem(TRUE); - EnableConnectMenuItem(FALSE); - _beginthread(Rs232Thread, 0, NULL); - } - } - break; - case ID_FILE_DISCONNECT: - if (bConnected) - { - bConnected = FALSE; - EnableDisconnectMenuItem(FALSE); - EnableConnectMenuItem(TRUE); - } - else - { - MessageBox(hWnd, TEXT("You are not currently connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); - } - break; - case ID_FILE_STARTCAPTURE: - if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK) - { - bCapturing = TRUE; - EnableStopCaptureMenuItem(TRUE); - EnableStartCaptureMenuItem(FALSE); - hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - } - break; - case ID_FILE_STOPCAPTURE: - if (bCapturing) - { - bCapturing = FALSE; - EnableStopCaptureMenuItem(FALSE); - EnableStartCaptureMenuItem(TRUE); - CloseHandle(hCaptureFile); - hCaptureFile = NULL; - } - break; - case ID_FILE_LOCALECHO: - if (bLocalEcho) - { - bLocalEcho = FALSE; - CheckLocalEchoMenuItem(bLocalEcho); - } - else - { - bLocalEcho = TRUE; - CheckLocalEchoMenuItem(bLocalEcho); - } - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); - } - break; - case WM_PAINT: - hdc = BeginPaint(hWnd, &ps); - EndPaint(hWnd, &ps); - break; - case WM_SIZE: + // Parse the menu selections: + switch (wmId) + { + case IDM_ABOUT: + DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About); + break; + case IDM_EXIT: + DestroyWindow(hWnd); + break; + case ID_FILE_CONNECT: + if (bConnected) + { + MessageBox(hWnd, TEXT("You are already connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); + } + else + { + if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK) + { + bConnected = TRUE; + EnableDisconnectMenuItem(TRUE); + EnableConnectMenuItem(FALSE); + _beginthread(Rs232Thread, 0, NULL); + } + } + break; + case ID_FILE_DISCONNECT: + if (bConnected) + { + bConnected = FALSE; + EnableDisconnectMenuItem(FALSE); + EnableConnectMenuItem(TRUE); + } + else + { + MessageBox(hWnd, TEXT("You are not currently connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP); + } + break; + case ID_FILE_STARTCAPTURE: + if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK) + { + bCapturing = TRUE; + EnableStopCaptureMenuItem(TRUE); + EnableStartCaptureMenuItem(FALSE); + hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + } + break; + case ID_FILE_STOPCAPTURE: + if (bCapturing) + { + bCapturing = FALSE; + EnableStopCaptureMenuItem(FALSE); + EnableStartCaptureMenuItem(TRUE); + CloseHandle(hCaptureFile); + hCaptureFile = NULL; + } + break; + case ID_FILE_LOCALECHO: + if (bLocalEcho) + { + bLocalEcho = FALSE; + CheckLocalEchoMenuItem(bLocalEcho); + } + else + { + bLocalEcho = TRUE; + CheckLocalEchoMenuItem(bLocalEcho); + } + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); + } + break; + case WM_PAINT: + hdc = BeginPaint(hWnd, &ps); + EndPaint(hWnd, &ps); + break; + case WM_SIZE: - GetClientRect(hWnd, &rc); + GetClientRect(hWnd, &rc); - MoveWindow(hDisplayWnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top - 20, TRUE); - MoveWindow(hEditWnd, rc.left, rc.bottom - 20, rc.right - rc.left, 20, TRUE); + MoveWindow(hDisplayWnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top - 20, TRUE); + MoveWindow(hEditWnd, rc.left, rc.bottom - 20, rc.right - rc.left, 20, TRUE); - break; - case WM_DESTROY: - PostQuitMessage(0); - break; - default: - return DefWindowProc(hWnd, message, wParam, lParam); + break; + case WM_DESTROY: + PostQuitMessage(0); + break; + default: + return DefWindowProc(hWnd, message, wParam, lParam); } return 0; } LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - HWND hLicenseEditWnd; - TCHAR strLicense[0x1000]; + HWND hLicenseEditWnd; + TCHAR strLicense[0x1000]; - switch (message) - { - case WM_INITDIALOG: + switch (message) + { + case WM_INITDIALOG: - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); + LoadString(hInst, IDS_LICENSE, strLicense, 0x1000); - SetWindowText(hLicenseEditWnd, strLicense); + SetWindowText(hLicenseEditWnd, strLicense); - return TRUE; + return TRUE; - case WM_COMMAND: - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } + case WM_COMMAND: + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + } return FALSE; } LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) - { - case WM_INITDIALOG: + switch (message) + { + case WM_INITDIALOG: - SetWindowText(GetDlgItem(hDlg, IDC_COMPORT), strComPort); - SetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate); + SetWindowText(GetDlgItem(hDlg, IDC_COMPORT), strComPort); + SetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate); - return TRUE; + return TRUE; - case WM_COMMAND: - if (LOWORD(wParam) == IDOK) - { - GetWindowText(GetDlgItem(hDlg, IDC_COMPORT), strComPort, MAX_PATH); - GetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate, MAX_PATH); - } + case WM_COMMAND: + if (LOWORD(wParam) == IDOK) + { + GetWindowText(GetDlgItem(hDlg, IDC_COMPORT), strComPort, MAX_PATH); + GetWindowText(GetDlgItem(hDlg, IDC_BAUTRATE), strBaudRate, MAX_PATH); + } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + } return FALSE; } LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - OPENFILENAME ofn; + OPENFILENAME ofn; - switch (message) - { - case WM_INITDIALOG: + switch (message) + { + case WM_INITDIALOG: - SetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName); + SetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName); - return TRUE; + return TRUE; - case WM_COMMAND: - if (LOWORD(wParam) == IDC_BROWSE) - { - memset(&ofn, 0, sizeof(OPENFILENAME)); - ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = hDlg; - ofn.hInstance = hInst; - ofn.lpstrFilter = NULL; - ofn.lpstrCustomFilter = NULL; - ofn.nMaxCustFilter = 0; - ofn.nFilterIndex = 0; - ofn.lpstrFile = strCaptureFileName; - ofn.nMaxFile = MAX_PATH; - ofn.lpstrFileTitle = NULL; - ofn.nMaxFileTitle = 0; - ofn.lpstrInitialDir = NULL; - ofn.lpstrTitle = NULL; - ofn.Flags = OFN_HIDEREADONLY|OFN_NOREADONLYRETURN; + case WM_COMMAND: + if (LOWORD(wParam) == IDC_BROWSE) + { + memset(&ofn, 0, sizeof(OPENFILENAME)); + ofn.lStructSize = sizeof(OPENFILENAME); + ofn.hwndOwner = hDlg; + ofn.hInstance = hInst; + ofn.lpstrFilter = NULL; + ofn.lpstrCustomFilter = NULL; + ofn.nMaxCustFilter = 0; + ofn.nFilterIndex = 0; + ofn.lpstrFile = strCaptureFileName; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFileTitle = NULL; + ofn.nMaxFileTitle = 0; + ofn.lpstrInitialDir = NULL; + ofn.lpstrTitle = NULL; + ofn.Flags = OFN_HIDEREADONLY|OFN_NOREADONLYRETURN; - if (GetOpenFileName(&ofn)) - { - SetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName); - } - } + if (GetOpenFileName(&ofn)) + { + SetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName); + } + } - if (LOWORD(wParam) == IDOK) - { - GetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName, MAX_PATH); - } + if (LOWORD(wParam) == IDOK) + { + GetWindowText(GetDlgItem(hDlg, IDC_CAPTUREFILENAME), strCaptureFileName, MAX_PATH); + } - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - } + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) + { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + } return FALSE; } VOID EnableConnectMenuItem(BOOL Enable) { - HMENU hMenuBar; - HMENU hFileMenu; + HMENU hMenuBar; + HMENU hFileMenu; - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); + hMenuBar = GetMenu(hMainWnd); + hFileMenu = GetSubMenu(hMenuBar, 0); - if (Enable) - { - EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED); - } + if (Enable) + { + EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED); + } + else + { + EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED); + } } VOID EnableDisconnectMenuItem(BOOL Enable) { - HMENU hMenuBar; - HMENU hFileMenu; + HMENU hMenuBar; + HMENU hFileMenu; - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); + hMenuBar = GetMenu(hMainWnd); + hFileMenu = GetSubMenu(hMenuBar, 0); - if (Enable) - { - EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED); - } + if (Enable) + { + EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED); + } + else + { + EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED); + } } VOID EnableStartCaptureMenuItem(BOOL Enable) { - HMENU hMenuBar; - HMENU hFileMenu; + HMENU hMenuBar; + HMENU hFileMenu; - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); + hMenuBar = GetMenu(hMainWnd); + hFileMenu = GetSubMenu(hMenuBar, 0); - if (Enable) - { - EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED); - } + if (Enable) + { + EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED); + } + else + { + EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED); + } } VOID EnableStopCaptureMenuItem(BOOL Enable) { - HMENU hMenuBar; - HMENU hFileMenu; + HMENU hMenuBar; + HMENU hFileMenu; - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); + hMenuBar = GetMenu(hMainWnd); + hFileMenu = GetSubMenu(hMenuBar, 0); - if (Enable) - { - EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED); - } - else - { - EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED); - } + if (Enable) + { + EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED); + } + else + { + EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED); + } } VOID CheckLocalEchoMenuItem(BOOL Checked) { - HMENU hMenuBar; - HMENU hFileMenu; + HMENU hMenuBar; + HMENU hFileMenu; - hMenuBar = GetMenu(hMainWnd); - hFileMenu = GetSubMenu(hMenuBar, 0); + hMenuBar = GetMenu(hMainWnd); + hFileMenu = GetSubMenu(hMenuBar, 0); - if (Checked) - { - CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED); - } - else - { - CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED); - } + if (Checked) + { + CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED); + } + else + { + CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED); + } } VOID Rs232Thread(VOID* Parameter) { - BYTE Byte; - TCHAR String[MAX_PATH]; - MSG msg; - DWORD dwNumberOfBytesWritten; + BYTE Byte; + TCHAR String[MAX_PATH]; + MSG msg; + DWORD dwNumberOfBytesWritten; - dwThreadId = GetCurrentThreadId(); + dwThreadId = GetCurrentThreadId(); - if (!Rs232OpenPortWin32(strComPort)) - { - MessageBox(hMainWnd, TEXT("Error opening port!"), TEXT("Error"), MB_OK|MB_ICONSTOP); - bConnected = FALSE; - return; - } + if (!Rs232OpenPortWin32(strComPort)) + { + MessageBox(hMainWnd, TEXT("Error opening port!"), TEXT("Error"), MB_OK|MB_ICONSTOP); + bConnected = FALSE; + return; + } - _stprintf(String, TEXT("%s,n,8,1"), strBaudRate); - if (!Rs232ConfigurePortWin32(String)) - { - MessageBox(hMainWnd, TEXT("Error configuring port!"), TEXT("Error"), MB_OK|MB_ICONSTOP); - bConnected = FALSE; - return; - } + _stprintf(String, TEXT("%s,n,8,1"), strBaudRate); + if (!Rs232ConfigurePortWin32(String)) + { + MessageBox(hMainWnd, TEXT("Error configuring port!"), TEXT("Error"), MB_OK|MB_ICONSTOP); + bConnected = FALSE; + return; + } - while (bConnected) - { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_CHAR) - { - Rs232WriteByteWin32((BYTE)msg.wParam); + while (bConnected) + { + if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_CHAR) + { + Rs232WriteByteWin32((BYTE)msg.wParam); - if (bLocalEcho && msg.wParam != (WPARAM)TEXT('\r')) - { - PostMessage(hDisplayWnd, WM_CHAR, (WPARAM)msg.wParam, (LPARAM)0); + if (bLocalEcho && msg.wParam != (WPARAM)TEXT('\r')) + { + PostMessage(hDisplayWnd, WM_CHAR, (WPARAM)msg.wParam, (LPARAM)0); - if (hCaptureFile) - { - WriteFile(hCaptureFile, &msg.wParam, sizeof(TCHAR), &dwNumberOfBytesWritten, NULL); - } - } - } - } + if (hCaptureFile) + { + WriteFile(hCaptureFile, &msg.wParam, sizeof(TCHAR), &dwNumberOfBytesWritten, NULL); + } + } + } + } - if (Rs232ReadByteWin32(&Byte)) - { - _stprintf(String, TEXT("%c"), Byte); + if (Rs232ReadByteWin32(&Byte)) + { + _stprintf(String, TEXT("%c"), Byte); - PostMessage(hDisplayWnd, WM_CHAR, (WPARAM)String[0], (LPARAM)0); + PostMessage(hDisplayWnd, WM_CHAR, (WPARAM)String[0], (LPARAM)0); - if (hCaptureFile) - { - WriteFile(hCaptureFile, &String[0], sizeof(TCHAR), &dwNumberOfBytesWritten, NULL); - } - } - } + if (hCaptureFile) + { + WriteFile(hCaptureFile, &String[0], sizeof(TCHAR), &dwNumberOfBytesWritten, NULL); + } + } + } - dwThreadId = 0; - Rs232ClosePortWin32(); + dwThreadId = 0; + Rs232ClosePortWin32(); }

1 0

[sedwards] 64: added freeldr isoboot code as well as openfirmware boot code. Added freeldr debugger by Brian Palmer
by sedwards＠svn.reactos.org 31 Jan '06

31 Jan '06

added freeldr isoboot code as well as openfirmware boot code. Added freeldr debugger by Brian Palmer Added: trunk/reactos/boot/freeldr/bootsect/ Added: trunk/reactos/boot/freeldr/bootsect/isoboot.asm Added: trunk/reactos/boot/freeldr/bootsect/ofwboot.s Added: trunk/reactos/boot/freeldr/fdebug/ Added: trunk/reactos/boot/freeldr/fdebug/De.rc Added: trunk/reactos/boot/freeldr/fdebug/En.rc Added: trunk/reactos/boot/freeldr/fdebug/Hu.rc Added: trunk/reactos/boot/freeldr/fdebug/Ja.rc Added: trunk/reactos/boot/freeldr/fdebug/Pl.rc Added: trunk/reactos/boot/freeldr/fdebug/Tr.rc Added: trunk/reactos/boot/freeldr/fdebug/fdebug.c Added: trunk/reactos/boot/freeldr/fdebug/fdebug.ico Added: trunk/reactos/boot/freeldr/fdebug/fdebug.rc Added: trunk/reactos/boot/freeldr/fdebug/resource.h Added: trunk/reactos/boot/freeldr/fdebug/rs232.c Added: trunk/reactos/boot/freeldr/fdebug/rs232.h _____ Added: trunk/reactos/boot/freeldr/bootsect/isoboot.asm --- trunk/reactos/boot/freeldr/bootsect/isoboot.asm 2006-01-31 07:37:05 UTC (rev 63) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.asm 2006-01-31 18:58:49 UTC (rev 64) @@ -0,0 +1,1015 @@ +; ************************************************************************ **** +; +; isolinux.asm +; +; A program to boot Linux kernels off a CD-ROM using the El Torito +; boot standard in "no emulation" mode, making the entire filesystem +; available. It is based on the SYSLINUX boot loader for MS-DOS +; floppies. +; +; Copyright (C) 1994-2001 H. Peter Anvin +; +; This program 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, Inc., 675 Mass Ave, Cambridge MA 02139, +; USA; either version 2 of the License, or (at your option) any later +; version; incorporated herein by reference. +; +; ************************************************************************ **** +; +; THIS FILE IS A MODIFIED VERSION OF ISOLINUX.ASM +; MODIFICATION DONE BY MICHAEL K TER LOUW +; LAST UPDATED 3-9-2002 +; SEE "COPYING" FOR INFORMATION ABOUT THE LICENSE THAT APPLIES TO THIS RELEASE +; +; ************************************************************************ **** +; +; This file is a modified version of ISOLINUX.ASM. +; Modification done by Eric Kohl +; Last update 04-25-2002 +; +; ************************************************************************ **** + +; Note: The Makefile builds one version with DEBUG_MESSAGES automatically. +;%define DEBUG_MESSAGES ; Uncomment to get debugging messages + +%define WAIT_FOR_KEY + + +; ------------------------------------------------------------------------ --- +; BEGIN THE BIOS/CODE/DATA SEGMENT +; ------------------------------------------------------------------------ --- + + absolute 0400h +serial_base resw 4 ; Base addresses for 4 serial ports + absolute 0413h +BIOS_fbm resw 1 ; Free Base Memory (kilobytes) + absolute 046Ch +BIOS_timer resw 1 ; Timer ticks + absolute 0472h +BIOS_magic resw 1 ; BIOS reset magic + absolute 0484h +BIOS_vidrows resb 1 ; Number of screen rows + +; +; Memory below this point is reserved for the BIOS and the MBR +; + absolute 1000h +trackbuf resb 8192 ; Track buffer goes here +trackbufsize equ $-trackbuf +; trackbuf ends at 3000h + + struc open_file_t +file_sector resd 1 ; Sector pointer (0 = structure free) +file_left resd 1 ; Number of sectors left + endstruc + + struc dir_t +dir_lba resd 1 ; Directory start (LBA) +dir_len resd 1 ; Length in bytes +dir_clust resd 1 ; Length in clusters + endstruc + + +MAX_OPEN_LG2 equ 2 ; log2(Max number of open files) +MAX_OPEN equ (1 << MAX_OPEN_LG2) +SECTORSIZE_LG2 equ 11 ; 2048 bytes/sector (El Torito requirement) +SECTORSIZE equ (1 << SECTORSIZE_LG2) +CR equ 13 ; Carriage Return +LF equ 10 ; Line Feed +retry_count equ 6 ; How patient are we with the BIOS? + + + + absolute 5000h ; Here we keep our BSS stuff + +DriveNo resb 1 ; CD-ROM BIOS drive number +DiskError resb 1 ; Error code for disk I/O +RetryCount resb 1 ; Used for disk access retries +TimeoutCount resb 1 ; Timeout counter +ISOFlags resb 1 ; Flags for ISO directory search +RootDir resb dir_t_size ; Root directory +CurDir resb dir_t_size ; Current directory +ISOFileName resb 64 ; ISO filename canonicalization buffer +ISOFileNameEnd equ $ + + + alignb open_file_t_size +Files resb MAX_OPEN*open_file_t_size + + + + section .text + org 7000h + +start: + cli ; Disable interrupts + xor ax, ax ; ax = segment zero + mov ss, ax ; Initialize stack segment + mov sp, start ; Set up stack + mov ds, ax ; Initialize other segment registers + mov es, ax + mov fs, ax + mov gs, ax + sti ; Enable interrupts + cld ; Increment pointers + + mov cx, 2048 >> 2 ; Copy the bootsector + mov si, 0x7C00 ; from 0000:7C00 + mov di, 0x7000 ; to 0000:7000 + rep movsd ; copy the program + jmp 0:relocate ; jump into relocated code + +relocate: + ; Display the banner and copyright +%ifdef DEBUG_MESSAGES + mov si, isolinux_banner ; si points to hello message + call writestr ; display the message + mov si,copyright_str + call writestr +%endif + + + ; Make sure the keyboard buffer is empty +%ifdef WAIT_FOR_KEY +.kbd_buffer_test: + call pollchar + jz .kbd_buffer_empty + call getchar + jmp .kbd_buffer_test +.kbd_buffer_empty: + + ; Check if there is harddisk + pusha + mov ax, 0800h + mov dx, 0080h + int 13h + popa + jc .boot_cdrom + + ; Display the 'Press key' message and wait for a maximum of 5 seconds + call crlf + mov si, presskey_msg ; si points to 'Press key' message + call writestr ; display the message + + mov byte [TimeoutCount], 5 +.next_second: + mov eax, [BIOS_timer] ; load current tick counter + add eax, 19 ; + +.poll_again: + call pollchar + jnz .boot_cdrom + + mov ebx, [BIOS_timer] + cmp eax, ebx + jnz .poll_again + + mov si, dot_msg ; print '.' + call writestr + dec byte [TimeoutCount] ; decrement timeout counter + jz .boot_harddisk + jmp .next_second + +.boot_harddisk: + call crlf + + ; Boot first harddisk (drive 0x80) + mov ax, 0201h + mov dx, 0080h + mov cx, 0001h + mov bx, 7C00h + int 13h + jnc .go_hd + jmp kaboom +.go_hd: + mov ax, cs + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + mov dx, 0080h + + jmp 0:0x7C00 +%endif + +.boot_cdrom: +%ifdef WAIT_FOR_KEY + call crlf + call crlf +%endif + + ; Save and display the boot drive number + mov [DriveNo], dl +%ifdef DEBUG_MESSAGES + mov si, startup_msg + call writemsg + mov al, dl + call writehex2 + call crlf +%endif + + ; Now figure out what we're actually doing + ; Note: use passed-in DL value rather than 7Fh because + ; at least some BIOSes will get the wrong value otherwise + mov ax, 4B01h ; Get disk emulation status + mov dl, [DriveNo] + mov si, spec_packet + int 13h + jc near spec_query_failed ; Shouldn't happen (BIOS bug) + mov dl, [DriveNo] + cmp [sp_drive], dl ; Should contain the drive number + jne near spec_query_failed + +%ifdef DEBUG_MESSAGES + mov si, spec_ok_msg + call writemsg + mov al, byte [sp_drive] + call writehex2 + call crlf +%endif + +found_drive: + ; Get drive information + mov ah, 48h + mov dl, [DriveNo] + mov si, drive_params + int 13h + jnc params_ok + + ; mov si, nosecsize_msg No use in reporting this + ; call writemsg + +params_ok: + ; Check for the sector size (should be 2048, but + ; some BIOSes apparently think we're 512-byte media) + ; + ; FIX: We need to check what the proper behaviour + ; is for getlinsec when the BIOS thinks the sector + ; size is 512!!! For that, we need such a BIOS, though... +%ifdef DEBUG_MESSAGES + mov si, secsize_msg + call writemsg + mov ax, [dp_secsize] + call writehex4 + call crlf +%endif + + + ; + ; Clear Files structures + ; + mov di, Files + mov cx, (MAX_OPEN*open_file_t_size)/4 + xor eax, eax + rep stosd + + ; + ; Now, we need to sniff out the actual filesystem data structures. + ; mkisofs gave us a pointer to the primary volume descriptor + ; (which will be at 16 only for a single-session disk!); from the PVD + ; we should be able to find the rest of what we need to know. + ; +get_fs_structures: + mov eax, 16 ; Primary Volume Descriptor (sector 16) + mov bx, trackbuf + call getonesec + + mov eax, [trackbuf+156+2] + mov [RootDir+dir_lba],eax + mov [CurDir+dir_lba],eax +%ifdef DEBUG_MESSAGES + mov si, rootloc_msg + call writemsg + call writehex8 + call crlf +%endif + + mov eax,[trackbuf+156+10] + mov [RootDir+dir_len],eax + mov [CurDir+dir_len],eax +%ifdef DEBUG_MESSAGES + mov si, rootlen_msg + call writemsg + call writehex8 + call crlf +%endif + add eax,SECTORSIZE-1 + shr eax,SECTORSIZE_LG2 + mov [RootDir+dir_clust],eax + mov [CurDir+dir_clust],eax +%ifdef DEBUG_MESSAGES + mov si, rootsect_msg + call writemsg + call writehex8 + call crlf +%endif + + ; Look for the "REACTOS" directory, and if found, + ; make it the current directory instead of the root + ; directory. + mov di,isolinux_dir + mov al,02h ; Search for a directory + call searchdir_iso + jnz .dir_found + mov si,no_dir_msg + call writemsg + jmp kaboom + +.dir_found: + mov [CurDir+dir_len],eax + mov eax,[si+file_left] + mov [CurDir+dir_clust],eax + xor eax,eax ; Free this file pointer entry + xchg eax,[si+file_sector] + mov [CurDir+dir_lba],eax + + + mov di, isolinux_bin ; di points to Isolinux filename + call searchdir ; look for the file + jnz .isolinux_opened ; got the file + mov si, no_isolinux_msg ; si points to error message + call writemsg ; display the message + jmp kaboom ; fail boot + +.isolinux_opened: + mov di, si ; save file pointer + +%ifdef DEBUG_MESSAGES + mov si, filelen_msg + call writemsg + call writehex8 + call crlf +%endif + + mov ecx, eax ; calculate sector count + shr ecx, 11 + test eax, 0x7FF + jz .full_sector + inc ecx +.full_sector: + +%ifdef DEBUG_MESSAGES + mov eax, ecx + mov si, filesect_msg + call writemsg + call writehex8 + call crlf +%endif + + mov bx, 0x8000 ; bx = load address + mov si, di ; restore file pointer + mov cx, 0xFFFF ; load the whole file + call getfssec ; get the whole file + +%ifdef DEBUG_MESSAGES + mov si, startldr_msg + call writemsg + call crlf +%endif + + mov dl, [DriveNo] ; dl = boot drive + mov dh, 0 ; dh = boot partition + jmp 0:0x8000 ; jump into OSLoader + + + +; +; searchdir: +; +; Open a file +; +; On entry: +; DS:DI = filename +; If successful: +; ZF clear +; SI = file pointer +; DX:AX or EAX = file length in bytes +; If unsuccessful +; ZF set +; + +; +; searchdir_iso is a special entry point for ISOLINUX only. In addition +; to the above, searchdir_iso passes a file flag mask in AL. This is useful +; for searching for directories. +; +alloc_failure: + xor ax,ax ; ZF <- 1 + ret + +searchdir: + xor al,al +searchdir_iso: + mov [ISOFlags],al + call allocate_file ; Temporary file structure for directory + jnz alloc_failure + push es + push ds + pop es ; ES = DS + mov si,CurDir + cmp byte [di],'\' ; If filename begins with slash + jne .not_rooted + inc di ; Skip leading slash + mov si,RootDir ; Reference root directory instead +.not_rooted: + mov eax,[si+dir_clust] + mov [bx+file_left],eax + mov eax,[si+dir_lba] + mov [bx+file_sector],eax + mov edx,[si+dir_len] + +.look_for_slash: + mov ax,di +.scan: + mov cl,[di] + inc di + and cl,cl + jz .isfile + cmp cl,'\' + jne .scan + mov [di-1],byte 0 ; Terminate at directory name + mov cl,02h ; Search for directory + xchg cl,[ISOFlags] + push di + push cx + push word .resume ; Where to "return" to + push es +.isfile: + xchg ax,di + +.getsome: + ; Get a chunk of the directory + mov si,trackbuf + pushad + xchg bx,si + mov cx,1 ; load one sector + call getfssec + popad + +.compare: + movzx eax, byte [si] ; Length of directory entry + cmp al, 33 + jb .next_sector + mov cl, [si+25] + xor cl, [ISOFlags] + test cl, byte 8Eh ; Unwanted file attributes! + jnz .not_file + pusha + movzx cx, byte [si+32] ; File identifier length + add si, byte 33 ; File identifier offset + call iso_compare_names + popa + je .success +.not_file: + sub edx, eax ; Decrease bytes left + jbe .failure + add si, ax ; Advance pointer + +.check_overrun: + ; Did we finish the buffer? + cmp si, trackbuf+trackbufsize + jb .compare ; No, keep going + + jmp short .getsome ; Get some more directory + +.next_sector: + ; Advance to the beginning of next sector + lea ax, [si+SECTORSIZE-1] + and ax, ~(SECTORSIZE-1) + sub ax, si + jmp short .not_file ; We still need to do length checks + +.failure: +%ifdef DEBUG_MESSAGES + mov si, findfail_msg + call writemsg + call crlf +%endif + xor eax, eax ; ZF = 1 + mov [bx+file_sector], eax + pop es + ret + +.success: + mov eax, [si+2] ; Location of extent + mov [bx+file_sector], eax + mov eax, [si+10] ; Data length + push eax + add eax, SECTORSIZE-1 + shr eax, SECTORSIZE_LG2 + mov [bx+file_left], eax + pop eax + mov edx, eax + shr edx, 16 + and bx, bx ; ZF = 0 + mov si, bx + pop es + ret + +.resume: + ; We get here if we were only doing part of a lookup + ; This relies on the fact that .success returns bx == si + xchg edx, eax ; Directory length in edx + pop cx ; Old ISOFlags + pop di ; Next filename pointer + + mov byte [di-1], '\' ; restore the backslash in the filename + + mov [ISOFlags], cl ; Restore the flags + jz .failure ; Did we fail? If so fail for real! + jmp .look_for_slash ; Otherwise, next level + +; +; allocate_file: Allocate a file structure +; +; If successful: +; ZF set +; BX = file pointer +; In unsuccessful: +; ZF clear +; +allocate_file: + push cx + mov bx, Files + mov cx, MAX_OPEN +.check: + cmp dword [bx], byte 0 + je .found + add bx, open_file_t_size ; ZF = 0 + loop .check + ; ZF = 0 if we fell out of the loop +.found: + pop cx + ret + +; +; iso_compare_names: +; Compare the names DS:SI and DS:DI and report if they are +; equal from an ISO 9660 perspective. SI is the name from +; the filesystem; CX indicates its length, and ';' terminates. +; DI is expected to end with a null. +; +; Note: clobbers AX, CX, SI, DI; assumes DS == ES == base segment +; +iso_compare_names: + ; First, terminate and canonicalize input filename + push di + mov di, ISOFileName +.canon_loop: + jcxz .canon_end + lodsb + dec cx + cmp al, ';' + je .canon_end + and al, al + je .canon_end + stosb + cmp di, ISOFileNameEnd-1 ; Guard against buffer overrun + jb .canon_loop +.canon_end: + cmp di, ISOFileName + jbe .canon_done + cmp byte [di-1], '.' ; Remove terminal dots + jne .canon_done + dec di + jmp short .canon_end +.canon_done: + mov [di], byte 0 ; Null-terminate string + pop di + mov si, ISOFileName +.compare: + lodsb + mov ah, [di] + inc di + and ax, ax + jz .success ; End of string for both + and al, al ; Is either one end of string? + jz .failure ; If so, failure + and ah, ah + jz .failure + or ax, 2020h ; Convert to lower case + cmp al, ah + je .compare +.failure: + and ax, ax ; ZF = 0 (at least one will be nonzero) +.success: + ret + + + + + + + +; +; getfssec: Get multiple clusters from a file, given the file pointer. +; +; On entry: +; ES:BX -> Buffer +; SI -> File pointer +; CX -> Cluster count; 0FFFFh = until end of file +; On exit: +; SI -> File pointer (or 0 on EOF) +; CF = 1 -> Hit EOF +; +getfssec: + cmp cx, [si+file_left] + jna .ok_size + mov cx, [si+file_left] + +.ok_size: + mov bp, cx + push cx + push si + mov eax, [si+file_sector] + call getlinsec + xor ecx, ecx + pop si + pop cx + + add [si+file_sector], ecx + sub [si+file_left], ecx + ja .not_eof ; CF = 0 + + xor ecx, ecx + mov [si+file_sector], ecx ; Mark as unused + xor si,si + stc + +.not_eof: + ret + + + +; INT 13h, AX=4B01h, DL=<passed in value> failed. +; Try to scan the entire 80h-FFh from the end. +spec_query_failed: + mov si,spec_err_msg + call writemsg + + mov dl, 0FFh +.test_loop: + pusha + mov ax, 4B01h + mov si, spec_packet + mov byte [si], 13 ; Size of buffer + int 13h + popa + jc .still_broken + + mov si, maybe_msg + call writemsg + mov al, dl + call writehex2 + call crlf + + cmp byte [sp_drive], dl + jne .maybe_broken + + ; Okay, good enough... + mov si, alright_msg + call writemsg + mov [DriveNo], dl +.found_drive: + jmp found_drive + + ; Award BIOS 4.51 apparently passes garbage in sp_drive, + ; but if this was the drive number originally passed in + ; DL then consider it "good enough" +.maybe_broken: + cmp byte [DriveNo], dl + je .found_drive + +.still_broken: + dec dx + cmp dl, 80h + jnb .test_loop + +fatal_error: + mov si, nothing_msg + call writemsg + +.norge: + jmp short .norge + + + + ; Information message (DS:SI) output + ; Prefix with "isolinux: " + ; +writemsg: + push ax + push si + mov si, isolinux_str + call writestr + pop si + call writestr + pop ax + ret + +; +; crlf: Print a newline +; +crlf: + mov si, crlf_msg + ; Fall through + +; +; writestr: write a null-terminated string to the console, saving +; registers on entry. +; +writestr: + pushfd + pushad +.top: + lodsb + and al, al + jz .end + call writechr + jmp short .top +.end: + popad + popfd + ret + + +; +; writehex[248]: Write a hex number in (AL, AX, EAX) to the console +; +writehex2: + pushfd + pushad + shl eax, 24 + mov cx, 2 + jmp short writehex_common +writehex4: + pushfd + pushad + shl eax, 16 + mov cx, 4 + jmp short writehex_common +writehex8: + pushfd + pushad + mov cx, 8 +writehex_common: +.loop: + rol eax, 4 + push eax + and al, 0Fh + cmp al, 10 + jae .high +.low: + add al, '0' + jmp short .ischar +.high: + add al, 'A'-10 +.ischar: + call writechr + pop eax + loop .loop + popad + popfd + ret + +; +; Write a character to the screen. There is a more "sophisticated" +; version of this in the subsequent code, so we patch the pointer +; when appropriate. +; + +writechr: + pushfd + pushad + mov ah, 0Eh + xor bx, bx + int 10h + popad + popfd + ret + +; +; Get one sector. Convenience entry point. +; +getonesec: + mov bp, 1 + ; Fall through to getlinsec + +; +; Get linear sectors - EBIOS LBA addressing, 2048-byte sectors. +; +; Note that we can't always do this as a single request, because at least +; Phoenix BIOSes has a 127-sector limit. To be on the safe side, stick +; to 32 sectors (64K) per request. +; +; Input: +; EAX - Linear sector number +; ES:BX - Target buffer +; BP - Sector count +; +getlinsec: + mov si,dapa ; Load up the DAPA + mov [si+4],bx + mov bx,es + mov [si+6],bx + mov [si+8],eax +.loop2: + push bp ; Sectors left + cmp bp,[MaxTransfer] + jbe .bp_ok + mov bp,[MaxTransfer] +.bp_ok: + mov [si+2],bp + push si + mov dl,[DriveNo] + mov ah,42h ; Extended Read + call xint13 + pop si + pop bp + movzx eax,word [si+2] ; Sectors we read + add [si+8],eax ; Advance sector pointer + sub bp,ax ; Sectors left + shl ax,SECTORSIZE_LG2-4 ; 2048-byte sectors -> segment + add [si+6],ax ; Advance buffer pointer + and bp,bp + jnz .loop2 + mov eax,[si+8] ; Next sector + ret + + ; INT 13h with retry +xint13: + mov byte [RetryCount], retry_count +.try: + pushad + int 13h + jc .error + add sp, byte 8*4 ; Clean up stack + ret +.error: + mov [DiskError], ah ; Save error code + popad + dec byte [RetryCount] + jz .real_error + push ax + mov al,[RetryCount] + mov ah,[dapa+2] ; Sector transfer count + cmp al,2 ; Only 2 attempts left + ja .nodanger + mov ah,1 ; Drop transfer size to 1 + jmp short .setsize +.nodanger: + cmp al,retry_count-2 + ja .again ; First time, just try again + shr ah,1 ; Otherwise, try to reduce + adc ah,0 ; the max transfer size, but not to 0 +.setsize: + mov [MaxTransfer],ah + mov [dapa+2],ah +.again: + pop ax + jmp .try + +.real_error: + mov si, diskerr_msg + call writemsg + mov al, [DiskError] + call writehex2 + mov si, ondrive_str + call writestr + mov al, dl + call writehex2 + call crlf + ; Fall through to kaboom + +; +; kaboom: write a message and bail out. Wait for a user keypress, +; then do a hard reboot. +; +kaboom: + mov ax, cs + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + sti + mov si, err_bootfailed + call writestr + call getchar + cli + mov word [BIOS_magic], 0 ; Cold reboot + jmp 0F000h:0FFF0h ; Reset vector address + +getchar: +.again: + mov ah, 1 ; Poll keyboard + int 16h + jz .again +.kbd: + xor ax, ax ; Get keyboard input + int 16h +.func_key: + ret + + +; +; pollchar: check if we have an input character pending (ZF = 0) +; +pollchar: + pushad + mov ah,1 ; Poll keyboard + int 16h + popad + ret + + + +isolinux_banner db CR, LF, 'Loading IsoBoot...', CR, LF, 0 +copyright_str db ' Copyright (C) 1994-2002 H. Peter Anvin', CR, LF, 0 +presskey_msg db 'Press any key to boot from CD', 0 +dot_msg db '.',0 + +%ifdef DEBUG_MESSAGES +startup_msg: db 'Starting up, DL = ', 0 +spec_ok_msg: db 'Loaded spec packet OK, drive = ', 0 +secsize_msg: db 'Sector size appears to be ', 0 +rootloc_msg: db 'Root directory location: ', 0 +rootlen_msg: db 'Root directory length: ', 0 +rootsect_msg: db 'Root directory length(sectors): ', 0 +fileloc_msg: db 'SETUPLDR.SYS location: ', 0 +filelen_msg: db 'SETUPLDR.SYS length: ', 0 +filesect_msg: db 'SETUPLDR.SYS length(sectors): ', 0 +findfail_msg: db 'Failed to find file!', 0 +startldr_msg: db 'Starting SETUPLDR.SYS', 0 +%endif + +nosecsize_msg: db 'Failed to get sector size, assuming 0800', CR, LF, 0 +spec_err_msg: db 'Loading spec packet failed, trying to wing it...', CR, LF, 0 +maybe_msg: db 'Found something at drive = ', 0 +alright_msg: db 'Looks like it might be right, continuing...', CR, LF, 0 +nothing_msg: db 'Failed to locate CD-ROM device; boot failed.', CR, LF, 0 +isolinux_str db 'IsoBoot: ', 0 +crlf_msg db CR, LF, 0 +diskerr_msg: db 'Disk error ', 0 +ondrive_str: db ', drive ', 0 +err_bootfailed db CR, LF, 'Boot failed: press a key to retry...' +isolinux_dir db '\LOADER', 0 +no_dir_msg db 'Could not find the LOADER directory.', CR, LF, 0 +isolinux_bin db 'SETUPLDR.SYS', 0 +no_isolinux_msg db 'Could not find SETUPLDR.SYS.', CR, LF, 0 + +; +; El Torito spec packet +; + align 8, db 0 +spec_packet: db 13h ; Size of packet +sp_media: db 0 ; Media type +sp_drive: db 0 ; Drive number +sp_controller: db 0 ; Controller index +sp_lba: dd 0 ; LBA for emulated disk image +sp_devspec: dw 0 ; IDE/SCSI information +sp_buffer: dw 0 ; User-provided buffer +sp_loadseg: dw 0 ; Load segment +sp_sectors: dw 0 ; Sector count +sp_chs: db 0,0,0 ; Simulated CHS geometry +sp_dummy: db 0 ; Scratch, safe to overwrite + +; +; EBIOS drive parameter packet +; + align 8, db 0 +drive_params: dw 30 ; Buffer size +dp_flags: dw 0 ; Information flags +dp_cyl: dd 0 ; Physical cylinders +dp_head: dd 0 ; Physical heads +dp_sec: dd 0 ; Physical sectors/track +dp_totalsec: dd 0,0 ; Total sectors +dp_secsize: dw 0 ; Bytes per sector +dp_dpte: dd 0 ; Device Parameter Table +dp_dpi_key: dw 0 ; 0BEDDh if rest valid +dp_dpi_len: db 0 ; DPI len + db 0 + dw 0 +dp_bus: times 4 db 0 ; Host bus type +dp_interface: times 8 db 0 ; Interface type +db_i_path: dd 0,0 ; Interface path [truncated at 1000 lines; 3426 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs