Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 13: Move over all the code which I have written from scratch (i.e. no other developer has contributed to)
by gedmurphy＠svn.reactos.org 28 Jan '06

28 Jan '06

Move over all the code which I have written from scratch (i.e. no other developer has contributed to) This code was written without the aid of any dissasemblies. It's just made up as I go along, thus there is no documentation either Added: trunk/reactos/base/ Added: trunk/reactos/base/applications/ Added: trunk/reactos/base/applications/network/ Added: trunk/reactos/base/applications/network/arp/ Added: trunk/reactos/base/applications/network/arp/arp.c Added: trunk/reactos/base/applications/network/arp/arp.rbuild Added: trunk/reactos/base/applications/network/arp/arp.rc Added: trunk/reactos/base/applications/network/ipconfig/ Added: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Added: trunk/reactos/base/applications/network/ipconfig/ipconfig.rbuild Added: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Added: trunk/reactos/base/applications/network/netstat/ Added: trunk/reactos/base/applications/network/netstat/netstat.c Added: trunk/reactos/base/applications/network/netstat/netstat.h Added: trunk/reactos/base/applications/network/netstat/netstat.rbuild Added: trunk/reactos/base/applications/network/netstat/netstat.rc Added: trunk/reactos/base/applications/network/tracert/ Added: trunk/reactos/base/applications/network/tracert/tracert.c Added: trunk/reactos/base/applications/network/tracert/tracert.h Added: trunk/reactos/base/applications/network/tracert/tracert.rbuild Added: trunk/reactos/base/applications/network/tracert/tracert.rc Added: trunk/reactos/base/services/ Added: trunk/reactos/base/services/tcpsvcs/ Added: trunk/reactos/base/services/tcpsvcs/chargen.c Added: trunk/reactos/base/services/tcpsvcs/daytime.c Added: trunk/reactos/base/services/tcpsvcs/discard.c Added: trunk/reactos/base/services/tcpsvcs/echo.c Added: trunk/reactos/base/services/tcpsvcs/qotd.c Added: trunk/reactos/base/services/tcpsvcs/quotes Added: trunk/reactos/base/services/tcpsvcs/skelserver.c Added: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c Added: trunk/reactos/base/services/tcpsvcs/tcpsvcs.h Added: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild Added: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rc Added: trunk/reactos/base/system/ Added: trunk/reactos/base/system/sc/ Added: trunk/reactos/base/system/sc/control.c Added: trunk/reactos/base/system/sc/create.c Added: trunk/reactos/base/system/sc/delete.c Added: trunk/reactos/base/system/sc/query.c Added: trunk/reactos/base/system/sc/sc.c Added: trunk/reactos/base/system/sc/sc.h Added: trunk/reactos/base/system/sc/sc.rbuild Added: trunk/reactos/base/system/sc/sc.rc Added: trunk/reactos/base/system/sc/start.c Added: trunk/reactos/base/system/sc/usage.c Added: trunk/reactos/base/system/servman/ Added: trunk/reactos/base/system/servman/De.rc Added: trunk/reactos/base/system/servman/En.rc Added: trunk/reactos/base/system/servman/about.c Added: trunk/reactos/base/system/servman/control.c Added: trunk/reactos/base/system/servman/geterror.c Added: trunk/reactos/base/system/servman/progress.c Added: trunk/reactos/base/system/servman/propsheet.c Added: trunk/reactos/base/system/servman/query.c Added: trunk/reactos/base/system/servman/res/ Added: trunk/reactos/base/system/servman/res/system.ico Added: trunk/reactos/base/system/servman/res/toolbar.bmp Added: trunk/reactos/base/system/servman/resource.h Added: trunk/reactos/base/system/servman/servman.c Added: trunk/reactos/base/system/servman/servman.h Added: trunk/reactos/base/system/servman/servman.rbuild Added: trunk/reactos/base/system/servman/servman.rc Added: trunk/reactos/base/system/servman/start.c Added: trunk/reactos/base/system/servman/test.rc Property changes on: trunk/reactos/base/applications/network/arp ___________________________________________________________________ Name: ros:doc + ReactOS arp is a visual copy of the Windows version, however this code was written from scratch without any reverse-engineering _____ Added: trunk/reactos/base/applications/network/arp/arp.c --- trunk/reactos/base/applications/network/arp/arp.c 2006-01-28 17:39:13 UTC (rev 12) +++ trunk/reactos/base/applications/network/arp/arp.c 2006-01-28 17:44:29 UTC (rev 13) @@ -0,0 +1,600 @@ +/* + * PROJECT: ReactOS arp utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/network/arp/arp.c + * PURPOSE: view and manipulate the ARP cache + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <tchar.h> +#include <string.h> +#include <ctype.h> +#include <winsock2.h> +#include <iphlpapi.h> + +#define UNICODE +#define _UNICODE + +/* + * Globals + */ +const char SEPERATOR = '-'; +int _CRT_glob = 0; // stop * from listing dir files in arp -d * + + +/* + * function declerations + */ +DWORD DoFormatMessage(VOID); +INT PrintEntries(PMIB_IPNETROW pIpAddRow); +INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr); +INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr); +VOID Usage(VOID); + + +/* + * convert error code into meaningful message + */ +DWORD DoFormatMessage(VOID) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + + DWORD ErrorCode = GetLastError(); + + if (ErrorCode != ERROR_SUCCESS) + { + RetVal = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ); + + if (RetVal != 0) + { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + } + return 0; +} + + + +/* + * + * Takes an ARP entry and prints the IP address, + * the MAC address and the entry type to screen + * + */ +INT PrintEntries(PMIB_IPNETROW pIpAddRow) +{ + IN_ADDR inaddr; + TCHAR cMacAddr[20]; + + /* print IP addresses */ + inaddr.S_un.S_addr = pIpAddRow->dwAddr; + _tprintf(_T(" %-22s"), inet_ntoa(inaddr)); + + /* print MAC address */ + _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + pIpAddRow->bPhysAddr[0], + pIpAddRow->bPhysAddr[1], + pIpAddRow->bPhysAddr[2], + pIpAddRow->bPhysAddr[3], + pIpAddRow->bPhysAddr[4], + pIpAddRow->bPhysAddr[5]); + _tprintf(_T("%-22s"), cMacAddr); + + /* print cache type */ + switch (pIpAddRow->dwType) + { + case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n")); + break; + case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n")); + break; + case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n")); + break; + case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n")); + break; + } + return EXIT_SUCCESS; +} + + +/* + * + * Takes optional parameters of an internet address and interface address. + * Retrieve all entries in the ARP cache. If an internet address is + * specified, display the ARP entry relating to that address. If an + * interface address is specified, display all entries relating to + * that interface. + * + */ +/* FIXME: allow user to specify an interface address, via pszIfAddr */ +INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +{ + INT iRet; + UINT i, k; + PMIB_IPNETTABLE pIpNetTable = NULL; + PMIB_IPADDRTABLE pIpAddrTable = NULL; + DWORD Size = 0; + struct in_addr inaddr, inaddr2; + PTCHAR pszIpAddr; + TCHAR szIntIpAddr[20]; + + /* retrieve the IP-to-physical address mapping table */ + + /* get table size */ + GetIpNetTable(pIpNetTable, &Size, 0); + + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpNetTable == NULL) + goto cleanup; + + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + + iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); + + if (iRet != NO_ERROR) + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + DoFormatMessage(); + goto cleanup; + } + + /* check there are entries in the table */ + if (pIpNetTable->dwNumEntries == 0) + { + _tprintf(_T("No ARP entires found\n")); + goto cleanup; + } + + + + /* Retrieve the interface-to-ip address mapping + * table to get the IP address for adapter */ + + /* get table size */ + Size = 0; + GetIpAddrTable(pIpAddrTable, &Size, 0); + + pIpAddrTable = (MIB_IPADDRTABLE *) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpAddrTable == NULL) + goto cleanup; + + ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); + + iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE); + + if (iRet != NO_ERROR) + { + _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); + DoFormatMessage(); + goto cleanup; + } + + + for (k=0; k < pIpAddrTable->dwNumEntries; k++) + { + if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) + { + //printf("debug print: pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex); + inaddr2.s_addr = pIpAddrTable->table[k].dwAddr; + pszIpAddr = inet_ntoa(inaddr2); + strcpy(szIntIpAddr, pszIpAddr); + } + } + + + /* print header, including interface IP address and index number */ + _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex); + _tprintf(_T(" Internet Address Physical Address Type\n")); + + /* go through all ARP entries */ + for (i=0; i < pIpNetTable->dwNumEntries; i++) + { + + /* if the user has supplied their own internet addesss * + * only print the arp entry which matches that */ + if (pszInetAddr) + { + inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr; + pszIpAddr = inet_ntoa(inaddr); + + /* check if it matches, print it */ + if (strcmp(pszIpAddr, pszInetAddr) == 0) + PrintEntries(&pIpNetTable->table[i]); + } + else + /* if an address is not supplied, print all entries */ + PrintEntries(&pIpNetTable->table[i]); + } + + return EXIT_SUCCESS; + +cleanup: + if (pIpNetTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpNetTable); + if (pIpAddrTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpAddrTable); + return EXIT_FAILURE; +} + + +/* + * + * Takes an internet address, a MAC address and an optional interface + * address as arguments and checks their validity. + * Fill out an MIB_IPNETROW structure and insert the data into the + * ARP cache as a static entry. + * + */ +INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr) +{ + PMIB_IPNETROW pAddHost = NULL; + PMIB_IPNETTABLE pIpNetTable = NULL; + DWORD dwIpAddr = 0; + ULONG Size = 0; + INT iRet, i, val, c; + + /* error checking */ + + /* check IP address */ + if (pszInetAddr != NULL) + { + if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { + _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + return EXIT_FAILURE; + } + } + else + { + Usage(); + return EXIT_FAILURE; + } + + /* check MAC address */ + if (strlen(pszEthAddr) != 17) + { + _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + return EXIT_FAILURE; + } + for (i=0; i<17; i++) + { + if (pszEthAddr[i] == SEPERATOR) + continue; + + if (!isxdigit(pszEthAddr[i])) + { + _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr); + return EXIT_FAILURE; + } + } + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(pIpNetTable, &Size, 0); + + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpNetTable == NULL) + goto cleanup; + + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + + iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); + + if (iRet != NO_ERROR) + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + DoFormatMessage(); + goto cleanup; + } + + + /* reserve memory on heap and zero */ + pAddHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + if (pAddHost == NULL) + goto cleanup; + + ZeroMemory(pAddHost, sizeof(MIB_IPNETROW)); + + /* set dwIndex field to the index of a local IP address to + * indicate the network on which the ARP entry applies */ + if (pszIfAddr) + { + if (sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex) == EOF) + { + goto cleanup; + } + } + else + { + //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex); + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pAddHost->dwIndex = pIpNetTable->table[0].dwIndex; + } + + /* Set MAC address to 6 bytes (typical) */ + pAddHost->dwPhysAddrLen = 6; + + + /* Encode bPhysAddr into correct byte array */ + for (i=0; i<6; i++) + { + val =0; + c = toupper(pszEthAddr[i*3]); + c = c - (isdigit(c) ? '0' : ('A' - 10)); + val += c; + val = (val << 4); + c = toupper(pszEthAddr[i*3 + 1]); + c = c - (isdigit(c) ? '0' : ('A' - 10)); + val += c; + pAddHost->bPhysAddr[i] = (BYTE)val; + } + + + /* copy converted IP address */ + pAddHost->dwAddr = dwIpAddr; + + + /* set type to static */ + pAddHost->dwType = MIB_IPNET_TYPE_STATIC; + + + /* Add the ARP entry */ + if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) + { + DoFormatMessage(); + goto cleanup; + } + + HeapFree(GetProcessHeap(), 0, pAddHost); + + return EXIT_SUCCESS; + +cleanup: + if (pIpNetTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpNetTable); + if (pAddHost != NULL) + HeapFree(GetProcessHeap(), 0, pAddHost); + return EXIT_FAILURE; +} + + +/* + * + * Takes an internet address and an optional interface address as + * arguments and checks their validity. + * Add the interface number and IP to an MIB_IPNETROW structure + * and remove the entry from the ARP cache. + * + */ +INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr) +{ + PMIB_IPNETROW pDelHost = NULL; + PMIB_IPNETTABLE pIpNetTable = NULL; + DWORD Size = 0; + DWORD dwIpAddr = 0; + INT iRet; + BOOL bFlushTable = FALSE; + + /* error checking */ + + /* check IP address */ + if (pszInetAddr != NULL) + { + /* if wildcard is given, set flag to delete all hosts */ + if (strncmp(pszInetAddr, "*", 1) == 0) + bFlushTable = TRUE; + else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) + { + _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr); + exit(EXIT_FAILURE); + } + } + else + { + Usage(); + exit(EXIT_FAILURE); + } + + /* We need the IpNetTable to get the adapter index */ + /* Return required buffer size */ + GetIpNetTable(NULL, &Size, 0); + + /* allocate memory for ARP address table */ + pIpNetTable = (PMIB_IPNETTABLE) HeapAlloc(GetProcessHeap(), 0, Size); + if (pIpNetTable == NULL) + goto cleanup; + + ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); + + iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); + + if (iRet != NO_ERROR) + { + _tprintf(_T("failed to allocate memory for GetIpNetTable\n")); + DoFormatMessage(); + goto cleanup; + } + + /* reserve memory on heap and zero */ + pDelHost = (MIB_IPNETROW *) HeapAlloc(GetProcessHeap(), 0, sizeof(MIB_IPNETROW)); + if (pDelHost == NULL) + goto cleanup; + + ZeroMemory(pDelHost, sizeof(MIB_IPNETROW)); + + + /* set dwIndex field to the index of a local IP address to + * indicate the network on which the ARP entry applies */ + if (pszIfAddr) + { + if (sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex) == EOF) + { + goto cleanup; + } + } + else + { + /* needs testing. I get the correct index on my machine, but need others + * to test their card index. Any problems and we can use GetAdaptersInfo instead */ + pDelHost->dwIndex = pIpNetTable->table[0].dwIndex; + } + + if (bFlushTable == TRUE) + { + /* delete arp cache */ + if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR) + { + DoFormatMessage(); + goto cleanup; + } + else + { + HeapFree(GetProcessHeap(), 0, pDelHost); + return EXIT_SUCCESS; + } + } + else + /* copy converted IP address */ + pDelHost->dwAddr = dwIpAddr; + + /* Add the ARP entry */ + if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR) + { + DoFormatMessage(); + goto cleanup; + } + + HeapFree(GetProcessHeap(), 0, pDelHost); + + return EXIT_SUCCESS; + +cleanup: + if (pIpNetTable != NULL) + HeapFree(GetProcessHeap(), 0, pIpNetTable); + if (pDelHost != NULL) + HeapFree(GetProcessHeap(), 0, pDelHost); + return EXIT_FAILURE; +} + + + +/* + * + * print program usage to screen + * + */ +VOID Usage(VOID) +{ + _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n" + "address resolution protocol (ARP).\n" + "\n" + "ARP -s inet_addr eth_addr [if_addr]\n" + "ARP -d inet_addr [if_addr]\n" + "ARP -a [inet_addr] [-N if_addr]\n" + "\n" + " -a Displays current ARP entries by interrogating the current\n" + " protocol data. If inet_addr is specified, the IP and Physical\n" + " addresses for only the specified computer are displayed. If\n" + " more than one network interface uses ARP, entries for each ARP\n" + " table are displayed.\n" + " -g Same as -a.\n" + " inet_addr Specifies an internet address.\n" + " -N if_addr Displays the ARP entries for the network interface specified\n" + " by if_addr.\n" + " -d Deletes the host specified by inet_addr. inet_addr may be\n" + " wildcarded with * to delete all hosts.\n" + " -s Adds the host and associates the Internet address inet_addr\n" + " with the Physical address eth_addr. The Physical address is\n" + " given as 6 hexadecimal bytes separated by hyphens. The entry\n" + " is permanent.\n" + " eth_addr Specifies a physical address.\n" + " if_addr If present, this specifies the Internet address of the\n" + " interface whose address translation table should be modified.\n" + " If not present, the first applicable interface will be used.\n" + "Example:\n" + " > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry.\n" + " > arp -a .... Displays the arp table.\n\n")); +} + + + +/* + * + * Program entry. + * Parse command line and call the required function + * + */ +INT main(int argc, char* argv[]) +{ + if ((argc < 2) || (argc > 5)) + { + Usage(); + return EXIT_FAILURE; + } + + if (argv[1][0] == '-') + { + switch (argv[1][1]) + { + case 'a': /* fall through */ + case 'g': + if (argc == 2) + DisplayArpEntries(NULL, NULL); + else if (argc == 3) + DisplayArpEntries(argv[2], NULL); + else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0)) + DisplayArpEntries(NULL, argv[3]); + else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0)) + DisplayArpEntries(argv[2], argv[4]); + else + Usage(); + return EXIT_FAILURE; + break; + case 'd': if (argc == 3) + Deletehost(argv[2], NULL); + else if (argc == 4) + Deletehost(argv[2], argv[3]); + else + Usage(); + return EXIT_FAILURE; + break; + case 's': if (argc == 4) + Addhost(argv[2], argv[3], NULL); + else if (argc == 5) + Addhost(argv[2], argv[3], argv[4]); + else + Usage(); + return EXIT_FAILURE; + break; + default: + Usage(); + return EXIT_FAILURE; + } + } + else + Usage(); + + return EXIT_SUCCESS; +} _____ Added: trunk/reactos/base/applications/network/arp/arp.rbuild --- trunk/reactos/base/applications/network/arp/arp.rbuild 2006-01-28 17:39:13 UTC (rev 12) +++ trunk/reactos/base/applications/network/arp/arp.rbuild 2006-01-28 17:44:29 UTC (rev 13) @@ -0,0 +1,11 @@ +<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> + _____ Added: trunk/reactos/base/applications/network/arp/arp.rc --- trunk/reactos/base/applications/network/arp/arp.rc 2006-01-28 17:39:13 UTC (rev 12) +++ trunk/reactos/base/applications/network/arp/arp.rc 2006-01-28 17:44:29 UTC (rev 13) @@ -0,0 +1,5 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 arp\0" +#define REACTOS_STR_INTERNAL_NAME "arp\0" +#define REACTOS_STR_ORIGINAL_FILENAME "arp.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy(a)gmail.com)\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/base/applications/network/ipconfig ___________________________________________________________________ Name: ros:doc + ReactOS ipconfig is a visual copy of the Windows version, however this code was written from scratch without any reverse-engineering _____ Added: trunk/reactos/base/applications/network/ipconfig/ipconfig.c --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c 2006-01-28 17:39:13 UTC (rev 12) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c 2006-01-28 17:44:29 UTC (rev 13) @@ -0,0 +1,514 @@ +/* + * PROJECT: ReactOS ipconfig utility + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/network/ipconfig/ipconfig.c + * PURPOSE: Control access to a resource + * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + + +/* + * TODO: + * fix renew / release + * implement flushdns, registerdns, displaydns, showclassid, setclassid + * allow globbing on adapter names + */ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <time.h> +#include <tchar.h> +#include <string.h> +#include <ctype.h> +#include <winsock2.h> +#include <iphlpapi.h> + +#define UNICODE +#define _UNICODE + + + +LPCTSTR GetNodeTypeName(UINT NodeType) +{ + switch (NodeType) { + case 1: return _T("Broadcast"); + case 2: return _T("Peer To Peer"); + case 4: return _T("Mixed"); + case 8: return _T("Hybrid"); + default : return _T("unknown"); + } +} + +LPCTSTR GetInterfaceTypeName(UINT InterfaceType) +{ + switch (InterfaceType) { + case MIB_IF_TYPE_OTHER: return _T("Other Type Of Adapter"); + case MIB_IF_TYPE_ETHERNET: return _T("Ethernet Adapter"); + case MIB_IF_TYPE_TOKENRING: return _T("Token Ring Adapter"); + case MIB_IF_TYPE_FDDI: return _T("FDDI Adapter"); + case MIB_IF_TYPE_PPP: return _T("PPP Adapter"); + case MIB_IF_TYPE_LOOPBACK: return _T("Loopback Adapter"); + case MIB_IF_TYPE_SLIP: return _T("SLIP Adapter"); + default: return _T("unknown"); + } +} + +/* print MAC address */ +PTCHAR PrintMacAddr(PBYTE Mac) +{ + static TCHAR MacAddr[20]; + + _stprintf(MacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"), + Mac[0], Mac[1], Mac[2], Mac[3], Mac[4], Mac[5]); + + return MacAddr; +} + +DWORD DoFormatMessage(DWORD ErrorCode) +{ + LPVOID lpMsgBuf; + DWORD RetVal; + + if ((RetVal = FormatMessage( + FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + ErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */ + (LPTSTR) &lpMsgBuf, + 0, + NULL ))) { + _tprintf(_T("%s"), (LPTSTR)lpMsgBuf); + + LocalFree(lpMsgBuf); + /* return number of TCHAR's stored in output buffer + * excluding '\0' - as FormatMessage does*/ + return RetVal; + } + else + return 0; +} + +INT ShowInfo(BOOL bAll) +{ + PIP_ADAPTER_INFO pAdapterInfo = NULL; + PIP_ADAPTER_INFO pAdapter = NULL; + ULONG adaptOutBufLen; + + PFIXED_INFO pFixedInfo; + ULONG netOutBufLen; + PIP_ADDR_STRING pIPAddr = NULL; + + DWORD ErrRet = 0; + + /* assign memory for call to GetNetworkParams */ + pFixedInfo = (FIXED_INFO *) GlobalAlloc( GPTR, sizeof( FIXED_INFO ) ); + netOutBufLen = sizeof(FIXED_INFO); + + /* assign memory for call to GetAdapterInfo */ + pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) ); + adaptOutBufLen = sizeof(IP_ADAPTER_INFO); + + /* set required buffer size */ + if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + GlobalFree(pFixedInfo); + pFixedInfo = (FIXED_INFO *) GlobalAlloc(GPTR, netOutBufLen); + } + + /* set required buffer size */ + if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + free(pAdapterInfo); + pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); + } + + if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR) + { + _tprintf(_T("GetAdaptersInfo failed : ")); + DoFormatMessage(ErrRet); + return EXIT_FAILURE; + } + + if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR) + { + _tprintf(_T("GetNetworkParams failed : ")); + DoFormatMessage(ErrRet); + return EXIT_FAILURE; + } + + pAdapter = pAdapterInfo; + + _tprintf(_T("\nReactOS IP Configuration\n\n")); + + if (bAll) + { + _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName); + _tprintf(_T("\tPrimary DNS Suffix. . . . . . . . : \n")); + _tprintf(_T("\tNode Type . . . . . . . . . . . . : %s\n"), GetNodeTypeName(pFixedInfo->NodeType)); + if (pFixedInfo->EnableRouting) + _tprintf(_T("\tIP Routing Enabled. . . . . . . . : Yes\n")); + else + _tprintf(_T("\tIP Routing Enabled. . . . . . . . : No\n")); + if (pAdapter->HaveWins) + _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : Yes\n")); + else + _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : No\n")); + _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName); + } + + while (pAdapter) + { + + _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type)); + + /* check if the adapter is connected to the media */ + if (_tcscmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0") == 0) + { + _tprintf(_T("\tMedia State . . . . . . . . . . . : Media disconnected\n")); + pAdapter = pAdapter->Next; + continue; + } + + _tprintf(_T("\tConnection-specific DNS Suffix. . : %s\n"), pFixedInfo->DomainName); + + if (bAll) + { + _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), pAdapter->Description); + _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address)); + if (pAdapter->DhcpEnabled) + _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); + else + _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n")); + _tprintf(_T("\tAutoconfiguration Enabled . . . . : \n")); + } + + _tprintf(_T("\tIP Address. . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpAddress.String); + _tprintf(_T("\tSubnet Mask . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpMask.String); + _tprintf(_T("\tDefault Gateway . . . . . . . . . : %s\n"), pAdapter->GatewayList.IpAddress.String); + + if (bAll) + { + if (pAdapter->DhcpEnabled) + _tprintf(_T("\tDHCP Server . . . . . . . . . . . : %s\n"), pAdapter->DhcpServer.IpAddress.String); + + _tprintf(_T("\tDNS Servers . . . . . . . . . . . : ")); + _tprintf(_T("%s\n"), pFixedInfo->DnsServerList.IpAddress.String); + pIPAddr = pFixedInfo -> DnsServerList.Next; + while (pIPAddr) + { + _tprintf(_T("\t\t\t\t\t %s\n"), pIPAddr ->IpAddress.String ); + pIPAddr = pIPAddr ->Next; + } + if (pAdapter->HaveWins) + { + _tprintf(_T("\tPrimary WINS Server . . . . . . . : %s\n"), pAdapter->PrimaryWinsServer.IpAddress.String); + _tprintf(_T("\tSecondard WINS Server . . . . . . : %s\n"), pAdapter->SecondaryWinsServer.IpAddress.String); + } + if (pAdapter->DhcpEnabled) + { + _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained))); + _tprintf(_T("\tLease Expires . . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseExpires))); + } + } + _tprintf(_T("\n")); + + pAdapter = pAdapter->Next; + + } + + return 0; +} + +INT Release(TCHAR Index) +{ + IP_ADAPTER_INDEX_MAP AdapterInfo; + DWORD dwRetVal = 0; + + /* if interface is not given, query GetInterfaceInfo */ + if (Index == (TCHAR)NULL) + { + PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; + pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); + ulOutBufLen = 0; + + /* Make an initial call to GetInterfaceInfo to get + * the necessary size into the ulOutBufLen variable */ + if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + { + GlobalFree(pInfo); + pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen); + } + + /* Make a second call to GetInterfaceInfo to get the actual data we want */ + if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) + { + AdapterInfo = pInfo->Adapter[0]; + _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + } + else + { + _tprintf(_T("\nGetInterfaceInfo failed : ")); + DoFormatMessage(dwRetVal); + } + } + else + { + ; + /* we need to be able to release connections by name with support for globbing + * i.e. ipconfig /release Eth* will release all cards starting with Eth... + * ipconfig /release *con* will release all cards with 'con' in their name + */ + } + + + /* Call IpReleaseAddress to release the IP address on the specified adapter. */ + if ((dwRetVal = IpReleaseAddress(&AdapterInfo)) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while releasing interface %s : "), _T("*name*")); + DoFormatMessage(dwRetVal); + } + return 0; +} + + + + +INT Renew(TCHAR Index) +{ + IP_ADAPTER_INDEX_MAP AdapterInfo; + DWORD dwRetVal = 0; + + /* if interface is not given, query GetInterfaceInfo */ + if (Index == (TCHAR)NULL) + { + PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; + pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); + ulOutBufLen = 0; + + /* Make an initial call to GetInterfaceInfo to get + * the necessary size into the ulOutBufLen variable */ + if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + { + GlobalFree(pInfo); + pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen); + } + + /* Make a second call to GetInterfaceInfo to get the actual data we want */ + if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) + { + AdapterInfo = pInfo->Adapter[0]; + _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name); + } else { + _tprintf(_T("\nGetInterfaceInfo failed : ")); + DoFormatMessage(dwRetVal); + } + } + else + { + ; + /* we need to be able to renew connections by name with support for globbing + * i.e. ipconfig /renew Eth* will renew all cards starting with Eth... + * ipconfig /renew *con* will renew all cards with 'con' in their name + */ + } + + + /* Call IpRenewAddress to renew the IP address on the specified adapter. */ + if ((dwRetVal = IpRenewAddress(&AdapterInfo)) != NO_ERROR) + { + _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*")); + DoFormatMessage(dwRetVal); + } + return 0; +} + +/* temp func for testing purposes */ +VOID Info() +{ + // Declare and initialize variables + PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; + DWORD dwRetVal; + + pInfo = (IP_INTERFACE_INFO *) malloc( sizeof(IP_INTERFACE_INFO) ); + ulOutBufLen = sizeof(IP_INTERFACE_INFO); + dwRetVal = 0; + + + // Make an initial call to GetInterfaceInfo to get + // the necessary size in the ulOutBufLen variable + if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + { + free(pInfo); + pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen); + } + + // Make a second call to GetInterfaceInfo to get + // the actual data we need + if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR ) + { + int i; [truncated at 1000 lines; 6526 more skipped]

1 0

[chorns] 12: Rename svn:doc to ros:doc
by chorns＠svn.reactos.org 28 Jan '06

28 Jan '06

Rename svn:doc to ros:doc Property changes on: trunk/reactos/tools/rbuild ___________________________________________________________________ Name: svn:doc - Rbuild was developed specifically for ReactOS. Rbuild does not contain implementations of any Windows APIs. Name: ros:doc + Rbuild was developed specifically for ReactOS. Rbuild does not contain implementations of any Windows APIs.

1 0

[chorns] 11: Document rbuild
by chorns＠svn.reactos.org 28 Jan '06

28 Jan '06

Document rbuild Property changes on: trunk/reactos/tools/rbuild ___________________________________________________________________ Name: svn:doc + Rbuild was developed specifically for ReactOS. Rbuild does not contain implementations of any Windows APIs.

1 0

[gvg] 10: Rename the rbuild XML files to a .rbuild extension
by gvg＠svn.reactos.org 28 Jan '06

28 Jan '06

Rename the rbuild XML files to a .rbuild extension Added: trunk/reactos/ReactOS-ppc.rbuild Deleted: trunk/reactos/ReactOS-ppc.xml Added: trunk/reactos/ReactOS.rbuild Deleted: trunk/reactos/ReactOS.xml Added: trunk/reactos/baseaddress.rbuild Deleted: trunk/reactos/baseaddress.xml Added: trunk/reactos/boot/boot.rbuild Added: trunk/reactos/boot/bootcd/bootcd.rbuild Deleted: trunk/reactos/boot/bootcd/bootcd.xml Deleted: trunk/reactos/boot/bootdata.xml Added: trunk/reactos/config.template.rbuild Deleted: trunk/reactos/config.template.xml Added: trunk/reactos/lib/inflib/inflib.rbuild Deleted: trunk/reactos/lib/inflib/inflib.xml Modified: trunk/reactos/tools/rbuild/rbuild.cpp _____ Copied: trunk/reactos/ReactOS-ppc.rbuild (from rev 9, trunk/reactos/ReactOS-ppc.xml) --- trunk/reactos/ReactOS-ppc.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS-ppc.rbuild 2006-01-28 16:24:46 UTC (rev 10) @@ -0,0 +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="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" /> + + <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> + + <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> _____ Deleted: trunk/reactos/ReactOS-ppc.xml --- trunk/reactos/ReactOS-ppc.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS-ppc.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,91 +0,0 @@ -<?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.xml"> - <xi:fallback> - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.xml" /> - - <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> - - <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.xml" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.xml" /> - </directory> - <directory name="bootdata"> - <xi:include href="bootdata/bootdata.xml" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/directory.xml" /> - </directory> - <directory name="hal"> - <xi:include href="hal/directory.xml" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.xml" /> - </directory> - <directory name="lib"> - <xi:include href="lib/directory.xml" /> - </directory> - <directory name="media"> - <xi:include href="media/directory.xml" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.xml" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.xml" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.xml" /> - </directory> - <directory name="services"> - <xi:include href="services/directory.xml" /> - </directory> - <directory name="subsys"> - <xi:include href="subsys/directory.xml" /> - </directory> -</project> _____ Copied: trunk/reactos/ReactOS.rbuild (from rev 9, trunk/reactos/ReactOS.xml) --- trunk/reactos/ReactOS.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS.rbuild 2006-01-28 16:24:46 UTC (rev 10) @@ -0,0 +1,88 @@ +<?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="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> + + <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> + +</project> _____ Deleted: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,88 +0,0 @@ -<?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.xml"> - <xi:fallback> - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.xml" /> - - <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> - - - <directory name="boot"> - <xi:include href="boot/bootdata.xml" /> - </directory> - -</project> _____ Copied: trunk/reactos/baseaddress.rbuild (from rev 9, trunk/reactos/baseaddress.xml) _____ Deleted: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/baseaddress.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,123 +0,0 @@ -<group> -<property name="BASEADDRESS_DPLAYX" value="0x5E080000" /> -<property name="BASEADDRESS_DPLAY" value="0x71E80000" /> -<property name="BASEADDRESS_REGTESTS" value="0x07000000" /> -<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> -<property name="BASEADDRESS_DEVENUM" value="0x35680000" /> -<property name="BASEADDRESS_MMSYS" value="0x588A0000" /> -<property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> -<property name="BASEADDRESS_VDMDBG" value="0x5B0D0000" /> -<property name="BASEADDRESS_OBJSEL" value="0x5B400000" /> -<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> -<property name="BASEADDRESS_DINPUT" value="0x5F580000" /> -<property name="BASEADDRESS_MAPI32" value="0x62250000" /> -<property name="BASEADDRESS_HDWWIZ" value="0x64D40000" /> -<property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> -<property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> -<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> -<property name="BASEADDRESS_MAIN" value="0x64F40000" /> -<property name="BASEADDRESS_INTL" value="0x64FB0000" /> -<property name="BASEADDRESS_DESK" value="0x65080000" /> -<property name="BASEADDRESS_APPWIZ" value="0x65100000" /> -<property name="BASEADDRESS_ACCESS" value="0x65180000" /> -<property name="BASEADDRESS_HID" value="0x688F0000" /> -<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> -<property name="BASEADDRESS_PSAPI" value="0x68f70000" /> -<property name="BASEADDRESS_OLEACC" value="0x69640000" /> -<property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> -<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> -<property name="BASEADDRESS_UNICODE" value="0x6b200000" /> -<property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> -<property name="BASEADDRESS_CONTROL" value="0x6b310000" /> -<property name="BASEADDRESS_NCPA" value="0x6b320000" /> -<property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> -<property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> -<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> -<property name="BASEADDRESS_DSOUND" value="0x6b360000" /> -<property name="BASEADDRESS_GLU32" value="0x6b370000" /> -<property name="BASEADDRESS_MESA32" value="0x6b380000" /> -<property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> -<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> -<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> -<property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> -<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> -<property name="BASEADDRESS_CLB" value="0x6f2b0000" /> -<property name="BASEADDRESS_CARDS" value="0x701a0000" /> -<property name="BASEADDRESS_WININET" value="0x70200000" /> -<property name="BASEADDRESS_ACLUI" value="0x71550000" /> -<property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> -<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> -<property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> -<property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> -<property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> -<property name="BASEADDRESS_SECURITY" value="0x71F10000" /> -<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> -<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> -<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> -<property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> -<property name="BASEADDRESS_LZ32" value="0x73d80000" /> -<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> -<property name="BASEADDRESS_ICMP" value="0x741F0000" /> -<property name="BASEADDRESS_USERENV" value="0x74850000" /> -<property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> -<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> -<property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> -<property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> -<property name="BASEADDRESS_CABINET" value="0x75120000" /> -<property name="BASEADDRESS_MSGINA" value="0x75970000" /> -<property name="BASEADDRESS_IMM32" value="0x75e60000" /> -<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> -<property name="BASEADDRESS_RPCRT4" value="0x76000000" /> -<property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> -<property name="BASEADDRESS_COMCTL32" value="0x76160000" /> -<property name="BASEADDRESS_COMDLG32" value="0x76210000" /> -<property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> -<property name="BASEADDRESS_RICHED32" value="0x76340000" /> -<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> -<property name="BASEADDRESS_RICHED20" value="0x76360000" /> -<property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> -<property name="BASEADDRESS_LSASRV" value="0x76540000" /> -<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> -<property name="BASEADDRESS_ODBC32" value="0x76660000" /> -<property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> -<property name="BASEADDRESS_MPR" value="0x76620000" /> -<property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> -<property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> -<property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> -<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> -<property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> -<property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> -<property name="BASEADDRESS_FMIFS" value="0x76df0000" /> -<property name="BASEADDRESS_SHELL32" value="0x77260000" /> -<property name="BASEADDRESS_IPHLPAPI" value="0x77400000" /> -<property name="BASEADDRESS_MSVFW32" value="0x77400000" /> -<property name="BASEADDRESS_MSACM32" value="0x77400000" /> -<property name="BASEADDRESS_MMDRV" value="0x77530000" /> -<property name="BASEADDRESS_CRTDLL" value="0x77630000" /> -<property name="BASEADDRESS_AUTHZ" value="0x77690000" /> -<property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> -<property name="BASEADDRESS_PACKET" value="0x77780000" /> -<property name="BASEADDRESS_MSAFD" value="0x777a0000" /> -<property name="BASEADDRESS_MSI" value="0x777b0000" /> -<property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> -<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> -<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> -<property name="BASEADDRESS_WINMM" value="0x777d0000" /> -<property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> -<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> -<property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> -<property name="BASEADDRESS_VERSION" value="0x77a40000" /> -<property name="BASEADDRESS_OLE32" value="0x77a50000" /> -<property name="BASEADDRESS_WS2_32" value="0x77aa0000" /> -<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> -<property name="BASEADDRESS_CRYPT32" value="0x77ab0000" /> -<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> -<property name="BASEADDRESS_USER32" value="0x77e50000" /> -<property name="BASEADDRESS_GDI32" value="0x77f10000" /> -<property name="BASEADDRESS_DNSAPI" value="0x77f30000" /> -<property name="BASEADDRESS_MSVCRT" value="0x78000000" /> -<property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> -<property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> -<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> -<property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> -</group> _____ Copied: trunk/reactos/boot/boot.rbuild (from rev 9, trunk/reactos/boot/bootdata.xml) --- trunk/reactos/boot/bootdata.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/boot/boot.rbuild 2006-01-28 16:24:46 UTC (rev 10) @@ -0,0 +1,5 @@ +<group> +<directory name="bootcd"> + <xi:include href="bootcd/bootcd.rbuild" /> +</directory> +</group> _____ Copied: trunk/reactos/boot/bootcd/bootcd.rbuild (from rev 9, trunk/reactos/boot/bootcd/bootcd.xml) _____ Deleted: trunk/reactos/boot/bootcd/bootcd.xml --- trunk/reactos/boot/bootcd/bootcd.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/boot/bootcd/bootcd.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,2 +0,0 @@ -<module name="bootcd" type="iso"> -</module> _____ Deleted: trunk/reactos/boot/bootdata.xml --- trunk/reactos/boot/bootdata.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/boot/bootdata.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,5 +0,0 @@ -<group> -<directory name="bootcd"> - <xi:include href="bootcd/bootcd.xml" /> -</directory> -</group> _____ Copied: trunk/reactos/config.template.rbuild (from rev 9, trunk/reactos/config.template.xml) _____ Deleted: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/config.template.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,51 +0,0 @@ - - - - -<property name="ARCH" value="i386" /> - - -<property name="SARCH" value="" /> - - - -<property name="OARCH" value="i486" /> - - - -<property name="MP" value="0" /> - - - -<property name="KDBG" value="0" /> - - - -<property name="DBG" value="1" /> _____ Copied: trunk/reactos/lib/inflib/inflib.rbuild (from rev 9, trunk/reactos/lib/inflib/inflib.xml) _____ Deleted: trunk/reactos/lib/inflib/inflib.xml --- trunk/reactos/lib/inflib/inflib.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/lib/inflib/inflib.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,11 +0,0 @@ -<module name="inflib" type="staticlibrary"> - <include base="inflib">.</include> - <define name="__NO_CTYPE_INLINES" /> - <pch>inflib.h</pch> - <file>infcore.c</file> - <file>infget.c</file> - <file>infput.c</file> - <file>infrosgen.c</file> - <file>infrosget.c</file> - <file>infrosput.c</file> -</module> _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-28 16:24:46 UTC (rev 10) @@ -33,7 +33,7 @@ using std::vector; static string BuildSystem; -static string RootXmlFile = "ReactOS.xml"; +static string RootXmlFile = "ReactOS.rbuild"; static Configuration configuration; bool @@ -229,7 +229,7 @@ printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); printf ( " needed anymore.\n" ); - printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); + printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.rbuild.\n" ); printf ( " -dd Disable automatic dependencies.\n" ); printf ( " -dm{module} Check only automatic dependencies for this module.\n" ); printf ( " -ud Disable multiple source files per compilation unit.\n" );

1 0

[gvg] 9: Try to save some history
by gvg＠svn.reactos.org 28 Jan '06

28 Jan '06

Try to save some history Property changes on: trunk/reactos/tools/rbuild ___________________________________________________________________ Name: log_history + ------------------------------------------------------------------------ r20844 | npwoods | 2006-01-14 02:00:56 +0100 (Sat, 14 Jan 2006) | 5 lines Rbuild: Added "description" field to the various backend factories, and then used the description field to generate the help text. (updated the patch in bugzilla bug #790) ------------------------------------------------------------------------ r20832 | royce | 2006-01-13 14:56:10 +0100 (Fri, 13 Jan 2006) | 1 line msvc2k5 build files ------------------------------------------------------------------------ r20831 | royce | 2006-01-13 14:53:26 +0100 (Fri, 13 Jan 2006) | 1 line msvc2k5 compatibility fix ------------------------------------------------------------------------ r20785 | cwittich | 2006-01-11 16:47:22 +0100 (Wed, 11 Jan 2006) | 2 lines make_msvcX_install_[config] patch by Brezenbak (i.e. make_msvc71_install_speed) ------------------------------------------------------------------------ r20765 | cwittich | 2006-01-10 20:41:07 +0100 (Tue, 10 Jan 2006) | 1 line added msvc_clean and msvc_clean_all (patch by Brezenbak) ------------------------------------------------------------------------ r20694 | cwittich | 2006-01-08 03:39:11 +0100 (Sun, 08 Jan 2006) | 1 line fix pch bug (patch by Brezenbak) ------------------------------------------------------------------------ r20691 | cwittich | 2006-01-08 01:59:24 +0100 (Sun, 08 Jan 2006) | 1 line comment out some more not needed code ------------------------------------------------------------------------ r20690 | cwittich | 2006-01-08 01:48:28 +0100 (Sun, 08 Jan 2006) | 1 line don't use VCToolsFile anymore because of different include dirs for subprojects ------------------------------------------------------------------------ r20681 | ion | 2006-01-08 00:22:56 +0100 (Sun, 08 Jan 2006) | 1 line - Temporarily revert 20639 until a better fix is found. Thanks to G?®. ------------------------------------------------------------------------ r20656 | ion | 2006-01-07 08:40:14 +0100 (Sat, 07 Jan 2006) | 3 lines - Do not generate manifest files for drivers or native apps. - Get portcls to compile. - Commit some fixes I forgot. ------------------------------------------------------------------------ r20640 | ion | 2006-01-07 02:37:37 +0100 (Sat, 07 Jan 2006) | 1 line - Properly set STDCALL as default convention, previous patch incorrectly set it as a linker setting instead of a compiler setting. ------------------------------------------------------------------------ r20639 | ion | 2006-01-07 02:27:20 +0100 (Sat, 07 Jan 2006) | 1 line - Don't name-decorate the entrypoint. This lets msvc link the module properly and remains compatible with GCC. ------------------------------------------------------------------------ r20637 | ion | 2006-01-07 02:15:26 +0100 (Sat, 07 Jan 2006) | 8 lines * Rbuild MSVC Backend changes: - Don't do runtime checks for drivers - Don't do buffer checks for drivers - Use W0 for speed build, not for the release build. - Disable Wp64 only for the speed build, not for the release build - Use /STDCALL default calling convention for native modules because the DDK requires it - Remove some duplicated options that were passed on the command line - Replace some options that were passed on the commandline with their appropriate XML keywords. ------------------------------------------------------------------------ r20634 | cwittich | 2006-01-07 00:47:15 +0100 (Sat, 07 Jan 2006) | 1 line disabled warning 4214 ------------------------------------------------------------------------ r20584 | royce | 2006-01-05 17:35:08 +0100 (Thu, 05 Jan 2006) | 1 line fix build in unspecified build environment - patch by Reuben Perelman <reub2000(a)earthlink.net> ------------------------------------------------------------------------ r20583 | royce | 2006-01-05 17:32:49 +0100 (Thu, 05 Jan 2006) | 1 line fix msvc6 warnings ------------------------------------------------------------------------ r20529 | gedmurphy | 2006-01-02 17:43:54 +0100 (Mon, 02 Jan 2006) | 2 lines Allow files other than C to be included in the projects Patch by Brezenbak (IRC) ------------------------------------------------------------------------ r20457 | npwoods | 2005-12-30 14:33:31 +0100 (Fri, 30 Dec 2005) | 3 lines Modified rbuild to generate a map file of the boot loader ------------------------------------------------------------------------ r20180 | gedmurphy | 2005-12-14 23:50:25 +0100 (Wed, 14 Dec 2005) | 2 lines j_anderw(a)sbox.tugraz.at list resource files in the correct directory within msvc ------------------------------------------------------------------------ r19884 | gedmurphy | 2005-12-04 21:15:45 +0100 (Sun, 04 Dec 2005) | 3 lines - Put output from MSVC into the relevant output-i386 / obj-i386 files - #if 0'd out the code to use ReactOS' internal libs until ReactOS can be fully built with MSVC. We must continue to rely on PSDK until this time. - code by Brezenbak (IRC) ------------------------------------------------------------------------ r19854 | arty | 2005-12-04 13:02:45 +0100 (Sun, 04 Dec 2005) | 6 lines Added support for ROS_AUTOMAKE variable. Added support for <if> <module ...> </if> Added BootProgram target type Added simple initial ReactOS-ppc.xml, using my egcs compiler More work required, but getting there ------------------------------------------------------------------------ r19827 | royce | 2005-12-02 14:59:35 +0100 (Fri, 02 Dec 2005) | 1 line store pointer to Backend in the Project class so properties of the Backend object can eventually be queried from the generic rbuild code ------------------------------------------------------------------------ r19826 | cwittich | 2005-12-02 13:47:42 +0100 (Fri, 02 Dec 2005) | 1 line fixed BaseAddress ------------------------------------------------------------------------ r19824 | cwittich | 2005-12-02 09:13:52 +0100 (Fri, 02 Dec 2005) | 1 line fixed vcproj files for modules which do not use pch ------------------------------------------------------------------------ r19792 | cwittich | 2005-12-01 00:33:29 +0100 (Thu, 01 Dec 2005) | 1 line fixed the build options for different configurations ------------------------------------------------------------------------ r19789 | cwittich | 2005-11-30 23:44:41 +0100 (Wed, 30 Nov 2005) | 2 lines added PCH support removed some redundant code ------------------------------------------------------------------------ r19774 | cwittich | 2005-11-30 10:16:21 +0100 (Wed, 30 Nov 2005) | 1 line fix linker options ------------------------------------------------------------------------ r19767 | sedwards | 2005-11-30 06:51:24 +0100 (Wed, 30 Nov 2005) | 1 line define _CRT_SECURE_NO_DEPRECATE and _CRT_NON_CONFORMING_SWPRINTFS until we have a strsafe lib that works for both msvc and mingw ------------------------------------------------------------------------ r19765 | cwittich | 2005-11-30 01:26:51 +0100 (Wed, 30 Nov 2005) | 1 line added more correct linker flags (patch by brezenbak) ------------------------------------------------------------------------ r19762 | cwittich | 2005-11-30 01:10:54 +0100 (Wed, 30 Nov 2005) | 1 line fix some problems in patch from brezenbak ------------------------------------------------------------------------ r19743 | royce | 2005-11-29 07:24:56 +0100 (Tue, 29 Nov 2005) | 1 line enhance generated msvc projects - patch by Brezenbak ------------------------------------------------------------------------ r19722 | royce | 2005-11-28 19:23:25 +0100 (Mon, 28 Nov 2005) | 1 line append "_auto" to dsp and vcproj filenames to not conflict with any manually created project files ------------------------------------------------------------------------ r19708 | royce | 2005-11-28 00:04:51 +0100 (Mon, 28 Nov 2005) | 1 line move xml.h/cpp and ssprintf.h/cpp up a directory, make both rbuild and buildno use these same files ------------------------------------------------------------------------ r19706 | royce | 2005-11-28 00:01:38 +0100 (Mon, 28 Nov 2005) | 1 line add simplified version of XMLLoadFile() - preparation to move up a directory ------------------------------------------------------------------------ r19705 | royce | 2005-11-27 23:59:20 +0100 (Sun, 27 Nov 2005) | 1 line remove dependance on rbuild's headers - preparation to move up a directory ------------------------------------------------------------------------ r19675 | sedwards | 2005-11-27 07:48:34 +0100 (Sun, 27 Nov 2005) | 1 line XML.cpp -> xml.cpp, XML.h -> xml.h. Sorry Windows users, if you make sure your stuff is in the correct case the first time then you wont have problems when doing a svn update. ------------------------------------------------------------------------ r19674 | royce | 2005-11-27 07:34:50 +0100 (Sun, 27 Nov 2005) | 1 line remove xml.h/cpp's dependancy on exception.h/cpp - in preparation to move xml.h/cpp and ssprintf.h/ccp out of rbuild directory since buildno uses them too ------------------------------------------------------------------------ r19661 | chorns | 2005-11-26 23:12:15 +0100 (Sat, 26 Nov 2005) | 1 line Fix dependencies that cause trouble ------------------------------------------------------------------------ r19650 | chorns | 2005-11-26 19:43:46 +0100 (Sat, 26 Nov 2005) | 4 lines * Implement <autoregister> * Autogenerate syssetup.inf ------------------------------------------------------------------------ r19612 | royce | 2005-11-26 05:29:40 +0100 (Sat, 26 Nov 2005) | 1 line remove transient debugging code ------------------------------------------------------------------------ r19611 | royce | 2005-11-26 05:24:17 +0100 (Sat, 26 Nov 2005) | 4 lines XML: better descriptions on a couple errors, more accurate line number reporting ( was overshooting ), better clean-up of memory mingw/directory: move msvc fix for popen with the rest of the code that got moved rbuild.dsp: added new files to project ------------------------------------------------------------------------ r19554 | chorns | 2005-11-25 15:38:59 +0100 (Fri, 25 Nov 2005) | 1 line Don't include files from outside a compilation unit ------------------------------------------------------------------------ r19487 | chorns | 2005-11-23 16:16:18 +0100 (Wed, 23 Nov 2005) | 1 line Fix building rbuild tests ------------------------------------------------------------------------ r19486 | chorns | 2005-11-23 16:05:53 +0100 (Wed, 23 Nov 2005) | 1 line Disable pre-compiled headers when using compilation units ------------------------------------------------------------------------ r19477 | chorns | 2005-11-23 04:12:52 +0100 (Wed, 23 Nov 2005) | 1 line Option to disable compilation units ------------------------------------------------------------------------ r19470 | chorns | 2005-11-22 23:16:14 +0100 (Tue, 22 Nov 2005) | 4 lines * Name compilation unit * Generate compilation unit support code ------------------------------------------------------------------------ r19469 | chorns | 2005-11-22 22:58:50 +0100 (Tue, 22 Nov 2005) | 1 line Move Directory class to its own file ------------------------------------------------------------------------ r19466 | chorns | 2005-11-22 15:23:17 +0100 (Tue, 22 Nov 2005) | 1 line Replace File by CompilationUnit ------------------------------------------------------------------------ r19457 | chorns | 2005-11-22 09:18:03 +0100 (Tue, 22 Nov 2005) | 1 line Parse <compilationunit> ------------------------------------------------------------------------ r19423 | chorns | 2005-11-21 21:59:32 +0100 (Mon, 21 Nov 2005) | 1 line Revert 19411 ------------------------------------------------------------------------ r19421 | navaraf | 2005-11-21 21:46:55 +0100 (Mon, 21 Nov 2005) | 1 line Generate .dsp files with matching !IF/!ELSEIF and !ENDIF directives to make NMAKE accept them. ------------------------------------------------------------------------ r19415 | gvg | 2005-11-21 19:58:20 +0100 (Mon, 21 Nov 2005) | 2 lines Linux doesn't understand VOID ------------------------------------------------------------------------ r19411 | chorns | 2005-11-21 19:02:28 +0100 (Mon, 21 Nov 2005) | 1 line Parse <compilationunit> ------------------------------------------------------------------------ r19359 | chorns | 2005-11-20 14:12:33 +0100 (Sun, 20 Nov 2005) | 1 line Handle indirect calls to functions in external modules ------------------------------------------------------------------------ r19351 | chorns | 2005-11-19 22:07:25 +0100 (Sat, 19 Nov 2005) | 1 line Create parent directory before creating the definition file ------------------------------------------------------------------------ r19263 | cwittich | 2005-11-16 14:24:13 +0100 (Wed, 16 Nov 2005) | 1 line fixed bug 791 ------------------------------------------------------------------------ r19041 | greatlrd | 2005-11-07 21:32:17 +0100 (Mon, 07 Nov 2005) | 2 lines Fixed bug 954 rbuild devcpp generates mixed slashes and backslashes in some pathnames in the file makefile.auto ------------------------------------------------------------------------ r18961 | hbirr | 2005-11-03 00:24:05 +0100 (Thu, 03 Nov 2005) | 4 lines - The separator (slash or back slash), exepostfix and exeprefix are initialized from environment variables. - The separators in the path for the system command are always converted for the host system. - Our own build utilities must convert paths itself (bin2res). ------------------------------------------------------------------------ r18952 | gvg | 2005-11-02 17:13:00 +0100 (Wed, 02 Nov 2005) | 3 lines ScoTTie <scott(a)wizzer-it.com>/erie-- <seditaniedi(a)gmail.com> Build fixes for FreeBSD ------------------------------------------------------------------------ r18951 | cwittich | 2005-11-02 16:32:05 +0100 (Wed, 02 Nov 2005) | 1 line * compile .S files with MSVC2002/2003 too ------------------------------------------------------------------------ r18891 | blight | 2005-10-30 19:43:16 +0100 (Sun, 30 Oct 2005) | 2 lines Silence warning for non-win32 compilations. ------------------------------------------------------------------------ r18828 | mbosma | 2005-10-28 12:22:24 +0200 (Fri, 28 Oct 2005) | 1 line Dick Buitelaar: Fix DevCpp Backend (Bug 802) ------------------------------------------------------------------------ r18760 | chorns | 2005-10-24 23:08:08 +0200 (Mon, 24 Oct 2005) | 1 line Fix linker script parameter location. Spotted by Hartmut Birr. ------------------------------------------------------------------------ r18759 | royce | 2005-10-24 22:00:48 +0200 (Mon, 24 Oct 2005) | 2 lines added <linkerscript> and corrected some mistakes to the best of my understanding can't figure out (based on current definition) how to define <module> as allowing only a single <linkerscript>, but allowing it anywhere within the sub-elements of <module> ------------------------------------------------------------------------ r18758 | chorns | 2005-10-24 21:38:58 +0200 (Mon, 24 Oct 2005) | 1 line Implement linkerscript element ------------------------------------------------------------------------ r18709 | chorns | 2005-10-23 16:51:35 +0200 (Sun, 23 Oct 2005) | 1 line Have pre-compiled header rule depend on widl generated headers ------------------------------------------------------------------------ r18671 | cwittich | 2005-10-22 04:27:37 +0200 (Sat, 22 Oct 2005) | 2 lines adding gccasm.rules to vcproj files now it is possible to compile .s files with msvc ------------------------------------------------------------------------ r18646 | cwittich | 2005-10-20 23:55:55 +0200 (Thu, 20 Oct 2005) | 3 lines fixed creation of *.vcproj files for object libraries started implementing code which adds dependencies to *.sln file fixed some warnings in cmd when compiling with msvc 2005 ------------------------------------------------------------------------ r18643 | cwittich | 2005-10-20 20:55:45 +0200 (Thu, 20 Oct 2005) | 1 line fixing OutputFile in *.vcproj files ------------------------------------------------------------------------ r18638 | royce | 2005-10-20 18:49:00 +0200 (Thu, 20 Oct 2005) | 1 line we do still need to generate dsw files for msvc6 ------------------------------------------------------------------------ r18637 | cwittich | 2005-10-20 18:13:20 +0200 (Thu, 20 Oct 2005) | 1 line simplify MSVCBackend::Process code ------------------------------------------------------------------------ r18635 | weiden | 2005-10-20 17:50:02 +0200 (Thu, 20 Oct 2005) | 1 line use the ansi entry point by default ------------------------------------------------------------------------ r18634 | cwittich | 2005-10-20 17:28:35 +0200 (Thu, 20 Oct 2005) | 1 line fix compile problems with msvc6 ------------------------------------------------------------------------ r18633 | weiden | 2005-10-20 17:17:38 +0200 (Thu, 20 Oct 2005) | 1 line add a 'unicode' property to modules (not yet supported by mingw, need to add a library for unicode builds some day) ------------------------------------------------------------------------ r18632 | cwittich | 2005-10-20 17:04:55 +0200 (Thu, 20 Oct 2005) | 2 lines add targets for creating MSVC project files to Makefile fix bug in msvc backend: VS.NET project files are not destroyed anymore when creating VC6 project files ------------------------------------------------------------------------ r18631 | cwittich | 2005-10-20 16:27:02 +0200 (Thu, 20 Oct 2005) | 1 line create only the project files specified on cmdline ------------------------------------------------------------------------ r18630 | royce | 2005-10-20 16:10:23 +0200 (Thu, 20 Oct 2005) | 1 line msvc6+psdk fix ------------------------------------------------------------------------ r18629 | royce | 2005-10-20 16:05:27 +0200 (Thu, 20 Oct 2005) | 1 line msvc6+PSDK fixes ------------------------------------------------------------------------ r18627 | royce | 2005-10-20 15:59:37 +0200 (Thu, 20 Oct 2005) | 2 lines fix msvc6 template warning fix writing to uninitialized pointer ------------------------------------------------------------------------ r18626 | cwittich | 2005-10-20 14:42:09 +0200 (Thu, 20 Oct 2005) | 1 line create more correct solution files for different versions of MS Visual Studio ------------------------------------------------------------------------ r18625 | cwittich | 2005-10-20 13:46:56 +0200 (Thu, 20 Oct 2005) | 1 line forgot to commit rbuild.h ------------------------------------------------------------------------ r18624 | cwittich | 2005-10-20 13:21:23 +0200 (Thu, 20 Oct 2005) | 2 lines fix vcprojmaker to add the correct GUIDs implemented Debug/Release configurations to make Alex happy ------------------------------------------------------------------------ r18623 | cwittich | 2005-10-20 11:43:49 +0200 (Thu, 20 Oct 2005) | 1 line fix creation of shlwapi vcproject file ------------------------------------------------------------------------ r18622 | cwittich | 2005-10-20 10:46:55 +0200 (Thu, 20 Oct 2005) | 1 line fix for creating *.sln file ------------------------------------------------------------------------ r18621 | cwittich | 2005-10-20 08:40:58 +0200 (Thu, 20 Oct 2005) | 4 lines added new cmdline switch to rbuild: -vs{version} to select the version of MS VS project files to generate default is now 7.10 (VS 2003) ------------------------------------------------------------------------ r18616 | cwittich | 2005-10-20 01:20:17 +0200 (Thu, 20 Oct 2005) | 1 line fix "./" include dir ------------------------------------------------------------------------ r18595 | cwittich | 2005-10-19 18:08:34 +0200 (Wed, 19 Oct 2005) | 2 lines add support for cpl applets add hardcoded "." include path like already in msvcmaker.cpp ------------------------------------------------------------------------ r18585 | cwittich | 2005-10-19 03:59:25 +0200 (Wed, 19 Oct 2005) | 1 line add support for control panel applets ------------------------------------------------------------------------ r18577 | cwittich | 2005-10-19 01:25:46 +0200 (Wed, 19 Oct 2005) | 2 lines revert 18576 fix rbuild instead ------------------------------------------------------------------------ r18572 | cwittich | 2005-10-18 23:56:39 +0200 (Tue, 18 Oct 2005) | 2 lines changed windres back to rc fixed rc preprocessor defines in dsp file generation ------------------------------------------------------------------------ r18525 | cwittich | 2005-10-17 19:30:45 +0200 (Mon, 17 Oct 2005) | 1 line replaced rc with windres ------------------------------------------------------------------------ r18268 | npwoods | 2005-10-05 02:27:25 +0200 (Wed, 05 Oct 2005) | 8 lines Rbuild: Enhanced MSVC support 1. Enhanced the MSVC backends so that it pulls in information from the main project 2. Fixed bugs in Path::RelativeFromDirectory() in tools\rbuild\XML.cpp With these changes, many VC projects generated by rbuild now compile without any tweaking ------------------------------------------------------------------------ r18200 | fireball | 2005-10-02 10:08:04 +0200 (Sun, 02 Oct 2005) | 1 line Add vcprojmaker.cpp to the msvc project ------------------------------------------------------------------------ r17987 | weiden | 2005-09-22 22:44:10 +0200 (Thu, 22 Sep 2005) | 1 line fixed uninitialized variable warning ------------------------------------------------------------------------ r17962 | sedwards | 2005-09-21 05:20:07 +0200 (Wed, 21 Sep 2005) | 1 line Nathan Woods <npwoods _NOSPAM_at_NOSPAM cybercom.net> - Implement a working VS.NET backend, minor fixes to the vc6 backend ------------------------------------------------------------------------ r17895 | royce | 2005-09-17 15:48:38 +0200 (Sat, 17 Sep 2005) | 2 lines Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael(a)fritscher.net> (fixed a couple return values while I was in there) ------------------------------------------------------------------------ r17837 | royce | 2005-09-13 21:11:37 +0200 (Tue, 13 Sep 2005) | 1 line rename variable and change parameters in call to find_last_not_of() to hopefully be a little more accurate to what it's doing ------------------------------------------------------------------------ r17836 | royce | 2005-09-13 21:04:24 +0200 (Tue, 13 Sep 2005) | 1 line fix bug in GetBinutilsVersion() ------------------------------------------------------------------------ r17829 | royce | 2005-09-13 13:57:50 +0200 (Tue, 13 Sep 2005) | 1 line fix crash in 'make msvc' ------------------------------------------------------------------------ r17828 | sedwards | 2005-09-13 05:51:18 +0200 (Tue, 13 Sep 2005) | 1 line added LGPL license header to the code from Wine and Patrik Stridvall and Royce Mitchell III as authors ------------------------------------------------------------------------ r17827 | sedwards | 2005-09-13 05:46:22 +0200 (Tue, 13 Sep 2005) | 1 line started working on generation of msvc2kX project files. THESE ARE NOT CORRECT. Right now its just a copy of the existing msvc6 generation code. It will generate a *.sln and *.vcproj files however they are still in the old format. ------------------------------------------------------------------------ r17793 | arty | 2005-09-11 11:19:24 +0200 (Sun, 11 Sep 2005) | 4 lines Previously, the first character written to the buffer was random (off the stack). Not sure why this didn't blow up for others. Make sure we fill one character before placing one in the buffer. ------------------------------------------------------------------------ r17755 | royce | 2005-09-09 01:10:17 +0200 (Fri, 09 Sep 2005) | 2 lines win32 api compatibility fix changed 'warnings' attribute of <module> to 'allowwarnings' to make it's function less ambiguous ------------------------------------------------------------------------ r17744 | chorns | 2005-09-08 18:41:07 +0200 (Thu, 08 Sep 2005) | 7 lines Christoph_vW <Christoph(a)ApiViewer.de>: Binutils detection Modified to support cross-compilation Resolves #707 ------------------------------------------------------------------------ r17612 | royce | 2005-09-03 03:19:25 +0200 (Sat, 03 Sep 2005) | 1 line small efficiency boost ------------------------------------------------------------------------ r17585 | royce | 2005-08-28 14:23:37 +0200 (Sun, 28 Aug 2005) | 1 line remove single "." entries from paths ------------------------------------------------------------------------ r17584 | royce | 2005-08-28 14:18:13 +0200 (Sun, 28 Aug 2005) | 1 line remove transient debugging code ------------------------------------------------------------------------ r17583 | royce | 2005-08-28 14:08:53 +0200 (Sun, 28 Aug 2005) | 2 lines don't crash if path == base_directory. sorry I forgot to commit my changes to this file last night ------------------------------------------------------------------------ r17580 | hpoussin | 2005-08-28 11:50:00 +0200 (Sun, 28 Aug 2005) | 1 line Fix rbuild compilation, by adding Path::RelativeFromDirectory method ------------------------------------------------------------------------ r17576 | royce | 2005-08-28 07:34:22 +0200 (Sun, 28 Aug 2005) | 1 line add include directories from xml, remove "." hack, as projects that need to include their base directory have done so already in the xml. ------------------------------------------------------------------------ r17575 | royce | 2005-08-28 04:37:06 +0200 (Sun, 28 Aug 2005) | 1 line add . to list of include directories for all projects ------------------------------------------------------------------------ r17550 | sedwards | 2005-08-26 00:49:26 +0200 (Fri, 26 Aug 2005) | 1 line disable the custom rules for Winebuild for now ------------------------------------------------------------------------ r17546 | sedwards | 2005-08-25 22:58:01 +0200 (Thu, 25 Aug 2005) | 1 line Generate a GUID for each module processed. Later on this will be needed to support msvc2k3/5 vcproj files. ------------------------------------------------------------------------ r17540 | royce | 2005-08-25 19:24:11 +0200 (Thu, 25 Aug 2005) | 1 line file paths should be relative to the location of the dsp file, not the dsw file ------------------------------------------------------------------------ r17533 | royce | 2005-08-25 03:44:23 +0200 (Thu, 25 Aug 2005) | 3 lines $default_cfg fix cleaned up more code that isn't enabled yet generate correct line endings on *nix, too ------------------------------------------------------------------------ r17532 | royce | 2005-08-25 03:31:21 +0200 (Thu, 25 Aug 2005) | 1 line svn maintenance ------------------------------------------------------------------------ r17518 | royce | 2005-08-24 22:06:54 +0200 (Wed, 24 Aug 2005) | 3 lines added some verbosity standardized back on printf from cout fixed loop variable conflict ------------------------------------------------------------------------ r17517 | royce | 2005-08-24 21:58:07 +0200 (Wed, 24 Aug 2005) | 1 line invoke _generate_dsp() have it open the output file, and fix some path parsing and const issues. ------------------------------------------------------------------------ r17515 | royce | 2005-08-24 20:13:00 +0200 (Wed, 24 Aug 2005) | 1 line _generate_dsp() compiles now, haven't tested yet ------------------------------------------------------------------------ r17508 | royce | 2005-08-24 08:03:34 +0200 (Wed, 24 Aug 2005) | 1 line Replace() bugfix #2 - forgot to insert replacement text ( yes yes I suck you can stop throwing tomatoes now ) ------------------------------------------------------------------------ r17507 | royce | 2005-08-24 08:01:02 +0200 (Wed, 24 Aug 2005) | 1 line bugfix - Replace() was truncating the string ------------------------------------------------------------------------ r17506 | royce | 2005-08-24 07:58:14 +0200 (Wed, 24 Aug 2005) | 1 line almost done converting _generate_dsp(), but have to quit for the night, so commiting what's done so far. ------------------------------------------------------------------------ r17505 | royce | 2005-08-24 07:50:21 +0200 (Wed, 24 Aug 2005) | 1 line new helper function Replace() ------------------------------------------------------------------------ r17504 | royce | 2005-08-24 06:00:37 +0200 (Wed, 24 Aug 2005) | 1 line vc6 build files - just in case somebody else wants to use them ------------------------------------------------------------------------ r17503 | sedwards | 2005-08-24 05:56:25 +0200 (Wed, 24 Aug 2005) | 1 line remove a few of the Wine hacks ------------------------------------------------------------------------ r17501 | royce | 2005-08-24 05:38:20 +0200 (Wed, 24 Aug 2005) | 1 line import wine's "msvcmaker" perl script and begin converting it to C++ - so far it creates the DSW file. ------------------------------------------------------------------------ r17500 | royce | 2005-08-24 05:18:13 +0200 (Wed, 24 Aug 2005) | 1 line added some comments to illustrate the output of several path-related functions ------------------------------------------------------------------------ r17499 | royce | 2005-08-24 04:55:08 +0200 (Wed, 24 Aug 2005) | 2 lines fix to not crash when built with msvc6 ( bad calling convention on imports ). fix error-handling bugs, added missing error-handling ------------------------------------------------------------------------ r17495 | royce | 2005-08-24 01:20:23 +0200 (Wed, 24 Aug 2005) | 1 line remove incorrect comment (copy/paste error) ------------------------------------------------------------------------ r17493 | royce | 2005-08-24 01:06:58 +0200 (Wed, 24 Aug 2005) | 1 line msvc6 compatibility ------------------------------------------------------------------------ r17492 | royce | 2005-08-24 01:06:19 +0200 (Wed, 24 Aug 2005) | 1 line proxy makefile for rbuild ------------------------------------------------------------------------ r17482 | navaraf | 2005-08-23 16:56:38 +0200 (Tue, 23 Aug 2005) | 1 line Name the proxy makefiles "GNUmakefile" instead of "makefile". ------------------------------------------------------------------------ r17468 | sedwards | 2005-08-21 21:35:19 +0200 (Sun, 21 Aug 2005) | 1 line prompt to configure for Mingw after building project files ------------------------------------------------------------------------ r17458 | sedwards | 2005-08-21 16:41:20 +0200 (Sun, 21 Aug 2005) | 1 line add fix it to build on linux ------------------------------------------------------------------------ r17457 | sedwards | 2005-08-21 16:04:19 +0200 (Sun, 21 Aug 2005) | 1 line added a genguid helper function based on genguid by Jon Wilson. Will be needed later on when building project files. ------------------------------------------------------------------------ r17456 | sedwards | 2005-08-21 06:04:13 +0200 (Sun, 21 Aug 2005) | 1 line ...I hate windows and its concepts of case in filenames... ------------------------------------------------------------------------ r17455 | sedwards | 2005-08-21 05:24:37 +0200 (Sun, 21 Aug 2005) | 1 line add a more descriptive message about the state of the MSVC backend ------------------------------------------------------------------------ r17454 | sedwards | 2005-08-21 03:29:56 +0200 (Sun, 21 Aug 2005) | 1 line started working on a msvc2k5 backend. Mostly a dummy atm based on the devcpp backend ------------------------------------------------------------------------ r17242 | ea | 2005-08-09 18:01:42 +0200 (Tue, 09 Aug 2005) | 1 line Minor change. ------------------------------------------------------------------------ r17004 | ea | 2005-08-03 17:05:54 +0200 (Wed, 03 Aug 2005) | 1 line Document <module type="nativecui" ...> ------------------------------------------------------------------------ r16974 | navaraf | 2005-08-02 20:13:21 +0200 (Tue, 02 Aug 2005) | 1 line Fix the -sections option of PEFIXUP tool and adapt RBUILD to use it. ------------------------------------------------------------------------ r16960 | navaraf | 2005-08-01 19:56:41 +0200 (Mon, 01 Aug 2005) | 1 line Add new PEFIXUP tool and use it in the build system. ------------------------------------------------------------------------ r16958 | ea | 2005-08-01 18:11:29 +0200 (Mon, 01 Aug 2005) | 1 line RBuild 'project' document DTD (rough draft). ------------------------------------------------------------------------ r16957 | ea | 2005-08-01 18:08:29 +0200 (Mon, 01 Aug 2005) | 2 lines Replace 'Value' with 'Content' as per XML spec. Minor changes. ------------------------------------------------------------------------ r16950 | ea | 2005-08-01 14:54:50 +0200 (Mon, 01 Aug 2005) | 3 lines Add reference to the 'compilerflag' element. Add reference to the 'group' element. Add Parents section to more elements. ------------------------------------------------------------------------ r16941 | weiden | 2005-08-01 12:58:28 +0200 (Mon, 01 Aug 2005) | 1 line define common build flags so they can easily be changed for all tools ------------------------------------------------------------------------ r16915 | ea | 2005-07-31 09:08:15 +0200 (Sun, 31 Jul 2005) | 5 lines Document pch and linkerflag elements. Rename Elements sections into Children. Add Parents sections for some elements. Make link work (tested with DBK=>HTML). ------------------------------------------------------------------------ r16895 | ea | 2005-07-30 18:53:09 +0200 (Sat, 30 Jul 2005) | 4 lines Create a subdir for rbuild documentation. Move rbuild.txt there. Convert rbuild.txt in Docbook. Fix some minor inconsistencies in the element reference. ------------------------------------------------------------------------ r16827 | chorns | 2005-07-28 12:45:21 +0200 (Thu, 28 Jul 2005) | 1 line Don't clean alias modules ------------------------------------------------------------------------ r16810 | chorns | 2005-07-27 21:10:57 +0200 (Wed, 27 Jul 2005) | 1 line Put halmp.dll on CD ------------------------------------------------------------------------ r16689 | sedwards | 2005-07-22 21:45:32 +0200 (Fri, 22 Jul 2005) | 1 line some fixes for the host gcc4 on FC4 ------------------------------------------------------------------------ r16647 | chorns | 2005-07-19 20:46:13 +0200 (Tue, 19 Jul 2005) | 1 line Generate RPC interface headers in intermediate directory ------------------------------------------------------------------------ r16621 | chorns | 2005-07-17 17:10:03 +0200 (Sun, 17 Jul 2005) | 1 line Clean referenced object libraries when cleaning a module ------------------------------------------------------------------------ r16605 | chorns | 2005-07-17 12:20:18 +0200 (Sun, 17 Jul 2005) | 1 line Fix building of tests ------------------------------------------------------------------------ r16547 | chorns | 2005-07-12 18:47:34 +0200 (Tue, 12 Jul 2005) | 1 line Add copyright notices and GPL headers to rbuild ------------------------------------------------------------------------ r16520 | chorns | 2005-07-09 09:50:48 +0200 (Sat, 09 Jul 2005) | 3 lines Don't rebuild the module if a library is changed. Relinking the module is enough. ------------------------------------------------------------------------ r16513 | chorns | 2005-07-08 21:55:30 +0200 (Fri, 08 Jul 2005) | 1 line Check automatic dependencies of referenced object library modules on make <module>_depends ------------------------------------------------------------------------ r16478 | navaraf | 2005-07-07 10:57:03 +0200 (Thu, 07 Jul 2005) | 1 line Fix the problems introduced in r16449 by changing "-mdll --dll" to "-shared" and letting the linker generate the relocations in all cases. ------------------------------------------------------------------------ r16459 | chorns | 2005-07-06 18:56:28 +0200 (Wed, 06 Jul 2005) | 1 line Generate pre-compiled headers in intermediate directory tree ------------------------------------------------------------------------ r16449 | navaraf | 2005-07-06 10:43:36 +0200 (Wed, 06 Jul 2005) | 1 line Generating relocations twice for DLLs? Oh, what a clever idea ... not. ------------------------------------------------------------------------ r16334 | navaraf | 2005-06-30 00:19:47 +0200 (Thu, 30 Jun 2005) | 1 line Allow YASM to be used instead of NASM. ------------------------------------------------------------------------ r16260 | chorns | 2005-06-24 21:39:47 +0200 (Fri, 24 Jun 2005) | 3 lines Search current directory first for #include "". ------------------------------------------------------------------------ r16091 | chorns | 2005-06-19 14:41:22 +0200 (Sun, 19 Jun 2005) | 1 line Count only scheduled time when running performance tests ------------------------------------------------------------------------ r16022 | chorns | 2005-06-18 08:17:10 +0200 (Sat, 18 Jun 2005) | 1 line Prepare win32k for tests ------------------------------------------------------------------------ r15934 | hpoussin | 2005-06-16 22:37:50 +0200 (Thu, 16 Jun 2005) | 1 line Implement <ifnot> ------------------------------------------------------------------------ r15876 | chorns | 2005-06-12 17:33:34 +0200 (Sun, 12 Jun 2005) | 1 line Show execution time of tests ------------------------------------------------------------------------ r15868 | chorns | 2005-06-12 12:18:51 +0200 (Sun, 12 Jun 2005) | 1 line Support module_depends target ------------------------------------------------------------------------ r15866 | chorns | 2005-06-12 11:36:25 +0200 (Sun, 12 Jun 2005) | 1 line Make test pass ------------------------------------------------------------------------ r15810 | chorns | 2005-06-05 18:47:42 +0200 (Sun, 05 Jun 2005) | 1 line Clean proxy makefiles on 'make clean' ------------------------------------------------------------------------ r15808 | chorns | 2005-06-05 17:59:18 +0200 (Sun, 05 Jun 2005) | 1 line Generate proxy makefiles in output tree. ------------------------------------------------------------------------ r15802 | chorns | 2005-06-05 14:08:39 +0200 (Sun, 05 Jun 2005) | 1 line Correct dependencies for 'make <module>_install' ------------------------------------------------------------------------ r15801 | chorns | 2005-06-05 13:22:16 +0200 (Sun, 05 Jun 2005) | 4 lines * Support enabling/disabling modules depending on configuration. * Enable halup for MP=0 configuration and halmp for MP=1 configuration. ------------------------------------------------------------------------ r15703 | chorns | 2005-05-31 19:30:54 +0200 (Tue, 31 May 2005) | 1 line Generate SMP friendly temporary filenames ------------------------------------------------------------------------ r15667 | ion | 2005-05-29 18:07:05 +0200 (Sun, 29 May 2005) | 1 line Build at 2GB like before ------------------------------------------------------------------------ r15656 | chorns | 2005-05-29 13:51:37 +0200 (Sun, 29 May 2005) | 1 line Autodetect nasm ------------------------------------------------------------------------ r15640 | weiden | 2005-05-29 00:40:04 +0200 (Sun, 29 May 2005) | 1 line little fix ------------------------------------------------------------------------ r15634 | weiden | 2005-05-29 00:22:25 +0200 (Sun, 29 May 2005) | 1 line make rbuild compile with gcc4 ------------------------------------------------------------------------ r15604 | chorns | 2005-05-28 21:35:23 +0200 (Sat, 28 May 2005) | 1 line Use detected prefix ------------------------------------------------------------------------ r15599 | chorns | 2005-05-28 20:43:25 +0200 (Sat, 28 May 2005) | 1 line -mi switch for rbuild to not have rbuild create install directories. ------------------------------------------------------------------------ r15588 | ion | 2005-05-28 18:42:50 +0200 (Sat, 28 May 2005) | 1 line Build with optimizations ------------------------------------------------------------------------ r15583 | chorns | 2005-05-28 17:18:30 +0200 (Sat, 28 May 2005) | 1 line Merge 12735:15568 from xmlbuildsystem branch ------------------------------------------------------------------------ r15547 | chorns | 2005-05-27 21:29:24 +0200 (Fri, 27 May 2005) | 1 line Merge 15329:15546 from trunk ------------------------------------------------------------------------ r15437 | chorns | 2005-05-20 21:07:23 +0200 (Fri, 20 May 2005) | 1 line Support alternate name for hooked function ------------------------------------------------------------------------ r15435 | chorns | 2005-05-20 17:15:19 +0200 (Fri, 20 May 2005) | 1 line Don't echo executable name of test ------------------------------------------------------------------------ r15434 | chorns | 2005-05-20 17:12:32 +0200 (Fri, 20 May 2005) | 1 line Implement 'make test' ------------------------------------------------------------------------ r15433 | chorns | 2005-05-20 16:55:15 +0200 (Fri, 20 May 2005) | 1 line Optimize SourceFile::ReadInclude ------------------------------------------------------------------------ r15413 | chorns | 2005-05-19 21:53:01 +0200 (Thu, 19 May 2005) | 1 line Option to disable automatic dependencies ------------------------------------------------------------------------ r15337 | chorns | 2005-05-16 13:41:54 +0200 (Mon, 16 May 2005) | 1 line Do automatic dependency checking for pre-compiled header files ------------------------------------------------------------------------ r15327 | chorns | 2005-05-16 01:43:28 +0200 (Mon, 16 May 2005) | 1 line Depend on generated RPC headers ------------------------------------------------------------------------ r15324 | chorns | 2005-05-16 00:07:07 +0200 (Mon, 16 May 2005) | 1 line Build and run tests ------------------------------------------------------------------------ r15315 | chorns | 2005-05-15 17:56:06 +0200 (Sun, 15 May 2005) | 1 line Generate proxy makefiles ------------------------------------------------------------------------ r15312 | chorns | 2005-05-15 16:18:45 +0200 (Sun, 15 May 2005) | 1 line Overwrite registry only if the source files change ------------------------------------------------------------------------ r15310 | chorns | 2005-05-15 15:57:03 +0200 (Sun, 15 May 2005) | 1 line Re-insert makefile code for non-DLLs which was removed by accident ------------------------------------------------------------------------ r15308 | chorns | 2005-05-15 15:20:45 +0200 (Sun, 15 May 2005) | 1 line Support modules with no base install directory ------------------------------------------------------------------------ r15304 | chorns | 2005-05-15 13:58:48 +0200 (Sun, 15 May 2005) | 1 line Generate hooks and stubs for tests ------------------------------------------------------------------------ r15280 | chorns | 2005-05-14 19:57:31 +0200 (Sat, 14 May 2005) | 1 line Extract WINE resources at compile-time ------------------------------------------------------------------------ r15279 | chorns | 2005-05-14 17:07:11 +0200 (Sat, 14 May 2005) | 1 line Only pass GCC specific options to GCC ------------------------------------------------------------------------ r15267 | chorns | 2005-05-13 21:17:44 +0200 (Fri, 13 May 2005) | 1 line Support compilerflag within IFs ------------------------------------------------------------------------ r15244 | chorns | 2005-05-12 21:32:15 +0200 (Thu, 12 May 2005) | 1 line Generate make rules for creating directories if they don't exist ------------------------------------------------------------------------ r15232 | chorns | 2005-05-11 22:58:40 +0200 (Wed, 11 May 2005) | 1 line Generate static libraries in intermediate directory ------------------------------------------------------------------------ r15223 | chorns | 2005-05-11 19:37:46 +0200 (Wed, 11 May 2005) | 1 line Use mingw convention for import libraries (libmodule.a) ------------------------------------------------------------------------ r15221 | chorns | 2005-05-11 19:12:24 +0200 (Wed, 11 May 2005) | 1 line Rebuild import library if definition file is modified ------------------------------------------------------------------------ r15122 | chorns | 2005-05-08 16:39:46 +0200 (Sun, 08 May 2005) | 1 line Relink executable if definition file changes. ------------------------------------------------------------------------ r15121 | chorns | 2005-05-08 16:30:04 +0200 (Sun, 08 May 2005) | 1 line Be consistent when passing --dll argument to gcc ------------------------------------------------------------------------ r15120 | chorns | 2005-05-08 15:45:50 +0200 (Sun, 08 May 2005) | 1 line Build non-stripped version of ntoskrnl.exe if requested ------------------------------------------------------------------------ r15047 | chorns | 2005-05-06 18:05:37 +0200 (Fri, 06 May 2005) | 1 line Add <module>_install target ------------------------------------------------------------------------ r15044 | chorns | 2005-05-06 16:12:25 +0200 (Fri, 06 May 2005) | 1 line More sane default image base addresses ------------------------------------------------------------------------ r15038 | chorns | 2005-05-06 13:20:10 +0200 (Fri, 06 May 2005) | 1 line Add missing file ------------------------------------------------------------------------ r15036 | chorns | 2005-05-06 12:45:24 +0200 (Fri, 06 May 2005) | 1 line Don't strip relocation information from DLLs ------------------------------------------------------------------------ r15035 | chorns | 2005-05-06 12:38:30 +0200 (Fri, 06 May 2005) | 1 line Set svn:eol-style=native ------------------------------------------------------------------------ r15017 | chorns | 2005-05-05 21:15:25 +0200 (Thu, 05 May 2005) | 1 line Merge 14551:14980 from trunk ------------------------------------------------------------------------ r14788 | chorns | 2005-04-23 20:41:02 +0200 (Sat, 23 Apr 2005) | 1 line ROS_BUILDNOSTRIP environment variable to control building of non-symbol-stripped executable output files ------------------------------------------------------------------------ r14782 | chorns | 2005-04-23 19:24:13 +0200 (Sat, 23 Apr 2005) | 1 line Don't detect host compiler on Linux ------------------------------------------------------------------------ r14747 | chorns | 2005-04-22 17:06:58 +0200 (Fri, 22 Apr 2005) | 4 lines * Use freeldr.sys for livecd * Install registry hives in the right place on the livecd ------------------------------------------------------------------------ r14738 | chorns | 2005-04-22 12:12:37 +0200 (Fri, 22 Apr 2005) | 4 lines * Remove empty line * Rearrange some dependencies ------------------------------------------------------------------------ r14736 | chorns | 2005-04-22 11:19:18 +0200 (Fri, 22 Apr 2005) | 1 line Clean object files for static libraries ------------------------------------------------------------------------ r14733 | chorns | 2005-04-21 18:18:29 +0200 (Thu, 21 Apr 2005) | 1 line Generate temporary files at the root of the directory ------------------------------------------------------------------------ r14731 | chorns | 2005-04-21 15:05:54 +0200 (Thu, 21 Apr 2005) | 1 line Use ROS_INTERMEDIATE and ROS_OUTPUT environment variables ------------------------------------------------------------------------ r14729 | chorns | 2005-04-21 14:54:15 +0200 (Thu, 21 Apr 2005) | 1 line Clean-as-you-go mode to remove generated files as soon as possible to minimize disk space requirements ------------------------------------------------------------------------ r14727 | chorns | 2005-04-21 11:38:45 +0200 (Thu, 21 Apr 2005) | 1 line Autodetect compiler ------------------------------------------------------------------------ r14722 | chorns | 2005-04-20 22:48:55 +0200 (Wed, 20 Apr 2005) | 1 line Don't put \ at end of path ------------------------------------------------------------------------ r14716 | chorns | 2005-04-20 19:57:26 +0200 (Wed, 20 Apr 2005) | 1 line Don't link kernel-mode modules to kernel32.dll ------------------------------------------------------------------------ r14715 | hpoussin | 2005-04-20 18:01:19 +0200 (Wed, 20 Apr 2005) | 1 line Don't hardcode "Reactos.xml" name ------------------------------------------------------------------------ r14705 | chorns | 2005-04-19 22:52:49 +0200 (Tue, 19 Apr 2005) | 1 line Support 'make livecd' ------------------------------------------------------------------------ r14591 | chorns | 2005-04-11 20:45:48 +0200 (Mon, 11 Apr 2005) | 1 line Have the object files of a module depend on the build file that contain the module ------------------------------------------------------------------------ r14582 | chorns | 2005-04-10 21:44:11 +0200 (Sun, 10 Apr 2005) | 1 line Support -Werror ------------------------------------------------------------------------ r14575 | chorns | 2005-04-10 16:32:30 +0200 (Sun, 10 Apr 2005) | 1 line Merge 13831:14550 from trunk ------------------------------------------------------------------------ r14540 | chorns | 2005-04-07 22:28:35 +0200 (Thu, 07 Apr 2005) | 4 lines * Clean object files * Clean generated files for cabman ------------------------------------------------------------------------ r14538 | chorns | 2005-04-07 21:39:39 +0200 (Thu, 07 Apr 2005) | 1 line Use order-only prerequisites for directories to prevent spurious rebuilds when building on non-FAT volumes ------------------------------------------------------------------------ r14533 | chorns | 2005-04-07 00:27:22 +0200 (Thu, 07 Apr 2005) | 1 line Add the files where they are located ------------------------------------------------------------------------ r14532 | chorns | 2005-04-06 22:49:49 +0200 (Wed, 06 Apr 2005) | 1 line Correct some wrong dependencies for 'make bootcd' ------------------------------------------------------------------------ r14520 | chorns | 2005-04-05 22:24:26 +0200 (Tue, 05 Apr 2005) | 1 line Accept ROS_INSTALL environment variable ------------------------------------------------------------------------ r14510 | chorns | 2005-04-05 20:49:53 +0200 (Tue, 05 Apr 2005) | 1 line Rebuild source if a header is changed ------------------------------------------------------------------------ r14509 | chorns | 2005-04-05 20:20:45 +0200 (Tue, 05 Apr 2005) | 1 line Simplify directory handling ------------------------------------------------------------------------ r14507 | chorns | 2005-04-05 19:22:02 +0200 (Tue, 05 Apr 2005) | 1 line Generate registry hives on 'make install' ------------------------------------------------------------------------ r14488 | chorns | 2005-04-04 22:50:55 +0200 (Mon, 04 Apr 2005) | 1 line Support installation of generated files ------------------------------------------------------------------------ r14487 | chorns | 2005-04-04 21:39:44 +0200 (Mon, 04 Apr 2005) | 1 line Let dependencies control 'make install' ------------------------------------------------------------------------ r14483 | chorns | 2005-04-03 21:25:58 +0200 (Sun, 03 Apr 2005) | 1 line Partial 'make install' implementation ------------------------------------------------------------------------ r14472 | chorns | 2005-04-03 13:58:31 +0200 (Sun, 03 Apr 2005) | 1 line Add missing file ------------------------------------------------------------------------ r14471 | chorns | 2005-04-03 13:57:34 +0200 (Sun, 03 Apr 2005) | 1 line Verbose mode ------------------------------------------------------------------------ r14468 | chorns | 2005-04-03 12:46:08 +0200 (Sun, 03 Apr 2005) | 1 line Detect compiler -pipe support ------------------------------------------------------------------------ r14466 | chorns | 2005-04-03 12:05:52 +0200 (Sun, 03 Apr 2005) | 1 line Avoid spurious error messages during make clean ------------------------------------------------------------------------ r14461 | chorns | 2005-04-02 23:45:16 +0200 (Sat, 02 Apr 2005) | 1 line Generate map files ------------------------------------------------------------------------ r14449 | chorns | 2005-04-02 18:46:08 +0200 (Sat, 02 Apr 2005) | 1 line Have rbuild create the output directories ------------------------------------------------------------------------ r14423 | chorns | 2005-04-01 21:31:52 +0200 (Fri, 01 Apr 2005) | 1 line Put winebuild output in intermediate directory ------------------------------------------------------------------------ r14419 | chorns | 2005-04-01 20:18:18 +0200 (Fri, 01 Apr 2005) | 1 line Build stubs generated by winebuild ------------------------------------------------------------------------ r14394 | sedwards | 2005-03-31 21:54:03 +0200 (Thu, 31 Mar 2005) | 1 line add a inline strupr for us Unix folk ------------------------------------------------------------------------ r14315 | royce | 2005-03-25 18:08:30 +0100 (Fri, 25 Mar 2005) | 1 line reorder GenerateRules() to get rid of unnecessary if() ------------------------------------------------------------------------ r14314 | chorns | 2005-03-25 17:32:46 +0100 (Fri, 25 Mar 2005) | 1 line Output rules for objectlibrary files ------------------------------------------------------------------------ r14311 | chorns | 2005-03-25 15:31:00 +0100 (Fri, 25 Mar 2005) | 1 line Generate object macros before target macros ------------------------------------------------------------------------ r14309 | chorns | 2005-03-25 14:02:35 +0100 (Fri, 25 Mar 2005) | 1 line Enable rbuild_test again ------------------------------------------------------------------------ r14265 | royce | 2005-03-22 08:25:53 +0100 (Tue, 22 Mar 2005) | 4 lines eliminate rmkdir and generate directory dependencies the right way. treat ROS_TEMPORARY, ROS_INTERMEDIATE, and ROS_OUTPUT as potential different directories. major refactor of mingw backend to simplify things, and fix some output bugs, as well as reduce makefile.auto size a bit. create all macros before we start writing rules ( create all target macros before any other ), this fixes bug with macros being empty because they're used before they're defined ------------------------------------------------------------------------ r14241 | chorns | 2005-03-20 22:58:30 +0100 (Sun, 20 Mar 2005) | 1 line Test module type support ------------------------------------------------------------------------ r14087 | royce | 2005-03-15 04:51:11 +0100 (Tue, 15 Mar 2005) | 1 line I give up, make's "directory target" support has a fatal flaw, converting to "dummy file" system ------------------------------------------------------------------------ r14071 | royce | 2005-03-14 21:06:14 +0100 (Mon, 14 Mar 2005) | 2 lines fix dlltool target directory dependencies add buildno's output to clean: ------------------------------------------------------------------------ r14070 | chorns | 2005-03-14 20:42:00 +0100 (Mon, 14 Mar 2005) | 1 line Report why a file is marked for rebuild ------------------------------------------------------------------------ r14069 | royce | 2005-03-14 20:38:13 +0100 (Mon, 14 Mar 2005) | 1 line list directory dependencies last, so that $(ECHO_FOO) prints the right thing. also use $@ where possible to reduce makefile.auto size a bit ------------------------------------------------------------------------ r14068 | chorns | 2005-03-14 20:31:25 +0100 (Mon, 14 Mar 2005) | 1 line Depend on the object file directory, not the object file. ------------------------------------------------------------------------ r14067 | royce | 2005-03-14 20:11:03 +0100 (Mon, 14 Mar 2005) | 5 lines echo [WMC] commands remove some unnecessary indirect dependencies have rbuild mkdir commands depend directly on RMKDIR_TARGET don't have object files depend on themselves! add rmkdir, rsym, and wmc phony targets ------------------------------------------------------------------------ r14066 | chorns | 2005-03-14 19:51:29 +0100 (Mon, 14 Mar 2005) | 4 lines * Build bin2res and cabman in bootstrap makefiles * Remove make directory hack as it wasn't needed anyway ------------------------------------------------------------------------ r14034 | chorns | 2005-03-13 22:34:47 +0100 (Sun, 13 Mar 2005) | 4 lines * Correct dependencies for ROS_INTERMEDIATE <> . in generated makefile * GNU make don't support depending on a directory, so simulate the dependency using a file ------------------------------------------------------------------------ r14003 | chorns | 2005-03-13 11:33:15 +0100 (Sun, 13 Mar 2005) | 1 line Make tests build again ------------------------------------------------------------------------ r13994 | royce | 2005-03-13 07:31:38 +0100 (Sun, 13 Mar 2005) | 2 lines added validation for <directory>'s name attribute create dk/nkm/lib if it doesn't exist ------------------------------------------------------------------------ r13993 | royce | 2005-03-13 06:32:52 +0100 (Sun, 13 Mar 2005) | 4 lines fix some dependencies get rid of unnecessary phony targets eliminate unnecessary makefile.auto dependencies silence gcc when detecting pch ------------------------------------------------------------------------ r13990 | royce | 2005-03-13 04:16:16 +0100 (Sun, 13 Mar 2005) | 1 line hack fix 'hostzlib' circular dependency, added a couple more stub makefiles, added 'rbuild' phony target ------------------------------------------------------------------------ r13956 | royce | 2005-03-12 05:55:41 +0100 (Sat, 12 Mar 2005) | 1 line more *nix compatibility fixes ------------------------------------------------------------------------ r13955 | royce | 2005-03-12 05:39:20 +0100 (Sat, 12 Mar 2005) | 1 line set *nix-compatible paths for tools ------------------------------------------------------------------------ r13944 | royce | 2005-03-12 01:23:38 +0100 (Sat, 12 Mar 2005) | 1 line rename more makefiles, preparation for local makefiles to work with xml build system ------------------------------------------------------------------------ r13924 | royce | 2005-03-11 08:46:22 +0100 (Fri, 11 Mar 2005) | 1 line host vs target refactoring, <module> has two new attributes 'host' and 'prefix' ( this should fix sedwards' host.zlib.a issue, and also forgot to commit change to buildno's makefile in support of new macros in top-level makefile ( which should fix build bug arty experiencing re buildno.h ) ------------------------------------------------------------------------ r13917 | royce | 2005-03-10 21:34:08 +0100 (Thu, 10 Mar 2005) | 1 line more efficient detection of C++ modules, fixed bug in C++ pch support, always clean pch files, even if pch not being used ------------------------------------------------------------------------ r13915 | royce | 2005-03-10 20:56:46 +0100 (Thu, 10 Mar 2005) | 1 line simplified verbosity ------------------------------------------------------------------------ r13908 | royce | 2005-03-10 15:05:41 +0100 (Thu, 10 Mar 2005) | 1 line PCH support ------------------------------------------------------------------------ r13902 | royce | 2005-03-10 00:38:37 +0100 (Thu, 10 Mar 2005) | 1 line don't try to create ROS_INTERMEDIATE directories if ROS_INTERMEDIATE isn't defined ------------------------------------------------------------------------ r13901 | royce | 2005-03-09 23:29:18 +0100 (Wed, 09 Mar 2005) | 2 lines simplified <if> handling ( and fixed several bugs, too ) cleaned up devcpp backend to compile with these changes ------------------------------------------------------------------------ r13899 | royce | 2005-03-09 09:12:30 +0100 (Wed, 09 Mar 2005) | 2 lines fixed some dependency issues, verbose support, 'make clean' gets more ------------------------------------------------------------------------ r13889 | royce | 2005-03-08 22:02:50 +0100 (Tue, 08 Mar 2005) | 1 line adjust newlines around rsym command ------------------------------------------------------------------------ r13888 | royce | 2005-03-08 21:50:42 +0100 (Tue, 08 Mar 2005) | 1 line add newline at EOF to suppress warning ------------------------------------------------------------------------ r13878 | royce | 2005-03-08 18:14:07 +0100 (Tue, 08 Mar 2005) | 1 line detect PCH support ( not doing anything more than detection yet ) ------------------------------------------------------------------------ r13872 | chorns | 2005-03-08 12:15:39 +0100 (Tue, 08 Mar 2005) | 1 line Have Makefile.auto depend on xml build files ------------------------------------------------------------------------ r13861 | chorns | 2005-03-06 22:24:06 +0100 (Sun, 06 Mar 2005) | 1 line Run rsym on images ------------------------------------------------------------------------ r13854 | chorns | 2005-03-06 14:49:10 +0100 (Sun, 06 Mar 2005) | 1 line Don't generate intermediate archives ------------------------------------------------------------------------ r13840 | chorns | 2005-03-06 00:22:44 +0100 (Sun, 06 Mar 2005) | 1 line Put remaining files on the cd ------------------------------------------------------------------------ r13833 | chorns | 2005-03-05 21:50:25 +0100 (Sat, 05 Mar 2005) | 1 line Merge 13511:13830 from trunk ------------------------------------------------------------------------ r13823 | royce | 2005-03-05 06:13:38 +0100 (Sat, 05 Mar 2005) | 2 lines per-module clean rules, make cabman more *nix/msys friendly This fix made it so I was able to successfully build a 22.4MB ReactOS.iso from the xmlbuildsystem branch! ( now to test it... ) ------------------------------------------------------------------------ r13807 | chorns | 2005-03-03 22:00:30 +0100 (Thu, 03 Mar 2005) | 1 line Support for copying non-generated files to cd ------------------------------------------------------------------------ r13803 | chorns | 2005-03-02 23:56:41 +0100 (Wed, 02 Mar 2005) | 3 lines Copy bootstrap files to cd ------------------------------------------------------------------------ r13797 | chorns | 2005-03-02 22:24:02 +0100 (Wed, 02 Mar 2005) | 3 lines Add bootstrap tag to specify that files are to be copied to the CD ------------------------------------------------------------------------ r13755 | chorns | 2005-02-26 18:11:06 +0100 (Sat, 26 Feb 2005) | 1 line Support for non-standard module base addresses ------------------------------------------------------------------------ r13746 | royce | 2005-02-25 22:21:53 +0100 (Fri, 25 Feb 2005) | 1 line fix NUL, move macros to the bootstrap makefile as necessary ------------------------------------------------------------------------ r13743 | royce | 2005-02-25 21:00:27 +0100 (Fri, 25 Feb 2005) | 1 line fixed 'make all' and added some missing clean:: rules ------------------------------------------------------------------------ r13590 | chorns | 2005-02-15 22:24:19 +0100 (Tue, 15 Feb 2005) | 1 line Merge 13159:13510 from trunk ------------------------------------------------------------------------ r13506 | chorns | 2005-02-12 16:11:48 +0100 (Sat, 12 Feb 2005) | 3 lines Add stub GNU makefile ------------------------------------------------------------------------ r13496 | chorns | 2005-02-11 20:13:01 +0100 (Fri, 11 Feb 2005) | 4 lines * Run build tools after parsing build files * Generate roscfg.h ------------------------------------------------------------------------ r13472 | sedwards | 2005-02-08 23:50:55 +0100 (Tue, 08 Feb 2005) | 1 line define _MAX_PATH as well ------------------------------------------------------------------------ r13470 | chorns | 2005-02-08 23:21:16 +0100 (Tue, 08 Feb 2005) | 1 line Generate reactos.cab ------------------------------------------------------------------------ r13435 | chorns | 2005-02-06 12:01:22 +0100 (Sun, 06 Feb 2005) | 3 lines Build snmpapi and network applications ------------------------------------------------------------------------ r13428 | chorns | 2005-02-05 23:48:07 +0100 (Sat, 05 Feb 2005) | 3 lines Build smss and system applications ------------------------------------------------------------------------ r13426 | chorns | 2005-02-05 20:16:14 +0100 (Sat, 05 Feb 2005) | 4 lines * Build ntvdm * Add win32cui module type support ------------------------------------------------------------------------ r13424 | chorns | 2005-02-05 19:52:38 +0100 (Sat, 05 Feb 2005) | 4 lines * Build csrss and win32csr * NativeCUI module type support ------------------------------------------------------------------------ r13401 | royce | 2005-02-04 00:54:02 +0100 (Fri, 04 Feb 2005) | 1 line compatibility fixes ------------------------------------------------------------------------ r13393 | arty | 2005-02-03 16:43:51 +0100 (Thu, 03 Feb 2005) | 3 lines Add a . to an empty path to make a relative path, before the initial / is added. ------------------------------------------------------------------------ r13390 | chorns | 2005-02-02 23:30:55 +0100 (Wed, 02 Feb 2005) | 4 lines * Parse .cpp, .rc, and .s files * #include_next support ------------------------------------------------------------------------ r13388 | sedwards | 2005-02-02 21:10:14 +0100 (Wed, 02 Feb 2005) | 1 line [truncated at 1000 lines; 376 more skipped]

1 0

[ion] 8: - Update directory change in rbuild/xml files too.
by ion＠svn.reactos.org 28 Jan '06

28 Jan '06

- Update directory change in rbuild/xml files too. Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2006-01-28 06:22:12 UTC (rev 7) +++ trunk/reactos/ReactOS.xml 2006-01-28 06:35:12 UTC (rev 8) @@ -50,8 +50,8 @@ <xi:include href="boot/boot.xml" /> </directory> --> - <directory name="bootdata"> - <xi:include href="bootdata/bootdata.xml" /> + <directory name="boot"> + <xi:include href="boot/bootdata.xml" /> </directory> <!-- <directory name="drivers"> _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2006-01-28 06:22:12 UTC (rev 7) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2006-01-28 06:35:12 UTC (rev 8) @@ -1023,11 +1023,11 @@ string MingwBackend::GetRegistrySourceFiles () { - return "bootdata" + sSep + "hivecls.inf " - "bootdata" + sSep + "hivedef.inf " - "bootdata" + sSep + "hiveinst.inf " - "bootdata" + sSep + "hivesft.inf " - "bootdata" + sSep + "hivesys.inf"; + return "boot" + sSep + "hivecls.inf " + "boot" + sSep + "hivedef.inf " + "boot" + sSep + "hiveinst.inf " + "boot" + sSep + "hivesft.inf " + "boot" + sSep + "hivesys.inf"; } string @@ -1065,7 +1065,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) bootdata %s bootdata%chiveinst.inf\n", + "\t$(MKHIVE_TARGET) bootdata %s boot%chiveinst.inf\n", system32ConfigDirectory.c_str (), cSep ); fprintf ( fMakefile, _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2006-01-28 06:22:12 UTC (rev 7) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2006-01-28 06:35:12 UTC (rev 8) @@ -2937,7 +2937,7 @@ string reactosInf = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup + sSep + "reactos.inf" ), backend->outputDirectory ); - string reactosDff = NormalizeFilename ( "bootdata" + sSep + "packages" + sSep + "reactos.dff" ); + string reactosDff = NormalizeFilename ( "boot" + sSep + "packages" + sSep + "reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); vector<string> vCdFiles; GetCdFiles ( vCdFiles ); @@ -3061,7 +3061,7 @@ CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "Desktop" ); CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "My Documents" ); - string livecdIni = "bootdata" + sSep + "livecd.ini"; + string livecdIni = "boot" + sSep + "livecd.ini"; OutputCopyCommand ( livecdIni, "freeldr.ini", livecdDirectory ); @@ -3089,7 +3089,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) bootdata %s bootdata%clivecd.inf bootdata%chiveinst.inf\n", + "\t$(MKHIVE_TARGET) bootdata %s boot%clivecd.inf boot%chiveinst.inf\n", reactosSystem32ConfigDirectory.c_str (), cSep, cSep );

1 0

[ion] 7: bootdata->boot.
by ion＠svn.reactos.org 28 Jan '06

28 Jan '06

bootdata->boot. Added: trunk/reactos/boot/ Deleted: trunk/reactos/bootdata/ _____ Copied: trunk/reactos/boot (from rev 6, trunk/reactos/bootdata)

1 0

[gvg] 6: Add optimization compiler flags
by gvg＠svn.reactos.org 27 Jan '06

27 Jan '06

Add optimization compiler flags Modified: trunk/reactos/ReactOS.xml Modified: trunk/reactos/tools/tools.mak _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2006-01-27 22:21:26 UTC (rev 5) +++ trunk/reactos/ReactOS.xml 2006-01-27 22:33:56 UTC (rev 6) @@ -24,6 +24,12 @@ <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> Property changes on: trunk/reactos/bootdata/bootcd ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2006-01-27 22:21:26 UTC (rev 5) +++ trunk/reactos/tools/tools.mak 2006-01-27 22:33:56 UTC (rev 6) @@ -6,7 +6,8 @@ TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith +TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith -Os -Wno-strict-aliasing \ + -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 TOOLS_LFLAGS = $(LFLAGS) $(TOOLS_INT): | $(INTERMEDIATE)

1 0

[chorns] 5: Bootcd target
by chorns＠svn.reactos.org 27 Jan '06

27 Jan '06

Bootcd target Modified: trunk/reactos/ReactOS.xml Added: trunk/reactos/bootdata/ Added: trunk/reactos/bootdata/bootcd/ Added: trunk/reactos/bootdata/bootcd/bootcd.xml Added: trunk/reactos/bootdata/bootdata.xml Added: trunk/reactos/tools/cdmake/ Added: trunk/reactos/tools/cdmake/cdmake.c Added: trunk/reactos/tools/cdmake/cdmake.mak Added: trunk/reactos/tools/cdmake/llmosrt.c Added: trunk/reactos/tools/cdmake/readme.txt Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/tools.mak Property changes on: trunk/reactos ___________________________________________________________________ Name: svn:ignore + reactos obj-i386 output-i386 makefile.auto ReactOS.iso _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2006-01-27 22:10:19 UTC (rev 4) +++ trunk/reactos/ReactOS.xml 2006-01-27 22:21:26 UTC (rev 5) @@ -43,9 +43,11 @@ <directory name="boot"> <xi:include href="boot/boot.xml" /> </directory> +--> <directory name="bootdata"> <xi:include href="bootdata/bootdata.xml" /> </directory> +<!-- <directory name="drivers"> <xi:include href="drivers/directory.xml" /> </directory> _____ Added: trunk/reactos/bootdata/bootcd/bootcd.xml --- trunk/reactos/bootdata/bootcd/bootcd.xml 2006-01-27 22:10:19 UTC (rev 4) +++ trunk/reactos/bootdata/bootcd/bootcd.xml 2006-01-27 22:21:26 UTC (rev 5) @@ -0,0 +1,2 @@ +<module name="bootcd" type="iso"> +</module> _____ Added: trunk/reactos/bootdata/bootdata.xml --- trunk/reactos/bootdata/bootdata.xml 2006-01-27 22:10:19 UTC (rev 4) +++ trunk/reactos/bootdata/bootdata.xml 2006-01-27 22:21:26 UTC (rev 5) @@ -0,0 +1,5 @@ +<group> +<directory name="bootcd"> + <xi:include href="bootcd/bootcd.xml" /> +</directory> +</group> _____ Added: trunk/reactos/tools/cdmake/cdmake.c --- trunk/reactos/tools/cdmake/cdmake.c 2006-01-27 22:10:19 UTC (rev 4) +++ trunk/reactos/tools/cdmake/cdmake.c 2006-01-27 22:21:26 UTC (rev 5) @@ -0,0 +1,1675 @@ +/* + * CD-ROM Maker + * by Philip J. Erdelsky + * pje(a)acm.org + * http://www.alumni.caltech.edu/~pje/ + * + * ElTorito-Support + * by Eric Kohl + * ekohl(a)rz-online.de + * + * Linux port + * by Casper S. Hornstrup + * chorns(a)users.sourceforge.net + * + * Joliet support + * by Filip Navara + * xnavara(a)volny.cz + * Limitations: + * - No Joliet file name validations + * - Very bad ISO file name generation + * + * + * convert long filename to iso9660 file name by Magnus Olsen + * magnus(a)greatlord.com + * + * $Id: cdmake.c 18952 2005-11-02 16:13:00Z gvg $ + */ + +/* According to his website, this file was released into the public domain by Phillip J. Erdelsky */ + +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#ifdef WIN32 +# include <io.h> +# include <dos.h> +#else +# ifdef __FreeBSD__ +# include <sys/uio.h> +# else +# include <sys/io.h> +# endif // __FreeBSD__ +# include <errno.h> +# include <sys/types.h> +# include <dirent.h> +# include <unistd.h> +#endif // WIN32 +#include <ctype.h> +#include <setjmp.h> +#include <time.h> +#ifndef WIN32 +#ifndef MAX_PATH +#define MAX_PATH 260 +#endif +#define DIR_SEPARATOR_CHAR '/' +#define DIR_SEPARATOR_STRING "/" +#else +#define DIR_SEPARATOR_CHAR '\\' +#define DIR_SEPARATOR_STRING "\\" +#endif + +typedef unsigned char BYTE; +typedef unsigned short WORD; +typedef unsigned long DWORD; +typedef int BOOL; + +const BOOL TRUE = 1; +const BOOL FALSE = 0; + +// file system parameters + +#define MAX_LEVEL 8 +#define MAX_NAME_LENGTH 64 +#define MAX_CDNAME_LENGTH 8 +#define MAX_EXTENSION_LENGTH 10 +#define MAX_CDEXTENSION_LENGTH 3 +#define SECTOR_SIZE 2048 +#define BUFFER_SIZE (8 * SECTOR_SIZE) + +const BYTE HIDDEN_FLAG = 1; +const BYTE DIRECTORY_FLAG = 2; + + +struct cd_image +{ + FILE *file; + DWORD sector; // sector to receive next byte + int offset; // offset of next byte in sector + int count; // number of bytes in buffer + char filespecs[128]; + BYTE *buffer; +}; + +typedef struct date_and_time +{ + BYTE second; + BYTE minute; + BYTE hour; + BYTE day; + BYTE month; + WORD year; +} DATE_AND_TIME, *PDATE_AND_TIME; + +typedef struct directory_record +{ + struct directory_record *next_in_directory; + struct directory_record *next_in_path_table; /* directory record only */ + struct directory_record *next_in_memory; + struct directory_record *first_record; /* directory record only */ + struct directory_record *parent; + BYTE flags; + char name[MAX_NAME_LENGTH+1]; + char name_on_cd[MAX_CDNAME_LENGTH+1]; + char extension[MAX_EXTENSION_LENGTH+1]; + char extension_on_cd[MAX_CDEXTENSION_LENGTH+1]; + char *joliet_name; + DATE_AND_TIME date_and_time; + DWORD sector; + DWORD size; + DWORD joliet_sector; + DWORD joliet_size; + unsigned level; /* directory record only */ + WORD path_table_index; /* directory record only */ +} DIR_RECORD, *PDIR_RECORD; + + +typedef enum directory_record_type +{ + DOT_RECORD, + DOT_DOT_RECORD, + SUBDIRECTORY_RECORD, + FILE_RECORD +} DIR_RECORD_TYPE, *PDIR_RECORD_TYPE; + + +PDIR_RECORD sort_linked_list(PDIR_RECORD, + unsigned, int (*)(PDIR_RECORD, PDIR_RECORD)); + + +static char DIRECTORY_TIMESTAMP[] = "~Y$'KOR$.3K&"; + +static jmp_buf error; +static struct cd_image cd; + +char volume_label[32]; +DIR_RECORD root; +char source[512]; +char *end_source; +enum {QUIET, NORMAL, VERBOSE} verbosity; +BOOL show_progress; +DWORD size_limit; +BOOL accept_punctuation_marks; + +DWORD total_sectors; +DWORD path_table_size; +DWORD little_endian_path_table_sector; +DWORD big_endian_path_table_sector; +DWORD number_of_files; +DWORD bytes_in_files; +DWORD unused_bytes_at_ends_of_files; +DWORD number_of_directories; +DWORD bytes_in_directories; + +char bootimage[512]; +BOOL eltorito; +DWORD boot_catalog_sector; +DWORD boot_image_sector; +WORD boot_image_size; // counted in 512 byte sectors + +BOOL joliet; +DWORD joliet_path_table_size; +DWORD joliet_little_endian_path_table_sector; +DWORD joliet_big_endian_path_table_sector; + +/*--------------------------------------------------------------------- -------- +This function edits a 32-bit unsigned number into a comma-delimited form, such +as 4,294,967,295 for the largest possible number, and returns a pointer to a +static buffer containing the result. It suppresses leading zeros and commas, +but optionally pads the result with blanks at the left so the result is always +exactly 13 characters long (excluding the terminating zero). + +CAUTION: A statement containing more than one call on this function, such as +printf("%s, %s", edit_with_commas(a), edit_with_commas(b)), will produce +incorrect results because all calls use the same static bufffer. +----------------------------------------------------------------------- ------*/ + +static char *edit_with_commas(DWORD x, BOOL pad) +{ + static char s[14]; + unsigned i = 13; + do + { + if (i % 4 == 2) s[--i] = ','; + s[--i] = (char)(x % 10 + '0'); + } while ((x/=10) != 0); + if (pad) + { + while (i > 0) s[--i] = ' '; + } + return s + i; +} + +/*--------------------------------------------------------------------- -------- +This function releases all allocated memory blocks. +----------------------------------------------------------------------- ------*/ + +static void release_memory(void) +{ + while (root.next_in_memory != NULL) + { + struct directory_record *next = + root.next_in_memory->next_in_memory; + if (joliet) + free (root.joliet_name); + free (root.next_in_memory); + root.next_in_memory = next; + } + if (cd.buffer != NULL) + { + free (cd.buffer); + cd.buffer = NULL; + } +} + +/*--------------------------------------------------------------------- -------- +This function edits and displays an error message and then jumps back to the +error exit point in main(). +----------------------------------------------------------------------- ------*/ + +void error_exit ( const char* fmt, ... ) +{ + va_list arg; + + va_start(arg, fmt); + vprintf(fmt, arg); + va_end(arg); + printf("\n"); + if (cd.file != NULL) + fclose(cd.file); + release_memory(); + exit(1); +} + +/*--------------------------------------------------------------------- -------- +This function, which is called only on the second pass, and only when the +buffer is not empty, flushes the buffer to the CD-ROM image. +----------------------------------------------------------------------- ------*/ + +static void flush_buffer(void) +{ + if (fwrite(cd.buffer, cd.count, 1, cd.file) < 1) + error_exit("File write error"); + cd.count = 0; + if (show_progress) + { + printf("\r%s ", + edit_with_commas((total_sectors - cd.sector) * SECTOR_SIZE, TRUE)); + } +} + +/*--------------------------------------------------------------------- -------- +This function writes a single byte to the CD-ROM image. On the first pass (in +which cd.handle < 0), it does not actually write anything but merely updates +the file pointer as though the byte had been written. +----------------------------------------------------------------------- ------*/ + +static void write_byte(BYTE x) +{ + if (cd.file != NULL) + { + cd.buffer[cd.count] = x; + if (++cd.count == BUFFER_SIZE) + flush_buffer(); + } + if (++cd.offset == SECTOR_SIZE) + { + cd.sector++; + cd.offset = 0; + } +} + +/*--------------------------------------------------------------------- -------- +These functions write a word or double word to the CD-ROM image with the +specified endianity. +----------------------------------------------------------------------- ------*/ + +static void write_little_endian_word(WORD x) +{ + write_byte((BYTE)x); + write_byte((BYTE)(x >> 8)); +} + +static void write_big_endian_word(WORD x) +{ + write_byte((BYTE)(x >> 8)); + write_byte((BYTE)x); +} + +static void write_both_endian_word(WORD x) +{ + write_little_endian_word(x); + write_big_endian_word(x); +} + +static void write_little_endian_dword(DWORD x) +{ + write_byte((BYTE)x); + write_byte((BYTE)(x >> 8)); + write_byte((BYTE)(x >> 16)); + write_byte((BYTE)(x >> 24)); +} + +static void write_big_endian_dword(DWORD x) +{ + write_byte((BYTE)(x >> 24)); + write_byte((BYTE)(x >> 16)); + write_byte((BYTE)(x >> 8)); + write_byte((BYTE)x); +} + +static void write_both_endian_dword(DWORD x) +{ + write_little_endian_dword(x); + write_big_endian_dword(x); +} + +/*--------------------------------------------------------------------- -------- +This function writes enough zeros to fill out the end of a sector, and leaves +the file pointer at the beginning of the next sector. If the file pointer is +already at the beginning of a sector, it writes nothing. +----------------------------------------------------------------------- ------*/ + +static void fill_sector(void) +{ + while (cd.offset != 0) + write_byte(0); +} + +/*--------------------------------------------------------------------- -------- +This function writes a string to the CD-ROM image. The terminating \0 is not +written. +----------------------------------------------------------------------- ------*/ + +static void write_string(char *s) +{ + while (*s != 0) + write_byte(*s++); +} + +/*--------------------------------------------------------------------- -------- +This function writes a ansi string as a big endian unicode string to the CD-ROM +image. The terminating \0 is not written. +----------------------------------------------------------------------- ------*/ + +static void write_string_as_big_endian_unicode(char *s) +{ + while (*s != 0) + { + write_byte(0); + write_byte(*s++); + } +} + +/*--------------------------------------------------------------------- -------- +This function writes a block of identical bytes to the CD-ROM image. +----------------------------------------------------------------------- ------*/ + +static void write_block(unsigned count, BYTE value) +{ + while (count != 0) + { + write_byte(value); + count--; + } +} + +/*--------------------------------------------------------------------- -------- +This function writes a block of identical bige endian words to the CD-ROM image. +----------------------------------------------------------------------- ------*/ + +static void write_word_block(unsigned count, WORD value) +{ + while (count != 0) + { + write_big_endian_word(value); + count--; + } +} + +/*--------------------------------------------------------------------- -------- +This function writes a directory record to the CD_ROM image. +----------------------------------------------------------------------- ------*/ + +static void +write_directory_record(PDIR_RECORD d, + DIR_RECORD_TYPE DirType, + BOOL joliet) +{ + unsigned identifier_size; + unsigned record_size; + + if (joliet) + { + if (DirType == DOT_RECORD || DirType == DOT_DOT_RECORD) + identifier_size = 1; + else + identifier_size = strlen(d->joliet_name) * 2; + } + else + { + switch (DirType) + { + case DOT_RECORD: + case DOT_DOT_RECORD: + identifier_size = 1; + break; + case SUBDIRECTORY_RECORD: + /*printf ( "Subdir: %s\n", d->name_on_cd );*/ + identifier_size = strlen(d->name_on_cd); + break; + case FILE_RECORD: + /*printf ( "File: %s.%s -> %s.%s\n", d->name, d->extension, d->name_on_cd, d->extension_on_cd );*/ + identifier_size = strlen(d->name_on_cd) + 2; + if (d->extension_on_cd[0] != 0) + identifier_size += 1 + strlen(d->extension_on_cd); + break; + default: + identifier_size = 1; + break; + } + } + record_size = 33 + identifier_size; + if ((identifier_size & 1) == 0) + record_size++; + if (cd.offset + record_size > SECTOR_SIZE) + fill_sector(); + write_byte((BYTE)record_size); + write_byte(0); // number of sectors in extended attribute record + if (joliet) + { + write_both_endian_dword(d->joliet_sector); + write_both_endian_dword(d->joliet_size); + } + else + { + write_both_endian_dword(d->sector); + write_both_endian_dword(d->size); + } + write_byte((BYTE)(d->date_and_time.year - 1900)); + write_byte(d->date_and_time.month); + write_byte(d->date_and_time.day); + write_byte(d->date_and_time.hour); + write_byte(d->date_and_time.minute); + write_byte(d->date_and_time.second); + write_byte(0); // GMT offset + write_byte(d->flags); + write_byte(0); // file unit size for an interleaved file + write_byte(0); // interleave gap size for an interleaved file + write_both_endian_word((WORD) 1); // volume sequence number + write_byte((BYTE)identifier_size); + switch (DirType) + { + case DOT_RECORD: + write_byte(0); + break; + case DOT_DOT_RECORD: + write_byte(1); + break; + case SUBDIRECTORY_RECORD: + if (joliet) + write_string_as_big_endian_unicode(d->joliet_name); + else + write_string(d->name_on_cd); + break; + case FILE_RECORD: + if (joliet) + { + write_string_as_big_endian_unicode(d->joliet_name); + } + else + { + write_string(d->name_on_cd); + if (d->extension_on_cd[0] != 0) + { + write_byte('.'); + write_string(d->extension_on_cd); + } + write_string(";1"); + } + break; + } + if ((identifier_size & 1) == 0) + write_byte(0); +} + +/*--------------------------------------------------------------------- -------- +This function converts the date and time words from an ffblk structure and +puts them into a date_and_time structure. +----------------------------------------------------------------------- ------*/ + +static void convert_date_and_time(PDATE_AND_TIME dt, time_t *time) +{ + struct tm *timedef; + + timedef = localtime(time); + + dt->second = timedef->tm_sec; + dt->minute = timedef->tm_min; + dt->hour = timedef->tm_hour; + dt->day = timedef->tm_mday; + dt->month = timedef->tm_mon + 1; + dt->year = timedef->tm_year + 1900; +} + +/*--------------------------------------------------------------------- -------- +This function checks the specified character, if necessary, and +generates an error if it is a punctuation mark other than an underscore. +It also converts small letters to capital letters and returns the +result. +----------------------------------------------------------------------- ------*/ + +static int check_for_punctuation(int c, const char *name) +{ + c = toupper(c & 0xFF); + if (!accept_punctuation_marks && !isalnum(c) && c != '_') + error_exit("Punctuation mark in %s", name); + return c; +} + +#if WIN32 +#define strcasecmp stricmp +#endif//WIN32 + +/*--------------------------------------------------------------------- -------- +This function checks to see if there's a cdname conflict. +----------------------------------------------------------------------- ------*/ + +int cdname_exists ( PDIR_RECORD d ) +{ + PDIR_RECORD p = d->parent->first_record; + while ( p ) + { + if ( p != d + && !strcasecmp ( p->name_on_cd, d->name_on_cd ) + && !strcasecmp ( p->extension_on_cd, d->extension_on_cd ) ) + return 1; + p = p->next_in_directory; + } + return 0; +} + +void parse_filename_into_dirrecord ( const char* filename, PDIR_RECORD d, BOOL dir ) +{ + const char *s = filename; + char *t = d->name_on_cd; + char *n = d->name; + int joliet_length; + int filename_counter; + filename_counter = 1; + while (*s != 0) + { + if (*s == '.') + { + s++; + break; + } + + if ( (t-d->name_on_cd) < sizeof(d->name_on_cd)-1 ) + *t++ = check_for_punctuation(*s, filename); + else if (!joliet) + error_exit ("'%s' is not ISO-9660, aborting...", filename ); + if ( (n-d->name) < sizeof(d->name)-1 ) + *n++ = *s; + else if (!joliet) + error_exit ( "'%s' is not ISO-9660, aborting...", filename ); + s++; + } + if (strlen(s) > MAX_EXTENSION_LENGTH) + { + error_exit ( "'%s' has too long extension for cdmake, aborting...", filename ); + } + *t = 0; + strcpy(d->extension, s); + t = d->extension_on_cd; + while ( *s != 0 ) + { + if ( (t-d->extension_on_cd) < (sizeof(d->extension_on_cd)-1) ) + *t++ = check_for_punctuation(*s, filename); + else if (!joliet) + error_exit ( "'%s' is not ISO-9660, aborting...", filename ); + s++; + } + *t = 0; + *n = 0; + + if ( dir ) + { + if (d->extension[0] != 0) + { + if (joliet) + d->extension_on_cd[0] = 0; + else + error_exit("Directory with extension %s", filename); + } + d->flags = DIRECTORY_FLAG; + } else + d->flags = 0; + + + filename_counter = 1; + while ( cdname_exists ( d ) ) + { + + // the file name must be least 8 char long + if (strlen(d->name_on_cd)<8) + error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + + if ((d->name_on_cd[8] == '.') && (strlen(d->name_on_cd) < 13)) + error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + + // max 255 times for equal short filename + if (filename_counter>255) error_exit ( "'%s' is a duplicate file name, aborting...", filename ); + d->name_on_cd[8] = '~'; + memset(&d->name_on_cd[9],0,5); + sprintf(&d->name_on_cd[9],"%d",filename_counter); + filename_counter++; + + } + + if ( joliet ) + { + joliet_length = strlen(filename); + if (joliet_length > 64) + error_exit ( "'%s' is not Joliet, aborting...", filename ); + d->joliet_name = malloc(joliet_length + 1); + strcpy(d->joliet_name, filename); + } +} + +/*--------------------------------------------------------------------- -------- +This function creates a new directory record with the information from the +specified ffblk. It links it into the beginning of the directory list +for the specified parent and returns a pointer to the new record. +----------------------------------------------------------------------- ------*/ + +#if WIN32 + +/* Win32 version */ +PDIR_RECORD +new_directory_record (struct _finddata_t *f, + PDIR_RECORD parent) +{ + PDIR_RECORD d; + + d = malloc(sizeof(DIR_RECORD)); + if (d == NULL) + error_exit("Insufficient memory"); + memset ( d, 0, sizeof(DIR_RECORD) ); + d->next_in_memory = root.next_in_memory; + root.next_in_memory = d; + + /* I need the parent set before calling parse_filename_into_dirrecord(), + because that functions checks for duplicate file names*/ + d->parent = parent; + parse_filename_into_dirrecord ( f->name, d, f->attrib & _A_SUBDIR ); + + convert_date_and_time(&d->date_and_time, &f->time_write); + d->flags |= f->attrib & _A_HIDDEN ? HIDDEN_FLAG : 0; + d->size = d->joliet_size = f->size; + d->next_in_directory = parent->first_record; + parent->first_record = d; + return d; +} + +#else + +/* Linux version */ +PDIR_RECORD +new_directory_record (struct dirent *entry, + struct stat *stbuf, + PDIR_RECORD parent) +{ + PDIR_RECORD d; + /* + char *s; + char *t; + char *n; + */ + + d = malloc(sizeof(DIR_RECORD)); + if (d == NULL) + error_exit("Insufficient memory"); + memset ( d, 0, sizeof(DIR_RECORD) ); + d->next_in_memory = root.next_in_memory; + root.next_in_memory = d; + + /* I need the parent set before calling parse_filename_into_dirrecord(), + because that functions checks for duplicate file names*/ + d->parent = parent; +#ifdef HAVE_D_TYPE + parse_filename_into_dirrecord ( entry->d_name, d, entry->d_type == DT_DIR ); +#else + parse_filename_into_dirrecord ( entry->d_name, d, S_ISDIR(stbuf->st_mode) ); +#endif + + convert_date_and_time(&d->date_and_time, &stbuf->st_mtime); + d->flags |= entry->d_name[0] == '.' ? HIDDEN_FLAG : 0; + d->size = d->joliet_size = stbuf->st_size; + d->next_in_directory = parent->first_record; + parent->first_record = d; + return d; +} + +#endif + +/*--------------------------------------------------------------------- -------- +This function compares two directory records according to the ISO9660 rules +for directory sorting and returns a negative value if p is before q, or a +positive value if p is after q. +----------------------------------------------------------------------- ------*/ + +static int compare_directory_order(PDIR_RECORD p, PDIR_RECORD q) +{ + int n = strcmp(p->name_on_cd, q->name_on_cd); + if (n == 0) + n = strcmp(p->extension_on_cd, q->extension_on_cd); + return n; +} + +/*--------------------------------------------------------------------- -------- +This function compares two directory records (which must represent +directories) according to the ISO9660 rules for path table sorting and returns +a negative value if p is before q, or a positive vlaue if p is after q. +----------------------------------------------------------------------- ------*/ + +static int compare_path_table_order(PDIR_RECORD p, PDIR_RECORD q) +{ + int n = p->level - q->level; + if (p == q) + return 0; + if (n == 0) + { + n = compare_path_table_order(p->parent, q->parent); + if (n == 0) + n = compare_directory_order(p, q); + } + return n; +} + +/*--------------------------------------------------------------------- -------- +This function appends the specified string to the buffer source[]. +----------------------------------------------------------------------- ------*/ + +static void append_string_to_source(char *s) +{ + while (*s != 0) + *end_source++ = *s++; +} + +/*--------------------------------------------------------------------- -------- +This function scans all files from the current source[] (which must end in \, +and represents a directory already in the database as d), +and puts the appropriate directory records into the database in memory, with +the specified root. It calls itself recursively to scan all subdirectories. +----------------------------------------------------------------------- ------*/ + +#ifdef WIN32 + +static void +make_directory_records (PDIR_RECORD d) +{ + PDIR_RECORD new_d; + struct _finddata_t f; + char *old_end_source; + int findhandle; + + d->first_record = NULL; + strcpy(end_source, "*.*"); + + findhandle =_findfirst(source, &f); + if (findhandle != 0) + { + do + { + if ((f.attrib & (_A_HIDDEN | _A_SUBDIR)) == 0 && f.name[0] != '.') + { + if (strcmp(f.name, DIRECTORY_TIMESTAMP) == 0) + { + convert_date_and_time(&d->date_and_time, &f.time_write); + } + else + { + if (verbosity == VERBOSE) + { + old_end_source = end_source; + strcpy(end_source, f.name); + printf("%d: file %s\n", d->level, source); + end_source = old_end_source; + } + (void) new_directory_record(&f, d); + } + } + } + while (_findnext(findhandle, &f) == 0); + + _findclose(findhandle); + } + + strcpy(end_source, "*.*"); + findhandle= _findfirst(source, &f); + if (findhandle) + { + do + { + if (f.attrib & _A_SUBDIR && f.name[0] != '.') + { + old_end_source = end_source; + append_string_to_source(f.name); + *end_source++ = DIR_SEPARATOR_CHAR; + if (verbosity == VERBOSE) + { + *end_source = 0; + printf("%d: directory %s\n", d->level + 1, source); + } + if (d->level < MAX_LEVEL) + { + new_d = new_directory_record(&f, d); + new_d->next_in_path_table = root.next_in_path_table; + root.next_in_path_table = new_d; + new_d->level = d->level + 1; + make_directory_records(new_d); + } + else + { + error_exit("Directory is nested too deep"); + } + end_source = old_end_source; + } + } + while (_findnext(findhandle, &f) == 0); + + _findclose(findhandle); + } + + // sort directory + d->first_record = sort_linked_list(d->first_record, 0, compare_directory_order); +} + +#else + +/* Linux version */ +static void +make_directory_records (PDIR_RECORD d) +{ + PDIR_RECORD new_d; + DIR *dirp; + struct dirent *entry; + char *old_end_source; + struct stat stbuf; + char buf[MAX_PATH]; + + d->first_record = NULL; + +#ifdef HAVE_D_TYPE + dirp = opendir(source); + if (dirp != NULL) + { + while ((entry = readdir (dirp)) != NULL) + { + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) + continue; // skip self and parent + + if (entry->d_type == DT_REG) // normal file + { + // Check for an absolute path + if (source[0] == DIR_SEPARATOR_CHAR) + { + strcpy(buf, source); + strcat(buf, DIR_SEPARATOR_STRING); + strcat(buf, entry->d_name); + } + else + { + getcwd(buf, sizeof(buf)); + strcat(buf, DIR_SEPARATOR_STRING); + strcat(buf, source); + strcat(buf, entry->d_name); + } + + if (stat(buf, &stbuf) == -1) + { + error_exit("Can't access '%s' (%s)\n", buf, strerror(errno)); + return; + } + + if (strcmp(entry->d_name, DIRECTORY_TIMESTAMP) == 0) + { + convert_date_and_time(&d->date_and_time, &stbuf.st_ctime); + } + else + { + if (verbosity == VERBOSE) + { + printf("%d: file %s\n", d->level, buf); + } + (void) new_directory_record(entry, &stbuf, d); + } + } + } + closedir(dirp); + } + else + { + error_exit("Can't open %s\n", source); + return; + } + + dirp = opendir(source); + if (dirp != NULL) + { + while ((entry = readdir (dirp)) != NULL) + { + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) + continue; // skip self and parent + + if (entry->d_type == DT_DIR) // directory + { + old_end_source = end_source; + append_string_to_source(entry->d_name); + *end_source++ = DIR_SEPARATOR_CHAR; + *end_source = 0; + if (verbosity == VERBOSE) + { + printf("%d: directory %s\n", d->level + 1, source); + } + if (d->level < MAX_LEVEL) + { + // Check for an absolute path + if (source[0] == DIR_SEPARATOR_CHAR) + { + strcpy(buf, source); + } + else + { + getcwd(buf, sizeof(buf)); + strcat(buf, DIR_SEPARATOR_STRING); + strcat(buf, source); + } + + if (stat(buf, &stbuf) == -1) + { [truncated at 1000 lines; 1037 more skipped]

1 0

[frik85] 4: import reactos.org directory
by frik85＠svn.reactos.org 27 Jan '06

27 Jan '06

import reactos.org directory Added: trunk/web/reactos.org/ Added: trunk/web/reactos.org/htdocs/ Added: trunk/web/reactos.org/htdocs/bugzilla/ Added: trunk/web/reactos.org/htdocs/bugzilla/.htaccess Added: trunk/web/reactos.org/htdocs/bugzilla/1x1.gif Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.cvsignore Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.htaccess Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Attachment.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/CGI.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Cookie.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/DB.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/LDAP.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/ROSCMS.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Bug.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/BugMail.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/CGI.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Chart.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Constants.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/DB.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Error.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Flag.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/FlagType.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/RelationSet.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Search.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Series.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template/ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template/Plugin/ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template/Plugin/Bugzilla. pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template/Plugin/Hook.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Template.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Token.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/User.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Util.pm Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla.pm Added: trunk/web/reactos.org/htdocs/bugzilla/CGI.pl Added: trunk/web/reactos.org/htdocs/bugzilla/QUICKSTART Added: trunk/web/reactos.org/htdocs/bugzilla/README Added: trunk/web/reactos.org/htdocs/bugzilla/UPGRADING Added: trunk/web/reactos.org/htdocs/bugzilla/UPGRADING-pre-2.8 Added: trunk/web/reactos.org/htdocs/bugzilla/ant.jpg Added: trunk/web/reactos.org/htdocs/bugzilla/attachment.cgi Added: trunk/web/reactos.org/htdocs/bugzilla/buglist.cgi Added: trunk/web/reactos.org/htdocs/bugzilla/bugzilla.dtd Added: trunk/web/reactos.org/htdocs/bugzilla/chart.cgi Added: trunk/web/reactos.org/htdocs/bugzilla/checksetup.pl Added: trunk/web/reactos.org/htdocs/bugzilla/colchange.cgi Added: trunk/web/reactos.org/htdocs/bugzilla/collectstats.pl Added: trunk/web/reactos.org/htdocs/bugzilla/config.cgi Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/ Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/BugzillaEmail.pm Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/README Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/README.Mailif Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bug_email.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugmail_help.html Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla-submit/ Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla-submit/README Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla-submit/bugdata.tx t Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla-submit/bugzilla-s ubmit Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla-submit/bugzilla-s ubmit.xml Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla.procmailrc Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla_email_append.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/bugzilla_ldapsync.rb Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/ Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/bugcount Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/bugids Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/buglist Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/bugs Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/bugslink Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/makequery Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cmdline/query.conf Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/cvs-update.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/gnats2bz.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/gnatsparse/ Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/gnatsparse/README Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/gnatsparse/gnatsparse.py Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/gnatsparse/magic.py Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/gnatsparse/specialuu.py Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/jb2bz.py Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/mysqld-watcher.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/sendbugmail.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/sendunsentbugmail.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/syncLDAP.pl Added: trunk/web/reactos.org/htdocs/bugzilla/contrib/yp_nomail.sh Added: trunk/web/reactos.org/htdocs/bugzilla/createaccount.cgi Added: trunk/web/reactos.org/htdocs/bugzilla/css/ Added: trunk/web/reactos.org/htdocs/bugzilla/css/buglist.css Added: trunk/web/reactos.org/htdocs/bugzilla/css/duplicates.css Added: trunk/web/reactos.org/htdocs/bugzilla/css/global.css Added: trunk/web/reactos.org/htdocs/bugzilla/css/panel.css Added: trunk/web/reactos.org/htdocs/bugzilla/css/show_multiple.css Added: trunk/web/reactos.org/htdocs/bugzilla/data/ Added: trunk/web/reactos.org/htdocs/bugzilla/data/.htaccess Added: trunk/web/reactos.org/htdocs/bugzilla/data/duplicates/ Added: trunk/web/reactos.org/htdocs/bugzilla/data/mail Added: trunk/web/reactos.org/htdocs/bugzilla/data/mimedump-tmp/ Added: trunk/web/reactos.org/htdocs/bugzilla/data/mining/ [truncated at 100 lines; 2844 more skipped] _____ Added: trunk/web/reactos.org/htdocs/bugzilla/.htaccess --- trunk/web/reactos.org/htdocs/bugzilla/.htaccess 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/.htaccess 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,7 @@ +# don't allow people to retrieve non-cgi executable files or our private data +<FilesMatch ^(.*\.pl|.*localconfig.*|runtests.sh)$> + deny from all +</FilesMatch> +<FilesMatch ^(localconfig.js|localconfig.rdf)$> + allow from all +</FilesMatch> _____ Added: trunk/web/reactos.org/htdocs/bugzilla/1x1.gif (Binary files differ) Property changes on: trunk/web/reactos.org/htdocs/bugzilla/1x1.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.cvsignore --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.cvsignore 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.cvsignore 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1 @@ +.htaccess _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.htaccess --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.htaccess 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/.htaccess 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,3 @@ +# nothing in this directory is retrievable unless overriden by an .htaccess +# in a subdirectory +deny from all _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Attachment.pm --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Attachment.pm 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Attachment.pm 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,108 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Myk Melez <myk(a)mozilla.org> + +####################################################################### ##### +# Module Initialization +####################################################################### ##### + +use strict; + +package Bugzilla::Attachment; + +# This module requires that its caller have said "require CGI.pl" to import +# relevant functions from that script and its companion globals.pl. + +# Use the Flag module to handle flags. +use Bugzilla::Flag; + +####################################################################### ##### +# Functions +####################################################################### ##### + +sub new { + # Returns a hash of information about the attachment with the given ID. + + my ($invocant, $id) = @_; + return undef if !$id; + my $self = { 'id' => $id }; + my $class = ref($invocant) || $invocant; + bless($self, $class); + + &::PushGlobalSQLState(); + &::SendSQL("SELECT 1, description, bug_id, isprivate FROM attachments " . + "WHERE attach_id = $id"); + ($self->{'exists'}, + $self->{'summary'}, + $self->{'bug_id'}, + $self->{'isprivate'}) = &::FetchSQLData(); + &::PopGlobalSQLState(); + + return $self; +} + +sub query +{ + # Retrieves and returns an array of attachment records for a given bug. + # This data should be given to attachment/list.atml in an + # "attachments" variable. + my ($bugid) = @_; + + my $in_editbugs = &::UserInGroup("editbugs"); + &::SendSQL("SELECT product_id + FROM bugs + WHERE bug_id = $bugid"); + my $productid = &::FetchOneColumn(); + my $caneditproduct = &::CanEditProductId($productid); + + # Retrieve a list of attachments for this bug and write them into an array + # of hashes in which each hash represents a single attachment. + &::SendSQL(" + SELECT attach_id, DATE_FORMAT(creation_ts, '%Y.%m.%d %H:%i'), + mimetype, description, ispatch, isobsolete, isprivate, + submitter_id, LENGTH(thedata) + FROM attachments WHERE bug_id = $bugid ORDER BY attach_id + "); + my @attachments = (); + while (&::MoreSQLData()) { + my %a; + my $submitter_id; + ($a{'attachid'}, $a{'date'}, $a{'contenttype'}, $a{'description'}, + $a{'ispatch'}, $a{'isobsolete'}, $a{'isprivate'}, $submitter_id, + $a{'datasize'}) = &::FetchSQLData(); + + # Retrieve a list of flags for this attachment. + $a{'flags'} = Bugzilla::Flag::match({ 'attach_id' => $a{'attachid'}, + 'is_active' => 1 }); + + # We will display the edit link if the user can edit the attachment; + # ie the are the submitter, or they have canedit. + # Also show the link if the user is not logged in - in that cae, + # They'll be prompted later + $a{'canedit'} = ($::userid == 0 || (($submitter_id == $::userid || + $in_editbugs) && $caneditproduct)); + push @attachments, \%a; + } + + return \@attachments; +} + +1; _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/CGI.pm --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/CGI.pm 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/CGI.pm 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,247 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::CGI; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Error; +use Bugzilla::Util; + +sub login { + my ($class, $type) = @_; + + # 'NORMAL' logins depend on the 'requirelogin' param + if ($type == LOGIN_NORMAL) { + $type = Param('requirelogin') ? LOGIN_REQUIRED : LOGIN_OPTIONAL; + } + + my $cgi = Bugzilla->cgi; + + # First, try the actual login method against form variables + my $username = $cgi->param("Bugzilla_login"); + my $passwd = $cgi->param("Bugzilla_password"); + + $cgi->delete('Bugzilla_login', 'Bugzilla_password'); + + my $authmethod = Param("loginmethod"); + my ($authres, $userid, $extra, $info) = + Bugzilla::Auth->authenticate($username, $passwd); + + if ($authres == AUTH_OK) { + # Login via username/password was correct and valid, so create + # and send out the login cookies + my $ipaddr = $cgi->remote_addr; + unless ($cgi->param('Bugzilla_restrictlogin') || + Param('loginnetmask') == 32) { + $ipaddr = Bugzilla::Auth::get_netaddr($ipaddr); + } + + # The IP address is valid, at least for comparing with itself in a + # subsequent login + trick_taint($ipaddr); + + my $dbh = Bugzilla->dbh; + $dbh->do("INSERT INTO logincookies (userid, ipaddr) VALUES (?, ?)", + undef, + $userid, $ipaddr); + my $logincookie = $dbh->selectrow_array("SELECT LAST_INSERT_ID()"); + + # Remember cookie only if admin has told so + # or admin didn't forbid it and user told to remember. + if ((Param('rememberlogin') eq 'on') || + ((Param('rememberlogin') ne 'off') && + ($cgi->param('Bugzilla_remember') eq 'on'))) { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $userid, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $logincookie, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + + } + else { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $userid); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $logincookie); + + } + } + elsif ($authres == AUTH_NODATA) { + # No data from the form, so try to login via cookies + $username = $cgi->cookie("Bugzilla_login"); + $passwd = $cgi->cookie("Bugzilla_logincookie"); + + require Bugzilla::Auth::Cookie; + my $authmethod = "Cookie"; + + ($authres, $userid, $extra) = + Bugzilla::Auth::Cookie->authenticate($username, $passwd); + + # If the data for the cookie was incorrect, then treat that as + # NODATA. This could occur if the user's IP changed, for example. + # Give them un-loggedin access if allowed (checked below) + $authres = AUTH_NODATA if $authres == AUTH_LOGINFAILED; + } + + # Now check the result + + # An error may have occurred with the login mechanism + if ($authres == AUTH_ERROR) { + ThrowCodeError("auth_err", + { authmethod => lc($authmethod), + userid => $userid, + auth_err_tag => $extra, + info => $info + }); + } + + # We can load the page if the login was ok, or there was no data + # but a login wasn't required + if ($authres == AUTH_OK || + ($authres == AUTH_NODATA && $type == LOGIN_OPTIONAL)) { + + # login succeded, so we're done + return $userid; + } + + # No login details were given, but we require a login if the + # page does + if ($authres == AUTH_NODATA && $type == LOGIN_REQUIRED) { + # Throw up the login page + + print Bugzilla->cgi->header(); + + my $template = Bugzilla->template; + $template->process("account/auth/login.html.tmpl", + { 'target' => $cgi->url(-relative=>1), + 'form' => \%::FORM, + 'mform' => \%::MFORM, + 'caneditaccount' => Bugzilla::Auth->can_edit, + } + ) + || ThrowTemplateError($template->error()); + + # This seems like as good as time as any to get rid of old + # crufty junk in the logincookies table. Get rid of any entry + # that hasn't been used in a month. + Bugzilla->dbh->do("DELETE FROM logincookies " . + "WHERE TO_DAYS(NOW()) - TO_DAYS(lastused) > 30"); + + exit; + } + + # The username/password may be wrong + # Don't let the user know whether the username exists or whether + # the password was just wrong. (This makes it harder for a cracker + # to find account names by brute force) + if ($authres == AUTH_LOGINFAILED) { + ThrowUserError("invalid_username_or_password"); + } + + # The account may be disabled + if ($authres == AUTH_DISABLED) { + clear_browser_cookies(); + # and throw a user error + ThrowUserError("account_disabled", + {'disabled_reason' => $extra}); + } + + # If we get here, then we've run out of options, which shouldn't happen + ThrowCodeError("authres_unhandled", { authres => $authres, + type => $type, }); +} + +# Logs user out, according to the option provided; this consists of +# removing entries from logincookies for the specified $user. +sub logout { + my ($class, $user, $option) = @_; + my $dbh = Bugzilla->dbh; + $option = LOGOUT_ALL unless defined $option; + + if ($option == LOGOUT_ALL) { + $dbh->do("DELETE FROM logincookies WHERE userid = ?", + undef, $user->id); + return; + } + + # The LOGOUT_*_CURRENT options require a cookie + my $cookie = Bugzilla->cgi->cookie("Bugzilla_logincookie"); + detaint_natural($cookie); + + # These queries use both the cookie ID and the user ID as keys. Even + # though we know the userid must match, we still check it in the SQL + # as a sanity check, since there is no locking here, and if the user + # logged out from two machines simultaneously, while someone else + # logged in and got the same cookie, we could be logging the other + # user out here. Yes, this is very very very unlikely, but why take + # chances? - bbaetz + if ($option == LOGOUT_KEEP_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie != ? AND userid = ?", + undef, $cookie, $user->id); + } elsif ($option == LOGOUT_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie = ? AND userid = ?", + undef, $cookie, $user->id); + } else { + die("Invalid option $option supplied to logout()"); + } +} + +sub clear_browser_cookies { + my $cgi = Bugzilla->cgi; + $cgi->remove_cookie('Bugzilla_login'); + $cgi->remove_cookie('Bugzilla_logincookie'); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth::CGI - CGI-based logins for Bugzilla + +=head1 SUMMARY + +This is a L<login module|Bugzilla::Auth/"LOGIN"> for Bugzilla. Users connecting +from a CGI script use this module to authenticate. Logouts are also handled here. + +=head1 BEHAVIOUR + +Users are first authenticated against the default authentication handler, +using the CGI parameters I<Bugzilla_login> and I<Bugzilla_password>. + +If no data is present for that, then cookies are tried, using +L<Bugzilla::Auth::Cookie>. + +=head1 SEE ALSO + +L<Bugzilla::Auth> _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Cookie.pm --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Cookie.pm 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Cookie.pm 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,113 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::Cookie; + +use strict; + +use Bugzilla::Auth; +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Util; + +sub authenticate { + my ($class, $login, $login_cookie) = @_; + + return (AUTH_NODATA) unless defined $login && defined $login_cookie; + + my $cgi = Bugzilla->cgi; + + my $ipaddr = $cgi->remote_addr(); + my $netaddr = Bugzilla::Auth::get_netaddr($ipaddr); + + # Anything goes for these params - they're just strings which + # we're going to verify against the db + trick_taint($login); + trick_taint($login_cookie); + trick_taint($ipaddr); + + my $query = "SELECT profiles.userid, profiles.disabledtext " . + "FROM logincookies, profiles " . + "WHERE logincookies.cookie=? AND " . + " logincookies.userid=profiles.userid AND " . + " logincookies.userid=? AND " . + " (logincookies.ipaddr=?"; + my @params = ($login_cookie, $login, $ipaddr); + if (defined $netaddr) { + trick_taint($netaddr); + $query .= " OR logincookies.ipaddr=?"; + push(@params, $netaddr); + } + $query .= ")"; + + my $dbh = Bugzilla->dbh; + my ($userid, $disabledtext) = $dbh->selectrow_array($query, undef, @params); + + return (AUTH_DISABLED, $userid, $disabledtext) + if ($disabledtext); + + if ($userid) { + # If we logged in successfully, then update the lastused time on the + # login cookie + $dbh->do("UPDATE logincookies SET lastused=NULL WHERE cookie=?", + undef, + $login_cookie); + + return (AUTH_OK, $userid); + } + + # If we get here, then the login failed. + return (AUTH_LOGINFAILED); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Cookie - cookie authentication for Bugzilla + +=head1 SUMMARY + +This is an L<authentication module|Bugzilla::Auth/"AUTHENTICATION"> for +Bugzilla, which logs the user in using a persistent cookie stored in the +C<logincookies> table. + +The actual password is not stored in the cookie; only the userid and a +I<logincookie> (which is used to reverify the login without requiring the +password to be sent over the network) are. These I<logincookies> are +restricted to certain IP addresses as a security meaure. The exact +restriction can be specified by the admin via the C<loginnetmask> parameter. + +This module does not ever send a cookie (It has no way of knowing when a user +is successfully logged in). Instead L<Bugzilla::Auth::CGI> handles this. + +=head1 SEE ALSO + +L<Bugzilla::Auth>, L<Bugzilla::Auth::CGI> _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/DB.pm --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/DB.pm 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/DB.pm 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,124 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::DB; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Util; + +sub authenticate { + my ($class, $username, $passwd) = @_; + + return (AUTH_NODATA) unless defined $username && defined $passwd; + + # We're just testing against the db: any value is ok + trick_taint($username); + + my $userid = $class->get_id_from_username($username); + return (AUTH_LOGINFAILED) unless defined $userid; + + return (AUTH_LOGINFAILED, $userid) + unless $class->check_password($userid, $passwd); + + # The user's credentials are okay, so delete any outstanding + # password tokens they may have generated. + require Bugzilla::Token; + Bugzilla::Token::DeletePasswordTokens($userid, "user_logged_in"); + + # Account may have been disabled + my $disabledtext = $class->get_disabled($userid); + return (AUTH_DISABLED, $userid, $disabledtext) + if $disabledtext ne ''; + + return (AUTH_OK, $userid); +} + +sub can_edit { return 1; } + +sub get_id_from_username { + my ($class, $username) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT userid FROM profiles " . + "WHERE login_name=?"); + my ($userid) = $dbh->selectrow_array($sth, undef, $username); + return $userid; +} + +sub get_disabled { + my ($class, $userid) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT disabledtext FROM profiles " . + "WHERE userid=?"); + my ($text) = $dbh->selectrow_array($sth, undef, $userid); + return $text; +} + +sub check_password { + my ($class, $userid, $passwd) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT cryptpassword FROM profiles " . + "WHERE userid=?"); + my ($realcryptpwd) = $dbh->selectrow_array($sth, undef, $userid); + + # Get the salt from the user's crypted password. + my $salt = $realcryptpwd; + + # Using the salt, crypt the password the user entered. + my $enteredCryptedPassword = crypt($passwd, $salt); + + return $enteredCryptedPassword eq $realcryptpwd; +} + +sub change_password { + my ($class, $userid, $password) = @_; + my $dbh = Bugzilla->dbh; + my $cryptpassword = Crypt($password); + $dbh->do("UPDATE profiles SET cryptpassword = ? WHERE userid = ?", + undef, $cryptpassword, $userid); +} + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth::DB - database authentication for Bugzilla + +=head1 SUMMARY + +This is an L<authentication module|Bugzilla::Auth/"AUTHENTICATION"> for +Bugzilla, which logs the user in using the password stored in the C<profiles> +table. This is the most commonly used authentication module. + +=head1 SEE ALSO + +L<Bugzilla::Auth> _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/LDAP.pm --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/LDAP.pm 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/LDAP.pm 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,185 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::LDAP; + +use strict; + +use Bugzilla::Config; +use Bugzilla::Constants; + +use Net::LDAP; + +sub authenticate { + my ($class, $username, $passwd) = @_; + + # If no password was provided, then fail the authentication. + # While it may be valid to not have an LDAP password, when you + # bind without a password (regardless of the binddn value), you + # will get an anonymous bind. I do not know of a way to determine + # whether a bind is anonymous or not without making changes to the + # LDAP access control settings + return (AUTH_NODATA) unless $username && $passwd; + + # We need to bind anonymously to the LDAP server. This is + # because we need to get the Distinguished Name of the user trying + # to log in. Some servers (such as iPlanet) allow you to have unique + # uids spread out over a subtree of an area (such as "People"), so + # just appending the Base DN to the uid isn't sufficient to get the + # user's DN. For servers which don't work this way, there will still + # be no harm done. + my $LDAPserver = Param("LDAPserver"); + if ($LDAPserver eq "") { + return (AUTH_ERROR, undef, "server_not_defined"); + } + + my $LDAPport = "389"; # default LDAP port + if($LDAPserver =~ /:/) { + ($LDAPserver, $LDAPport) = split(":",$LDAPserver); + } + my $LDAPconn = Net::LDAP->new($LDAPserver, port => $LDAPport, version => 3); + if(!$LDAPconn) { + return (AUTH_ERROR, undef, "connect_failed"); + } + + my $mesg; + if (Param("LDAPbinddn")) { + my ($LDAPbinddn,$LDAPbindpass) = split(":",Param("LDAPbinddn")); + $mesg = $LDAPconn->bind($LDAPbinddn, password => $LDAPbindpass); + } + else { + $mesg = $LDAPconn->bind(); + } + if($mesg->code) { + return (AUTH_ERROR, undef, + "connect_failed", + { errstr => $mesg->error }); + } + + # We've got our anonymous bind; let's look up this user. + $mesg = $LDAPconn->search( base => Param("LDAPBaseDN"), + scope => "sub", + filter => '(&(' . Param("LDAPuidattribute") . "=$username)" . Param("LDAPfilter") . ')', + attrs => ['dn'], + ); + return (AUTH_LOGINFAILED, undef, "lookup_failure") + unless $mesg->count; + + # Now we get the DN from this search. + my $userDN = $mesg->shift_entry->dn; + + # Now we attempt to bind as the specified user. + $mesg = $LDAPconn->bind( $userDN, password => $passwd); + + return (AUTH_LOGINFAILED) if $mesg->code; + + # And now we're going to repeat the search, so that we can get the + # mail attribute for this user. + $mesg = $LDAPconn->search( base => Param("LDAPBaseDN"), + scope => "sub", + filter => '(&(' . Param("LDAPuidattribute") . "=$username)" . Param("LDAPfilter") . ')', + ); + my $user_entry = $mesg->shift_entry if !$mesg->code && $mesg->count; + if(!$user_entry || !$user_entry->exists(Param("LDAPmailattribute"))) { + return (AUTH_ERROR, undef, + "cannot_retreive_attr", + { attr => Param("LDAPmailattribute") }); + } + + # get the mail attribute + $username = $user_entry->get_value(Param("LDAPmailattribute")); + # OK, so now we know that the user is valid. Lets try finding them in the + # Bugzilla database + + # XXX - should this part be made more generic, and placed in + # Bugzilla::Auth? Lots of login mechanisms may have to do this, although + # until we actually get some more, its hard to know - BB + + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT userid, disabledtext " . + "FROM profiles " . + "WHERE login_name=?"); + my ($userid, $disabledtext) = + $dbh->selectrow_array($sth, + undef, + $username); + + # If the user doesn't exist, then they need to be added + unless ($userid) { + # We'll want the user's name for this. + my $userRealName = $user_entry->get_value("displayName"); + if($userRealName eq "") { + $userRealName = $user_entry->get_value("cn"); + } + &::InsertNewUser($username, $userRealName); + + ($userid, $disabledtext) = $dbh->selectrow_array($sth, + undef, + $username); + return (AUTH_ERROR, $userid, "no_userid") + unless $userid; + } + + # we're done, so disconnect + $LDAPconn->unbind; + + # Test for disabled account + return (AUTH_DISABLED, $userid, $disabledtext) + if $disabledtext ne ''; + + # If we get to here, then the user is allowed to login, so we're done! + return (AUTH_OK, $userid); +} + +sub can_edit { return 0; } + +1; + +__END__ + +=head1 NAME + +Bugzilla::Auth::LDAP - LDAP based authentication for Bugzilla + +This is an L<authentication module|Bugzilla::Auth/"AUTHENTICATION"> for +Bugzilla, which logs the user in using an LDAP directory. + +=head1 DISCLAIMER + +B<This module is experimental>. It is poorly documented, and not very flexible. +Search L<http://bugzilla.mozilla.org/> for a list of known LDAP bugs. + +None of the core Bugzilla developers, nor any of the large installations, use +this module, and so it has received less testing. (In fact, this iteration +hasn't been tested at all) + +Patches are accepted. + +=head1 SEE ALSO + +L<Bugzilla::Auth> _____ Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/ROSCMS.pm --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/ROSCMS.pm 2006-01-27 22:04:21 UTC (rev 3) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/ROSCMS.pm 2006-01-27 22:10:19 UTC (rev 4) @@ -0,0 +1,215 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> + +package Bugzilla::Auth::ROSCMS; + +use strict; + +use URI; +use URI::Escape; + +use Bugzilla::Config; +use Bugzilla::Constants; +use Bugzilla::Error; +use Bugzilla::Util; + +my $session_cookie_name = "roscmsusrkey"; +my $roscms_db_name = "roscms"; +my $roscms_login_page = "/roscms/?page=login&target="; + +sub authenticate { + my ($class, $username, $passwd) = @_; + + return (AUTH_NODATA) unless defined $username && defined $passwd; + + # We're just testing against the db: any value is ok + trick_taint($username); + + my $userid = $class->get_id_from_username($username); + return (AUTH_LOGINFAILED) unless defined $userid; + + return (AUTH_LOGINFAILED, $userid) + unless $class->check_password($userid, $passwd); + + # The user's credentials are okay, so delete any outstanding + # password tokens they may have generated. + require Bugzilla::Token; + Bugzilla::Token::DeletePasswordTokens($userid, "user_logged_in"); + + # Account may have been disabled + my $disabledtext = $class->get_disabled($userid); + return (AUTH_DISABLED, $userid, $disabledtext) + if $disabledtext ne ''; + + return (AUTH_OK, $userid); +} + +sub can_edit { return 1; } + +sub get_id_from_username { + my ($class, $username) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT userid FROM profiles " . + "WHERE login_name=?"); + my ($userid) = $dbh->selectrow_array($sth, undef, $username); + return $userid; +} + +sub get_disabled { + my ($class, $userid) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT disabledtext FROM profiles " . + "WHERE userid=?"); + my ($text) = $dbh->selectrow_array($sth, undef, $userid); + return $text; +} + +sub check_password { + my ($class, $userid, $passwd) = @_; + my $dbh = Bugzilla->dbh; + my $sth = $dbh->prepare_cached("SELECT cryptpassword FROM profiles " . + "WHERE userid=?"); + my ($realcryptpwd) = $dbh->selectrow_array($sth, undef, $userid); + + # Get the salt from the user's crypted password. + my $salt = $realcryptpwd; + + # Using the salt, crypt the password the user entered. + my $enteredCryptedPassword = crypt($passwd, $salt); + + return $enteredCryptedPassword eq $realcryptpwd; +} + +sub change_password { + my ($class, $userid, $password) = @_; + my $dbh = Bugzilla->dbh; + my $cryptpassword = Crypt($password); + $dbh->do("UPDATE profiles SET cryptpassword = ? WHERE userid = ?", + undef, $cryptpassword, $userid); +} + +sub login { + my ($class, $type) = @_; + + # 'NORMAL' logins depend on the 'requirelogin' param + if ($type == LOGIN_NORMAL) { + $type = Param('requirelogin') ? LOGIN_REQUIRED : LOGIN_OPTIONAL; + } + + my $cgi = Bugzilla->cgi; + + my $authres; + my $userid; + my $session_id = $cgi->cookie($session_cookie_name); + if (! defined($session_id)) { + $authres = AUTH_NODATA; + } else { + my $session_id_clean = $session_id; + trick_taint($session_id_clean); + my $remote_addr_clean; + if ($ENV{'REMOTE_ADDR'} =~ m/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { + $remote_addr_clean = $1; + } else { + $remote_addr_clean = 'invalid'; + } + my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; + trick_taint($browser_agent_clean); + my $query = "SELECT m.map_subsys_userid " . + " FROM $roscms_db_name.user_sessions s, " . + " $roscms_db_name.users u, " . + " $roscms_db_name.subsys_mappings m " . + " WHERE s.usersession_id = ? " . + " AND (s.usersession_expires IS NULL OR " . + " NOW() <= s.usersession_expires) " . + " AND u.user_id = s.usersession_user_id " . + " AND (u.user_setting_ipaddress = 'false' OR " . + " s.usersession_ipaddress = ?) " . + " AND (u.user_setting_browseragent = 'false' OR " . + " s.usersession_browseragent = ?) " . + " AND m.map_roscms_userid = s.usersession_user_id " . + " AND m.map_subsys_name = 'bugzilla'"; + my @params = ($session_id_clean, $remote_addr_clean, + $browser_agent_clean); + my $dbh = Bugzilla->dbh; + ($userid) = $dbh->selectrow_array($query, undef, @params); + if ($userid) { [truncated at 1000 lines; 543895 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