Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[gvg] 15799: Lucio Diaz-Flores Varela <reactos_translate@yahoo.es>

by gvg＠svn.reactos.com

Lucio Diaz-Flores Varela <reactos_translate(a)yahoo.es> Add Spanish translation Added: trunk/reactos/subsys/system/winlogon/Es.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Added: trunk/reactos/subsys/system/winlogon/Es.rc --- trunk/reactos/subsys/system/winlogon/Es.rc 2005-06-05 00:40:40 UTC (rev 15798) +++ trunk/reactos/subsys/system/winlogon/Es.rc 2005-06-05 08:33:52 UTC (rev 15799) @@ -0,0 +1,47 @@ +//Spanish translation by Lucio Diaz-Flores Varela. Reviewed by Jose Pedro Fernandez Pascual. + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_SHUTDOWNCOMPUTER DIALOG 45, 22, 164, 52 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Apagar Equipo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ahora es seguro apagar el ordenador.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Reiniciar", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOG 58, 83, 231, 119 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Error del Interfaz de Usuario" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "La DLL %s del interfaz de Logon di¾ un error al cargar.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Contacte con el administrador de su sistema para sustituir la DLL, ¾ reinstale la DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Reiniciar", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Preparando las conexiones de red..." + IDS_APPLYINGCOMPUTERSETTINGS "Aplicando los parßmetros de configuraci¾n..." + IDS_RUNNINGSTARTUPSCRIPTS "Ejecutando los scripts de inicio..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Ejecutando los scripts de apagado..." + IDS_APPLYINGYOURPERSONALSETTINGS "Aplicando su configuraci¾n personal..." + IDS_RUNNINGLOGOFFSCRIPTS "Ejecutando los scripts de fin de sesi¾n..." + IDS_RUNNINGLOGONSCRIPTS "Ejecutando los scripts de inicio de sesi¾n..." + IDS_LOADINGYOURPERSONALSETTINGS "Cargando su configuraci¾n personal..." + IDS_CLOSINGNETWORKCONNECTIONS "Cerrando las conexiones de red..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS se estß apagando..." + IDS_PREPARETOSTANDBY "Preparando para entrar en estado de espera (Standby)..." + IDS_PREPARETOHIBERNATE "Preparando para hibernar..." + IDS_SAVEYOURSETTINGS "Guardando su configuraci¾n personal..." + IDS_REACTOSISSTARTINGUP "ReactOS se estß iniciando..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "!Winlogon fall¾ al activar el shell de usuario!" +END + Property changes on: trunk/reactos/subsys/system/winlogon/Es.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-06-05 00:40:40 UTC (rev 15798) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-06-05 08:33:52 UTC (rev 15799) @@ -12,9 +12,8 @@ /* IDI_WINLOGON ICON "resources/winlogon.ico" */ -#include "Cz.rc" #include "En.rc" +#include "Cz.rc" #include "De.rc" +#include "Es.rc" #include "Sv.rc" - -

19 years, 6 months

[jimtabor] 15798: Fixed Interface.

by jimtabor＠svn.reactos.com

Fixed Interface. Modified: trunk/reactos/drivers/usb/cromwell/core/config.c Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/core/message.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb-debug.c Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h _____ Modified: trunk/reactos/drivers/usb/cromwell/core/config.c --- trunk/reactos/drivers/usb/cromwell/core/config.c 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/core/config.c 2005-06-05 00:40:40 UTC (rev 15798) @@ -101,56 +101,56 @@ return parsed; } -static int usb_parse_interface(struct usb_interface *pinterface, unsigned char *buffer, int size) +static int usb_parse_interface(struct usb_interface *interface, unsigned char *buffer, int size) { int i, len, numskipped, retval, parsed = 0; struct usb_descriptor_header *header; struct usb_host_interface *ifp; unsigned char *begin; - pinterface->act_altsetting = 0; - pinterface->num_altsetting = 0; - pinterface->max_altsetting = USB_ALTSETTINGALLOC; - device_initialize(&pinterface->dev); + interface->act_altsetting = 0; + interface->num_altsetting = 0; + interface->max_altsetting = USB_ALTSETTINGALLOC; + device_initialize(&interface->dev); - pinterface->altsetting = kmalloc(sizeof(*pinterface->altsetting) * pinterface->max_altsetting, + interface->altsetting = kmalloc(sizeof(*interface->altsetting) * interface->max_altsetting, GFP_KERNEL); - if (!pinterface->altsetting) { - err("couldn't kmalloc pinterface->altsetting"); + if (!interface->altsetting) { + err("couldn't kmalloc interface->altsetting"); return -1; } while (size > 0) { struct usb_interface_descriptor *d; - if (pinterface->num_altsetting >= pinterface->max_altsetting) { + if (interface->num_altsetting >= interface->max_altsetting) { struct usb_host_interface *ptr; int oldmas; - oldmas = pinterface->max_altsetting; - pinterface->max_altsetting += USB_ALTSETTINGALLOC; - if (pinterface->max_altsetting > USB_MAXALTSETTING) { + oldmas = interface->max_altsetting; + interface->max_altsetting += USB_ALTSETTINGALLOC; + if (interface->max_altsetting > USB_MAXALTSETTING) { warn("too many alternate settings (incr %d max %d)\n", USB_ALTSETTINGALLOC, USB_MAXALTSETTING); return -1; } - ptr = kmalloc(sizeof(*ptr) * pinterface->max_altsetting, GFP_KERNEL); + ptr = kmalloc(sizeof(*ptr) * interface->max_altsetting, GFP_KERNEL); if (ptr == NULL) { - err("couldn't kmalloc pinterface->altsetting"); + err("couldn't kmalloc interface->altsetting"); return -1; } - memcpy(ptr, pinterface->altsetting, sizeof(*pinterface->altsetting) * oldmas); - kfree(pinterface->altsetting); - pinterface->altsetting = ptr; + memcpy(ptr, interface->altsetting, sizeof(*interface->altsetting) * oldmas); + kfree(interface->altsetting); + interface->altsetting = ptr; } - ifp = pinterface->altsetting + pinterface->num_altsetting; + ifp = interface->altsetting + interface->num_altsetting; ifp->endpoint = NULL; ifp->extra = NULL; ifp->extralen = 0; - pinterface->num_altsetting++; + interface->num_altsetting++; memcpy(ifp, buffer, USB_DT_INTERFACE_SIZE); @@ -268,16 +268,16 @@ return -1; } - config->pinterface = (struct usb_interface *) + config->interface = (struct usb_interface *) kmalloc(config->desc.bNumInterfaces * sizeof(struct usb_interface), GFP_KERNEL); - dbg("kmalloc IF %p, numif %i", config->pinterface, config->desc.bNumInterfaces); - if (!config->pinterface) { + dbg("kmalloc IF %p, numif %i", config->interface, config->desc.bNumInterfaces); + if (!config->interface) { err("out of memory"); return -1; } - memset(config->pinterface, 0, + memset(config->interface, 0, config->desc.bNumInterfaces * sizeof(struct usb_interface)); buffer += config->desc.bLength; @@ -337,7 +337,7 @@ } } - retval = usb_parse_interface(config->pinterface + i, buffer, size); + retval = usb_parse_interface(config->interface + i, buffer, size); if (retval < 0) return retval; @@ -367,12 +367,12 @@ for (c = 0; c < dev->descriptor.bNumConfigurations; c++) { struct usb_host_config *cf = &dev->config[c]; - if (!cf->pinterface) + if (!cf->interface) break; for (i = 0; i < cf->desc.bNumInterfaces; i++) { struct usb_interface *ifp = - &cf->pinterface[i]; + &cf->interface[i]; if (!ifp->altsetting) break; @@ -398,7 +398,7 @@ kfree(ifp->altsetting); } - kfree(cf->pinterface); + kfree(cf->interface); } kfree(dev->config); } _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h --- trunk/reactos/drivers/usb/cromwell/core/hcd.h 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/core/hcd.h 2005-06-05 00:40:40 UTC (rev 15798) @@ -424,7 +424,7 @@ extern void usb_bus_put (struct usb_bus *bus); extern int usb_find_interface_driver (struct usb_device *dev, - struct usb_interface *pinterface); + struct usb_interface *interface); #define usb_endpoint_halt(dev, ep, out) ((dev)->halted[out] |= (1 << (ep))) _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c --- trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-05 00:40:40 UTC (rev 15798) @@ -67,7 +67,7 @@ /* for dev_info, dev_dbg, etc */ static inline struct device *hubdev (struct usb_device *dev) { - return &dev->actconfig->pinterface [0].dev; + return &dev->actconfig->interface [0].dev; } /* USB 2.0 spec Section 11.24.4.5 */ @@ -700,7 +700,7 @@ static int hub_port_status(struct usb_device *dev, int port, u16 *status, u16 *change) { - struct usb_hub *hub = usb_get_intfdata (dev->actconfig->pinterface); + struct usb_hub *hub = usb_get_intfdata (dev->actconfig->interface); int ret; ret = get_port_status(dev, port + 1, &hub->status->port); @@ -1377,7 +1377,7 @@ } for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) { - struct usb_interface *intf = &dev->actconfig->pinterface[i]; + struct usb_interface *intf = &dev->actconfig->interface[i]; struct usb_interface_descriptor *as; as = &intf->altsetting[intf->act_altsetting].desc; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/message.c --- trunk/reactos/drivers/usb/cromwell/core/message.c 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/core/message.c 2005-06-05 00:40:40 UTC (rev 15798) @@ -683,7 +683,7 @@ /* NOTE: affects all endpoints _except_ ep0 */ for (i=0; i<dev->actconfig->desc.bNumInterfaces; i++) { - struct usb_interface *ifp = dev->actconfig->pinterface + i; + struct usb_interface *ifp = dev->actconfig->interface + i; struct usb_host_interface *as = ifp->altsetting + ifp->act_altsetting; struct usb_host_endpoint *ep = as->endpoint; int e; @@ -800,16 +800,16 @@ * Returns zero on success, or else the status code returned by the * underlying usb_control_msg() call. */ -int usb_set_interface(struct usb_device *dev, int pinterface, int alternate) +int usb_set_interface(struct usb_device *dev, int interface, int alternate) { struct usb_interface *iface; struct usb_host_interface *iface_as; int i, ret; void (*disable)(struct usb_device *, int) = dev->bus->op->disable; - iface = usb_ifnum_to_if(dev, pinterface); + iface = usb_ifnum_to_if(dev, interface); if (!iface) { - warn("selecting invalid interface %d", pinterface); + warn("selecting invalid interface %d", interface); return -EINVAL; } @@ -817,7 +817,7 @@ only has one alternate setting */ if (iface->num_altsetting == 1) { dbg("ignoring set_interface for dev %d, iface %d, alt %d", - dev->devnum, pinterface, alternate); + dev->devnum, interface, alternate); return 0; } @@ -828,7 +828,7 @@ USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE, iface->altsetting[alternate] .desc.bAlternateSetting, - pinterface, NULL, 0, HZ * 5)) < 0) + interface, NULL, 0, HZ * 5)) < 0) return ret; /* FIXME drivers shouldn't need to replicate/bugfix the logic here _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usb-debug.c --- trunk/reactos/drivers/usb/cromwell/core/usb-debug.c 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/core/usb-debug.c 2005-06-05 00:40:40 UTC (rev 15798) @@ -42,7 +42,7 @@ usb_show_config_descriptor(&config->desc); for (i = 0; i < config->desc.bNumInterfaces; i++) { - ifp = config->pinterface + i; + ifp = config->interface + i; if (!ifp) break; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/usb.c --- trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/core/usb.c 2005-06-05 00:40:40 UTC (rev 15798) @@ -212,9 +212,9 @@ int i; for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) - if (dev->actconfig->pinterface[i].altsetting[0] + if (dev->actconfig->interface[i].altsetting[0] .desc.bInterfaceNumber == ifnum) - return &dev->actconfig->pinterface[i]; + return &dev->actconfig->interface[i]; return NULL; } @@ -239,13 +239,13 @@ int i, j, k; for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) - for (j = 0; j < dev->actconfig->pinterface[i].num_altsetting; j++) - for (k = 0; k < dev->actconfig->pinterface[i] + for (j = 0; j < dev->actconfig->interface[i].num_altsetting; j++) + for (k = 0; k < dev->actconfig->interface[i] .altsetting[j].desc.bNumEndpoints; k++) - if (epnum == dev->actconfig->pinterface[i] + if (epnum == dev->actconfig->interface[i] .altsetting[j].endpoint[k] .desc.bEndpointAddress) - return &dev->actconfig->pinterface[i] + return &dev->actconfig->interface[i] .altsetting[j].endpoint[k] .desc; @@ -392,7 +392,7 @@ * its associated class and subclass. */ const struct usb_device_id * -usb_match_id(struct usb_interface *pinterface, const struct usb_device_id *id) +usb_match_id(struct usb_interface *interface, const struct usb_device_id *id) { struct usb_host_interface *intf; struct usb_device *dev; @@ -401,8 +401,8 @@ if (id == NULL) return NULL; - intf = &pinterface->altsetting [pinterface->act_altsetting]; - dev = interface_to_usbdev(pinterface); + intf = &interface->altsetting [interface->act_altsetting]; + dev = interface_to_usbdev(interface); /* It is important to check that id->driver_info is nonzero, since an entry that is all zeroes except for a nonzero @@ -902,11 +902,11 @@ dev_dbg (&dev->dev, "unregistering interfaces\n"); if (dev->actconfig) { for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) { - struct usb_interface *pinterface; + struct usb_interface *interface; /* remove this interface */ - pinterface = &dev->actconfig->pinterface[i]; - device_unregister(&pinterface->dev); + interface = &dev->actconfig->interface[i]; + device_unregister(&interface->dev); } } @@ -1210,35 +1210,35 @@ /* Register all of the interfaces for this device with the driver core. * Remember, interfaces get bound to drivers, not devices. */ for (i = 0; i < dev->actconfig->desc.bNumInterfaces; i++) { - struct usb_interface *pinterface = &dev->actconfig->pinterface[i]; + struct usb_interface *interface = &dev->actconfig->interface[i]; struct usb_interface_descriptor *desc; - desc = &pinterface->altsetting [pinterface->act_altsetting].desc; - pinterface->dev.parent = &dev->dev; - pinterface->dev.driver = NULL; - pinterface->dev.bus = &usb_bus_type; - pinterface->dev.dma_mask = parent->dma_mask; - sprintf (&pinterface->dev.bus_id[0], "%d-%s:%d", + desc = &interface->altsetting [interface->act_altsetting].desc; + interface->dev.parent = &dev->dev; + interface->dev.driver = NULL; + interface->dev.bus = &usb_bus_type; + interface->dev.dma_mask = parent->dma_mask; + sprintf (&interface->dev.bus_id[0], "%d-%s:%d", dev->bus->busnum, dev->devpath, desc->bInterfaceNumber); if (!desc->iInterface || usb_string (dev, desc->iInterface, - pinterface->dev.name, - sizeof pinterface->dev.name) <= 0) { + interface->dev.name, + sizeof interface->dev.name) <= 0) { /* typically devices won't bother with interface * descriptions; this is the normal case. an * interface's driver might describe it better. * (also: iInterface is per-altsetting ...) */ - sprintf (&pinterface->dev.name[0], + sprintf (&interface->dev.name[0], "usb-%s-%s interface %d", dev->bus->bus_name, dev->devpath, desc->bInterfaceNumber); - DPRINT1("usb_new_device: %s\n", pinterface->dev.name); + DPRINT1("usb_new_device: %s\n", interface->dev.name); } - dev_dbg (&dev->dev, "%s - registering interface %s\n", __FUNCTION__, pinterface->dev.bus_id); - device_add (&pinterface->dev); - usb_create_driverfs_intf_files (pinterface); + dev_dbg (&dev->dev, "%s - registering interface %s\n", __FUNCTION__, interface->dev.bus_id); + device_add (&interface->dev); + usb_create_driverfs_intf_files (interface); } /* add a /proc/bus/usb entry */ usbfs_add_device(dev); _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h --- trunk/reactos/drivers/usb/cromwell/linux/usb.h 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/linux/usb.h 2005-06-05 00:40:40 UTC (rev 15798) @@ -150,13 +150,13 @@ */ struct usb_host_config { struct usb_config_descriptor desc; -// -// /* the interfaces associated with this configuration -// * these will be in numeric order, 0..desc.bNumInterfaces -// */ -// - struct usb_interface *pinterface; + + /* the interfaces associated with this configuration + * these will be in numeric order, 0..desc.bNumInterfaces + */ + struct usb_interface *interface; + unsigned char *extra; /* Extra descriptors */ int extralen; }; @@ -292,7 +292,7 @@ extern int usb_interface_claimed(struct usb_interface *iface); extern void usb_driver_release_interface(struct usb_driver *driver, struct usb_interface *iface); -const struct usb_device_id *usb_match_id(struct usb_interface *pinterface, +const struct usb_device_id *usb_match_id(struct usb_interface *interface, const struct usb_device_id *id); extern struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor); _____ Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h --- trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-06-04 22:53:14 UTC (rev 15797) +++ trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-06-05 00:40:40 UTC (rev 15798) @@ -2,7 +2,6 @@ //#include <ntos/types.h> //#include <ddk/extypes.h> #include <ddk/ntddk.h> -#define NDEBUG #include <debug.h> void wait_ms(int mils); @@ -17,6 +16,8 @@ int swprintf(wchar_t *buf, const wchar_t *fmt, ...); #endif +#undef interface + #include "linux/linux_wrapper.h" #define __KERNEL__ #undef CONFIG_PCI

19 years, 6 months

[hbirr] 15797: Merged 15583:15793 from trunk.

by hbirr＠svn.reactos.com

Merged 15583:15793 from trunk. Modified: branches/cache_manager_rewrite/reactos/INSTALL Deleted: branches/cache_manager_rewrite/reactos/Jamfile Deleted: branches/cache_manager_rewrite/reactos/Jamrules Modified: branches/cache_manager_rewrite/reactos/Makefile Added: branches/cache_manager_rewrite/reactos/ReactOS.xml Added: branches/cache_manager_rewrite/reactos/apps/directory.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/Makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/arp.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/arp/makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/net/directory.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/finger.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/finger/net.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/cmds.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/domacro.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/fake.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ftp_var.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/main.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/prototypes.h Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ftp/ruserpass.c Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/ipconfig. xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/ipconfig/makefile Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/netstat/netstat.xm l Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/ping/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/ping/ping.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/ping/ping.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/route/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/route/route.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/telnet/Makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/net/telnet/telnet.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/whois.c Added: branches/cache_manager_rewrite/reactos/apps/utils/net/whois/whois.xml Deleted: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/Makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/rosperf/rosperf.xml Deleted: branches/cache_manager_rewrite/reactos/baseaddress.cfg Added: branches/cache_manager_rewrite/reactos/baseaddress.xml Added: branches/cache_manager_rewrite/reactos/boot/boot.xml Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile Added: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/bootsect.xm l Deleted: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/Makefile Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/xb oxcons.c Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base .xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_base 64k.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_main .xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/freeldr_star tup.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/setupldr.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/setupldr_mai n.xml Added: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr.xml Added: branches/cache_manager_rewrite/reactos/bootdata/bootcd/ Added: branches/cache_manager_rewrite/reactos/bootdata/bootdata.xml Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Added: branches/cache_manager_rewrite/reactos/bootdata/livecd/ Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Deleted: branches/cache_manager_rewrite/reactos/config Added: branches/cache_manager_rewrite/reactos/config.template.xml Added: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/acpi.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/include/acconfig .h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/include/actypes. h Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/include/platform /types.h Deleted: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/makefile Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c Added: branches/cache_manager_rewrite/reactos/drivers/bus/directory.xml Added: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/isapnp.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/bus/isapnp/makefile Deleted: branches/cache_manager_rewrite/reactos/drivers/bus/pci/makefile Added: branches/cache_manager_rewrite/reactos/drivers/bus/pci/pci.xml Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/detect.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/makefile Added: branches/cache_manager_rewrite/reactos/drivers/bus/serenum/serenum.xml Added: branches/cache_manager_rewrite/reactos/drivers/dd/beep/beep.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/beep/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/blue/blue.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/blue/makefile Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/Makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/bootvid/bootvid.xml Added: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/debugout.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/debugout/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/directory.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/mpu401/mpu401.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/null/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/null/null.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/parallel/parallel.xml Deleted: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.rc Added: branches/cache_manager_rewrite/reactos/drivers/dd/ramdrv/ramdrv.xml [truncated at 100 lines; 789 more skipped] Property changes on: branches/cache_manager_rewrite/reactos ___________________________________________________________________ Name: svn:ignore - dist reactos *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab doxy-doc + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat *.log makefile.auto config.xml obj-* output-* doxy-doc cd reactos Name: tsvn:logminsize + 10 _____ Modified: branches/cache_manager_rewrite/reactos/INSTALL --- branches/cache_manager_rewrite/reactos/INSTALL 2005-06-04 22:55:58 UTC (rev 15796) +++ branches/cache_manager_rewrite/reactos/INSTALL 2005-06-04 22:53:14 UTC (rev 15797) @@ -7,67 +7,72 @@ 2. Building ReactOS -To build from Windows run 'make' (wihout the quotes) from the top directory. -To build from unix, edit rules.mak and change the PREFIX variable to the -correct value for your cross-compiler. Run 'export HOST=mingw32-linux' to -tell the ReactOS build system that it is building ReactOS on a linux machine. -Now run 'make'. +2.1 Building the binaries +To build ReactOS run 'make' (wihout the quotes) if you are building on Linux +or 'mingw32-make' if you are building on Windows (or ReactOS) from the top +directory. + +2.2 Building a bootable CD image + +To build a bootable CD image run 'make bootcd' (wihout the quotes) if you are +building on Linux or 'mingw32-make bootcd' if you are building on Windows (or +ReactOS) from the top directory. This will create a CD image with a filename, +ReactOS.iso, in the top directory. + + 3. Installation -The system can only be installed on the first partition on the first harddisk. -The partition must be formatted as FAT16 or FAT32. The system can only be -started from DOS and not from a Windows DOS-prompt. +ReactOS can only be installed on a machine that has a FAT16 or FAT32 partition +as the active (bootable) partition. The partition on which ReactOS is to be +installed (which may or may not be the bootable partition) must also be +formatted as FAT16 or FAT32. ReactOS Setup can format the partitions if +needed. -ReactOS can be installed from the source distribution or from the binary +ReactOS can be installed from the source distribution or from the bootable CD distribution. The two ways to install ReactOS are explained below. 3.1 Installation from sources -To install ReactOS after building it, type 'make install'. This will create -the directory 'reactos' in the top directory. Copy this directory to the root -of your first partition on your first harddisk. This is usually c:\ on a -Windows machine. +If you don't have an existing ReactOS installation you want to upgrade, then +build a bootable CD as described above. Burn the CD image, boot from it, and +follow the instructions to install ReactOS. -If you don't want to copy the files manually every time you run a 'make install', -you can specify the directory where the files are to be copied to during -installation. +If you have an existing ReactOS installation you want to upgrade, then to +install ReactOS after building it, type 'make install' or +'mingw32-make install'. This will create the directory 'reactos' in the top +directory. Copy the contents of this directory over the existing installation. -In rules.mak find the variable INSTALL_DIR and change the assigned value to the -name of the directory where the files are to be copied to. If you are using -Windows this could be: +If you don't want to copy the files manually every time you run a +'make install' or 'mingw32-make install', then you can specify the directory +where the files are to be copied to during installation. - INSTALL_DIR = c:\reactos +Set the ROS_INSTALL environment variable. If you are on Windows this could be +done by: -If you are on linux this could be: + set ROS_INSTALL=c:\reactos - INSTALL_DIR = /mnt/windows/reactos +If you are on Linux this could be done by: -Save the changes to rules.mak and run 'make install' to install the files to -the new location. If you don't want to change rules.mak, you can specify the -installtion directory when invoking make. Run -'make INSTALL_DIR=c:\reactos install' to install to c:\reactos. + export ROS_INSTALL=/mnt/windows/reactos +Now run 'make install' or 'mingw32-make install' to install the files to the +new location. -3.2 Installation from binany distribution -To install ReactOS from the binary distribution, extract the archive contents -to c:\reactos. Remember to extract the files with full paths. +3.2 Installation from bootable CD distribution +To install ReactOS from the bootable CD distribution, extract the archive +contents. Then burn the CD image, boot from it, and follow instructions. -4. Booting ReactOS -Startup in DOS mode. 'cd' to c:\reactos and type 'boot' and press <enter>. -A simple shell is started where you can use simple commands like 'cd' and 'dir'. - - 5. Help If you run into problems or have suggestions for making ReactOS better, please -surf to the address below and subscribe to one or more of the mailing lists. +visit the address below and subscribe to one or more of the mailing lists. -http://www.reactos.com/index.php?tab=discussion&section=lists +http://www.reactos.com/en/content/view/full/66 ReactOS Development Team _____ Deleted: branches/cache_manager_rewrite/reactos/Jamfile --- branches/cache_manager_rewrite/reactos/Jamfile 2005-06-04 22:55:58 UTC (rev 15796) +++ branches/cache_manager_rewrite/reactos/Jamfile 2005-06-04 22:53:14 UTC (rev 15797) @@ -1,5 +0,0 @@ -# Main jamfile for ReactOS - -SubDir ROS_TOP ; - -SubInclude ROS_TOP Lib ; _____ Deleted: branches/cache_manager_rewrite/reactos/Jamrules --- branches/cache_manager_rewrite/reactos/Jamrules 2005-06-04 22:55:58 UTC (rev 15796) +++ branches/cache_manager_rewrite/reactos/Jamrules 2005-06-04 22:53:14 UTC (rev 15797) @@ -1,54 +0,0 @@ -# customization for ReactOS goes here - -# The SharedLibrary and SharedLibraryFromObjects rules were -# borrowed from here: -# http://www.differentpla.net/~roger/devel/jam/tutorial/shared_lib/index.h tml - -SUFSHR = .dll ; -RM = rm ; # rm comes with MinGW, and the default del doesn't work in some cases - -rule SharedLibrary -{ - SharedLibraryFromObjects $(<) : $(>:S=$(SUFOBJ)) ; - Objects $(>) ; -} - -rule SharedLibraryFromObjects -{ - local _s _t ; - - # Add grist to file names - # Add suffix to dll - - _s = [ FGristFiles $(>) ] ; - _t = [ FAppendSuffix $(<) : $(SUFSHR) ] ; - - if $(_t) != $(<) - { - DEPENDS $(<) : $(_t) ; - NOTFILE $(<) ; - } - - # make compiled sources a dependency of target - - DEPENDS exe : $(_t) ; - DEPENDS $(_t) : $(_s) ; - MakeLocate $(_t) : $(LOCATE_TARGET) ; - - Clean clean : $(_t) ; - - Link $(_t) : $(_s) ; -} - -# nasm needs to know the output file first, or it doesn't -# recognize -I :( -actions As -{ - $(AS) -o $(<) $(ASFLAGS) -I$(HDRS) $(>) -} - -AS = nasm ; - -# why isn't DEFINES working? :( -#DEFINES += _M_IX86 ; -CCFLAGS += -D_M_IX86 ; _____ Modified: branches/cache_manager_rewrite/reactos/Makefile --- branches/cache_manager_rewrite/reactos/Makefile 2005-06-04 22:55:58 UTC (rev 15796) +++ branches/cache_manager_rewrite/reactos/Makefile 2005-06-04 22:53:14 UTC (rev 15797) @@ -1,1089 +1,270 @@ -# $Id$ +# Accepted environment variables: # -# Global makefile +# ROS_PREFIX +# This variable specifies the prefix of the MinGW installation. On Windows +# a prefix is usually not needed, but on linux it is usually "mingw32". If +# not present and no executable named "gcc" can be found, then the prefix is +# assumed to be "mingw32". If your gcc is named i386-mingw32-gcc then set +# ROS_PREFIX to i386-mingw32. Don't include the dash (-) before gcc. # - -PATH_TO_TOP = . - -include $(PATH_TO_TOP)/rules.mak -include $(PATH_TO_TOP)/config - +# ROS_INTERMEDIATE +# This variable controls where to put intermediate files. Intermediate +# files are generated files that are needed to generate the final +# output files. Examples of intermediate files include *.o, *.a, and +# *.coff. N.B. Don't put a path separator at the end. The variable +# defaults to .\obj-i386. # -# Define to build ReactOS external targets +# ROS_OUTPUT +# This variable controls where to put output files. Output files are +# generated files that makes up the result of the build process. +# Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't +# put a path separator at the end. The variable defaults to .\output-i386. # -ifeq ($(ROS_BUILD_EXT),) -ROS_BUILD_EXT = no -else -ROS_BUILD_EXT = yes -endif - -ifneq ($(MINIMALDEPENDENCIES),no) -IMPLIB = -else -IMPLIB = implib -endif - -# Boot loaders -BOOT_LOADERS = freeldr - -# Required to run the system -COMPONENTS = ntoskrnl - -# Hardware Abstraction Layers -# halx86 -HALS = halx86/up halx86/mp - -# Bus drivers -# acpi isapnp pci serenum -BUS = acpi isapnp pci serenum - -# Filesystem libraries -# vfatlib -LIB_FSLIB = vfatlib - -# libunicode, must be empty! -LIBUNICODE = - -# Static libraries -LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym wdmguid - -# Keyboard layout libraries -DLLS_KBD = kbdda kbddv kbdes kbdfr kbdgr kbdru kbdse kbdsg kbduk kbdus - -# Control Panels -DLLS_CPL = cpl - -# Shell extensions -DLLS_SHELLEXT = shellext - -# User mode libraries -# libpcap packet epsapi -DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ - gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ - msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 serialui setupapi shell32 shlwapi smlib smdll snmpapi \ - syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ - urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv dhcpcapi \ - $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) - -SUBSYS = smss win32k csrss ntvdm - +# ROS_TEMPORARY +# This variable controls where to put temporary files. Temporary files +# are (usually small) generated files that are needed to generate the +# intermediate or final output files. Examples of temporary files include +# *.rci (preprocessed .rc files for wrc), *.tmp, and *.exp. N.B. Don't put +# a path separator at the end. The variable defaults to the current +# directory. # -# Select the server(s) you want to build +# ROS_INSTALL +# This variable controls where to install output files to when using +# 'make install'. N.B. Don't put a path separator at the end. The variable +# defaults to .\reactos. # -#SERVERS = posix linux os2 -SERVERS = win32 +# ROS_BUILDMAP +# This variable controls if map files are to be generated for executable +# output files. Map files have the extension .map. The value can be either +# full (to build map files with assembly code), yes (to build map files +# without source code) or no (to not build any map files). The variable +# defaults to no. +# +# ROS_BUILDNOSTRIP +# This variable controls if non-symbol-stripped versions are to be built +# of executable output files. Non-symbol-stripped executable output files +# have .nostrip added to the filename just before the extension. The value +# can be either yes (to build non-symbol-stripped versions of executable +# output files) or no (to not build non-symbol-stripped versions of +# executable output files). The variable defaults to no. +# +# ROS_RBUILDFLAGS +# Pass parameters to rbuild. -# Driver support libraries -#bzip2 zlib oskittcp -DRIVERS_LIB = bzip2 oskittcp ip csq +.PHONY: all +.PHONY: clean +all: makefile.auto -# Kernel mode device drivers -# Obsolete: ide -# beep blue floppy null parallel ramdrv serenum serial -DEVICE_DRIVERS = beep blue debugout null serial bootvid -# Kernel mode input drivers -INPUT_DRIVERS = mouclass sermouse i8042prt kbdclass +.SUFFIXES: -# Kernel mode file system drivers -# cdfs ext2 fs_rec ms np vfat -FS_DRIVERS = cdfs fs_rec ms np vfat mup ntfs +ifeq ($(HOST),) +ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) +HOST=mingw32-windows +else +HOST=mingw32-linux +endif +endif -# Kernel mode networking drivers -# afd ndis npf tcpip tdi wshtcpip -NET_DRIVERS = afd ndis npf tcpip tdi wshtcpip +# Default to half-verbose mode +ifeq ($(VERBOSE),no) + Q = @ + HALFVERBOSEECHO = no + BUILDNO_QUIET = -q +else +ifeq ($(VERBOSE),full) + Q = + HALFVERBOSEECHO = no + BUILDNO_QUIET = +else + Q = @ + HALFVERBOSEECHO = yes + BUILDNO_QUIET = -q +endif +endif +ifeq ($(HOST),mingw32-linux) + QUOTE = " +else + QUOTE = +endif +ifeq ($(HALFVERBOSEECHO),yes) + ECHO_CP =@echo $(QUOTE)[COPY] $@$(QUOTE) + ECHO_MKDIR =@echo $(QUOTE)[MKDIR] $@$(QUOTE) + ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO] $@$(QUOTE) + ECHO_INVOKE =@echo $(QUOTE)[INVOKE] $<$(QUOTE) + ECHO_PCH =@echo $(QUOTE)[PCH] $@$(QUOTE) + ECHO_CC =@echo $(QUOTE)[CC] $<$(QUOTE) + ECHO_GAS =@echo $(QUOTE)[GAS] $<$(QUOTE) + ECHO_NASM =@echo $(QUOTE)[NASM] $<$(QUOTE) + ECHO_AR =@echo $(QUOTE)[AR] $@$(QUOTE) + ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD] $@$(QUOTE) + ECHO_WRC =@echo $(QUOTE)[WRC] $@$(QUOTE) + ECHO_WIDL =@echo $(QUOTE)[WIDL] $@$(QUOTE) + ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES] $<$(QUOTE) + ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL] $@$(QUOTE) + ECHO_LD =@echo $(QUOTE)[LD] $@$(QUOTE) + ECHO_NM =@echo $(QUOTE)[NM] $@$(QUOTE) + ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP] $@$(QUOTE) + ECHO_RBUILD =@echo $(QUOTE)[RBUILD] $@$(QUOTE) + ECHO_RSYM =@echo $(QUOTE)[RSYM] $@$(QUOTE) + ECHO_WMC =@echo $(QUOTE)[WMC] $@$(QUOTE) + ECHO_NCI =@echo $(QUOTE)[NCI] $@$(QUOTE) + ECHO_CABMAN =@echo $(QUOTE)[CABMAN] $<$(QUOTE) + ECHO_CDMAKE =@echo $(QUOTE)[CDMAKE] $@$(QUOTE) + ECHO_MKHIVE =@echo $(QUOTE)[MKHIVE] $@$(QUOTE) + ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE) + ECHO_TEST =@echo $(QUOTE)[TEST] $@$(QUOTE) +else + ECHO_CP = + ECHO_MKDIR = + ECHO_BUILDNO = + ECHO_INVOKE = + ECHO_PCH = + ECHO_CC = + ECHO_GAS = + ECHO_NASM = + ECHO_AR = + ECHO_WINEBLD = + ECHO_WRC = + ECHO_WIDL = + ECHO_BIN2RES = + ECHO_DLLTOOL = + ECHO_LD = + ECHO_NM = + ECHO_OBJDUMP = + ECHO_RBUILD = + ECHO_RSYM = + ECHO_WMC = + ECHO_NCI = + ECHO_CABMAN = + ECHO_CDMAKE = + ECHO_MKHIVE = + ECHO_REGTESTS= + ECHO_TEST = +endif -# Kernel mode networking device drivers -# ne2000 pcnet -NET_DEVICE_DRIVERS = ne2000 pcnet -# Kernel mode storage drivers -# atapi cdrom class2 disk scsiport -STORAGE_DRIVERS = atapi cdrom class2 disk floppy scsiport diskdump +host_gcc = $(Q)gcc +host_gpp = $(Q)g++ +host_ld = $(Q)ld +host_ar = $(Q)ar +host_objcopy = $(Q)objcopy +ifeq ($(HOST),mingw32-linux) + EXEPREFIX = ./ + EXEPOSTFIX = + SEP = / + mkdir = -$(Q)mkdir -p + gcc = $(Q)$(PREFIX)-gcc + gpp = $(Q)$(PREFIX)-g++ + ld = $(Q)$(PREFIX)-ld + nm = $(Q)$(PREFIX)-nm + objdump = $(Q)$(PREFIX)-objdump + ar = $(Q)$(PREFIX)-ar + objcopy = $(Q)$(PREFIX)-objcopy + dlltool = $(Q)$(PREFIX)-dlltool + windres = $(Q)$(PREFIX)-windres + rm = $(Q)rm -f + cp = $(Q)cp + NUL = /dev/null +else # mingw32-windows + EXEPREFIX = + EXEPOSTFIX = .exe + ROS_EMPTY = + SEP = \$(ROS_EMPTY) + mkdir = -$(Q)mkdir + gcc = $(Q)gcc + gpp = $(Q)g++ + ld = $(Q)ld + nm = $(Q)nm + objdump = $(Q)objdump + ar = $(Q)ar + objcopy = $(Q)objcopy + dlltool = $(Q)dlltool + windres = $(Q)windres + rm = $(Q)del /f /q + cp = $(Q)copy /y + NUL = NUL +endif -# System applications -# autochk cmd format services setup usetup welcome winlogon msiexec -SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ - reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ - winlogon regedit winefile notepad reactos lsass dhcp sm +ifneq ($(ROS_INTERMEDIATE),) + INTERMEDIATE := $(ROS_INTERMEDIATE) +else + INTERMEDIATE := obj-i386 +endif +INTERMEDIATE_ := $(INTERMEDIATE)$(SEP) -# System services -SYS_SVC = rpcss eventlog umpnpmgr +ifneq ($(ROS_OUTPUT),) + OUTPUT := $(ROS_OUTPUT) +else + OUTPUT := output-i386 +endif +OUTPUT_ := $(OUTPUT)$(SEP) -APPS = testsets utils - - -# External modules and (sub)systems for ReactOS -# rosapps posix os2 (requires c++) java (non-existant) -EXTERNALS = rosapps - -ifeq ($(ROS_BUILD_EXT),yes) -EXT_MODULES = $(EXTERNALS) +ifneq ($(ROS_TEMPORARY),) + TEMPORARY := $(ROS_TEMPORARY) else -EXT_MODULES = + TEMPORARY := endif +TEMPORARY_ := $(TEMPORARY)$(SEP) -KERNEL_DRIVERS = $(DRIVERS_LIB) $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \ - $(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS) VIDEO_DRIVERS USB_DRIVERS - -# Regression tests -REGTESTS = regtests - -all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \ - $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES) - -bootstrap: dk implib iface_native - -depends: $(LIB_STATIC:%=%_depends) $(LIB_FSLIB:%=%_depends) msvcrt_depends $(DLLS:%=%_depends) \ - $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \ - $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends) - -implib: hallib $(LIB_STATIC) $(LIB_FSLIB) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \ - $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) \ - msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \ - $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \ - $(EXT_MODULES:%=%_implib) $(REGTESTS:%=%_implib) - -test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \ - $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test $(DLLS:%=%_test) \ - $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \ - $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test) - -clean: tools dk_clean iface_native_clean hallib_clean \ - $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \ - $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \ - msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \ - $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) \ - $(NET_APPS:%=%_clean) $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) \ - $(REGTESTS:%=%_clean) clean_after tools_clean - -clean_after: - $(HALFVERBOSEECHO) [RM] /include/roscfg.h - $(RM) $(PATH_TO_TOP)/include/roscfg.h - -fastinstall: tools install_dirs install_before $(COMPONENTS:%=%_install) $(HALS:%=%_install) \ - $(BUS:%=%_install) $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) \ - msvcrt_install $(DLLS:%=%_install) $(KERNEL_DRIVERS:%=%_install) \ - $(SUBSYS:%=%_install) $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \ - $(APPS:%=%_install) $(EXT_MODULES:%=%_install) $(REGTESTS:%=%_install) -install: fastinstall registry - -FREELDR_DIR = boot/freeldr - -bootcd_directory_layout: - $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR) - $(RMKDIR) $(BOOTCD_DIR) - $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR)/bootdisk - $(RMKDIR) $(BOOTCD_DIR)/bootdisk - $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR)/loader - $(RMKDIR) $(BOOTCD_DIR)/loader - $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR)/reactos - $(RMKDIR) $(BOOTCD_DIR)/reactos - $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR)/reactos/system32 - $(RMKDIR) $(BOOTCD_DIR)/reactos/system32 - -bootcd_bootstrap_files: $(BOOT_LOADERS:%=%_bootcd) $(COMPONENTS:%=%_bootcd) \ - $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) $(LIB_STATIC:%=%_bootcd) \ - $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \ - $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd) - -bootcd_install_before: - $(HALFVERBOSEECHO) [RLINE] bootdata/autorun.inf to $(BOOTCD_DIR)/autorun.inf - $(RLINE) bootdata/autorun.inf $(BOOTCD_DIR)/autorun.inf - $(HALFVERBOSEECHO) [RLINE] bootdata/readme.txt to $(BOOTCD_DIR)/readme.txt - $(RLINE) bootdata/readme.txt $(BOOTCD_DIR)/readme.txt - $(HALFVERBOSEECHO) [RLINE] bootdata/hivecls.inf to $(BOOTCD_DIR)/reactos/hivecls.inf - $(RLINE) bootdata/hivecls.inf $(BOOTCD_DIR)/reactos/hivecls.inf - $(HALFVERBOSEECHO) [RLINE] bootdata/hivedef.inf to $(BOOTCD_DIR)/reactos/hivedef.inf - $(RLINE) bootdata/hivedef.inf $(BOOTCD_DIR)/reactos/hivedef.inf - $(HALFVERBOSEECHO) [RLINE] bootdata/hivesft.inf to $(BOOTCD_DIR)/reactos/hivesft.inf - $(RLINE) bootdata/hivesft.inf $(BOOTCD_DIR)/reactos/hivesft.inf - $(HALFVERBOSEECHO) [RLINE] bootdata/hivesys.inf to $(BOOTCD_DIR)/reactos/hivesys.inf - $(RLINE) bootdata/hivesys.inf $(BOOTCD_DIR)/reactos/hivesys.inf - $(HALFVERBOSEECHO) [RLINE] bootdata/txtsetup.sif to $(BOOTCD_DIR)/reactos/txtsetup.sif - $(RLINE) bootdata/txtsetup.sif $(BOOTCD_DIR)/reactos/txtsetup.sif - $(HALFVERBOSEECHO) [COPY] bootdata/icon.ico to $(BOOTCD_DIR)/icon.ico - $(CP) bootdata/icon.ico $(BOOTCD_DIR)/icon.ico - $(HALFVERBOSEECHO) [COPY] subsys/system/welcome/welcome.exe to $(BOOTCD_DIR)/reactos/welcome.exe - $(CP) subsys/system/welcome/welcome.exe $(BOOTCD_DIR)/reactos/welcome.exe - $(HALFVERBOSEECHO) [COPY] subsys/system/reactos/reactos.exe to $(BOOTCD_DIR)/reactos/reactos.exe - $(CP) subsys/system/reactos/reactos.exe $(BOOTCD_DIR)/reactos/reactos.exe - $(HALFVERBOSEECHO) [COPY] media/nls/c_1252.nls to $(BOOTCD_DIR)/reactos/c_1252.nls - $(CP) media/nls/c_1252.nls $(BOOTCD_DIR)/reactos/c_1252.nls - $(HALFVERBOSEECHO) [COPY] media/nls/c_437.nls to $(BOOTCD_DIR)/reactos/c_437.nls - $(CP) media/nls/c_437.nls $(BOOTCD_DIR)/reactos/c_437.nls - $(HALFVERBOSEECHO) [COPY] media/nls/l_intl.nls to $(BOOTCD_DIR)/reactos/l_intl.nls - $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls - $(HALFVERBOSEECHO) [COPY] media/drivers/etc/services to $(BOOTCD_DIR)/reactos/services - $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services - $(HALFVERBOSEECHO) [COPY] media/drivers/etc/KDBinit to $(BOOTCD_DIR)/reactos/KDBinit - $(CP) media/drivers/etc/KDBinit $(BOOTCD_DIR)/reactos/KDBinit - -bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before - -bootcd_makecd: - $(CABMAN) /C bootdata/packages/reactos.dff /L $(BOOTCD_DIR)/reactos /I - $(CABMAN) /C bootdata/packages/reactos.dff /RC $(BOOTCD_DIR)/reactos/reactos.inf /L $(BOOTCD_DIR)/reactos /N - - $(RM) $(BOOTCD_DIR)/reactos/reactos.inf - $(HALFVERBOSEECHO) [CDMAKE] ReactOS.iso - $(CDMAKE) -v -m -b $(BOOTCD_DIR)/../isoboot.bin $(BOOTCD_DIR) REACTOS ReactOS.iso - -ubootcd_unattend: - $(HALFVERBOSEECHO) [COPY] bootdata/unattend.inf to $(BOOTCD_DIR)/reactos/unattend.inf - $(CP) bootdata/unattend.inf $(BOOTCD_DIR)/reactos/unattend.inf - -livecd_directory_layout: - $(HALFVERBOSEECHO) [RMKDIR] $(LIVECD_DIR) - $(RMKDIR) $(LIVECD_DIR) - $(HALFVERBOSEECHO) [RMKDIR] $(LIVECD_DIR)/loader - $(RMKDIR) $(LIVECD_DIR)/loader - $(HALFVERBOSEECHO) [RMKDIR] $(LIVECD_DIR)/reactos - $(RMKDIR) $(LIVECD_DIR)/reactos - $(HALFVERBOSEECHO) [RMKDIR] $(LIVECD_DIR)/Profiles/All\ Users/Desktop - $(RMKDIR) $(LIVECD_DIR)/Profiles/All\ Users/Desktop - $(HALFVERBOSEECHO) [RMKDIR] $(LIVECD_DIR)/Profiles/Default\ User/Desktop - $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/Desktop - $(HALFVERBOSEECHO) [RMKDIR] $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents - $(RMKDIR) $(LIVECD_DIR)/Profiles/Default\ User/My\ Documents - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/isoboot.bin to ${LIVECD_DIR}/../isoboot.bin - $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${LIVECD_DIR}/../isoboot.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/freeldr.sys to ${LIVECD_DIR}/loader/setupldr.sys - $(CP) ${FREELDR_DIR}/freeldr/freeldr.sys ${LIVECD_DIR}/loader/setupldr.sys - $(HALFVERBOSEECHO) [RLINE] bootdata/livecd.ini to $(LIVECD_DIR)/freeldr.ini - $(RLINE) bootdata/livecd.ini $(LIVECD_DIR)/freeldr.ini - -livecd_bootstrap_files: - $(MAKE) LIVECD_INSTALL=yes fastinstall - -livecd_install_before: - $(MKHIVE) bootdata $(LIVECD_DIR)/reactos/system32/config bootdata/livecd.inf bootdata/hiveinst.inf - -livecd_basic: livecd_directory_layout livecd_bootstrap_files livecd_install_before - -livecd_makecd: - $(HALFVERBOSEECHO) [CDMAKE] roslive.iso - $(CDMAKE) -m -j -b $(LIVECD_DIR)/../isoboot.bin $(LIVECD_DIR) REACTOS roslive.iso - -bootcd: bootcd_basic bootcd_makecd - -ubootcd: bootcd_basic ubootcd_unattend bootcd_makecd - -livecd: livecd_basic livecd_makecd - -registry: tools - $(MKHIVE) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf - -.PHONY: all bootstrap depends implib test clean clean_before install bootcd_directory_layout \ -bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd - - -# -# Boot Loaders -# -$(BOOT_LOADERS): %: - $(MAKE) -C boot/$* - -$(BOOT_LOADERS:%=%_test): %_test: - $(MAKE) -C boot/$* test - -$(BOOT_LOADERS:%=%_clean): %_clean: - $(MAKE) -C boot/$* clean - -$(BOOT_LOADERS:%=%_bootcd): %_bootcd: - $(MAKE) -C boot/$* bootcd - -.PHONY: $(BOOT_LOADERS) $(BOOT_LOADERS:%=%_test) $(BOOT_LOADERS:%=%_clean) \ - $(BOOT_LOADERS:%=%_bootcd) - -$(COMPONENTS): dk - -# -# System Applications -# -$(SYS_APPS): %: $(IMPLIB) - $(MAKE) -C subsys/system/$* - -$(SYS_APPS:%=%_implib): %_implib: dk - $(MAKE) --silent -C subsys/system/$* implib - -$(SYS_APPS:%=%_test): %_test: - $(MAKE) -C subsys/system/$* test - -$(SYS_APPS:%=%_clean): %_clean: - $(MAKE) -C subsys/system/$* clean - -$(SYS_APPS:%=%_install): %_install: - $(MAKE) -C subsys/system/$* install - -$(SYS_APPS:%=%_bootcd): %_bootcd: - $(MAKE) -C subsys/system/$* bootcd - -.PHONY: $(SYS_APPS) $(SYS_APPS:%=%_implib) $(SYS_APPS:%=%_test) \ - $(SYS_APPS:%=%_clean) $(SYS_APPS:%=%_install) $(SYS_APPS:%=%_bootcd) - -# -# System Services -# -$(SYS_SVC): %: $(IMPLIB) - $(MAKE) -C services/$* - -$(SYS_SVC:%=%_depends): %_depends: - $(MAKE) -C services/$* depends - -$(SYS_SVC:%=%_implib): %_implib: dk - $(MAKE) --silent -C services/$* implib - -$(SYS_SVC:%=%_test): %_test: - $(MAKE) -C services/$* test - -$(SYS_SVC:%=%_clean): %_clean: - $(MAKE) -C services/$* clean - -$(SYS_SVC:%=%_install): %_install: - $(MAKE) -C services/$* install - -.PHONY: $(SYS_SVC) $(SYS_SVC:%=%_depends) $(SYS_SVC:%=%_implib) \ - $(SYS_SVC:%=%_test) $(SYS_SVC:%=%_clean) $(SYS_SVC:%=%_install) - - -# -# Applications -# -# -# Extra (optional system) Applications -# -$(APPS): %: $(IMPLIB) - $(MAKE) -C apps/$* - -# Not needed -# $(APPS:%=%_implib): %_implib: dk -# $(MAKE) --silent -C apps/$* implib - -$(APPS:%=%_test): %_test: - $(MAKE) -C apps/$* test - -$(APPS:%=%_clean): %_clean: - $(MAKE) -C apps/$* clean - -$(APPS:%=%_install): %_install: - $(MAKE) -C apps/$* install - -.PHONY: $(APPS) $(APPS:%=%_test) $(APPS:%=%_clean) $(APPS:%=%_install) - - -# -# External ports and subsystem personalities -# -$(EXTERNALS): %: - $(MAKE) -C $(ROOT_PATH)/$* - -$(EXTERNALS:%=%_depends): %_depends: - $(MAKE) -C $(ROOT_PATH)/$* depends - -$(EXTERNALS:%=%_implib): %_implib: dk - $(MAKE) --silent -C $(ROOT_PATH)/$* implib - -$(EXTERNALS:%=%_clean): %_clean: - $(MAKE) -C $(ROOT_PATH)/$* clean - -$(EXTERNALS:%=%_install): %_install: - $(MAKE) -C $(ROOT_PATH)/$* install - -.PHONY: $(EXTERNALS) $(EXTERNALS:%=%_depends) $(EXTERNALS:%=%_implib) $(EXTERNALS:%=%_clean) $(EXTERNALS:%=%_install) - - -# -# Tools -# -tools: - $(MAKE) --silent -C tools - -tools_implib: - - -tools_test: - - -tools_clean: - $(MAKE) -C tools clean - -tools_install: - -.PHONY: tools tools_implib tools_test tools_clean tools_install - - -# -# Developer Kits -# -dk: tools - @$(RMKDIR) $(DK_PATH) - @$(RMKDIR) $(DDK_PATH) - @$(RMKDIR) $(DDK_PATH_LIB) - @$(RMKDIR) $(DDK_PATH_INC) - @$(RMKDIR) $(SDK_PATH) - @$(RMKDIR) $(SDK_PATH_LIB) - @$(RMKDIR) $(SDK_PATH_INC) - @$(RMKDIR) $(XDK_PATH) - @$(RMKDIR) $(XDK_PATH_LIB) -# @$(RMKDIR) $(XDK_PATH_INC) - -dk_implib: - -# WARNING! Be very sure that there are no important files -# in these directories before cleaning them!!! -dk_clean: - $(HALFVERBOSEECHO) [RM] $(DDK_PATH_LIB)/*.a - $(RM) $(DDK_PATH_LIB)/*.a -# $(HALFVERBOSEECHO) [RM] $(DDK_PATH_INC)/*.h -# $(RM) $(DDK_PATH_INC)/*.h - $(HALFVERBOSEECHO) [RMDIR] $(DDK_PATH_LIB) - $(RMDIR) $(DDK_PATH_LIB) -# $(HALFVERBOSEECHO) [RMDIR] $(DDK_PATH_INC) -# $(RMDIR) $(DDK_PATH_INC) - $(HALFVERBOSEECHO) [RM] $(SDK_PATH_LIB)/*.a - $(RM) $(SDK_PATH_LIB)/*.a -# $(HALFVERBOSEECHO) [RM] $(SDK_PATH_INC)/*.h -# $(RM) $(SDK_PATH_INC)/*.h - $(HALFVERBOSEECHO) [RMDIR] $(SDK_PATH_LIB) - $(RMDIR) $(SDK_PATH_LIB) -# $(HALFVERBOSEECHO) [RMDIR] $(SDK_PATH_INC) -# $(RMDIR) $(SDK_PATH_INC) - $(HALFVERBOSEECHO) [RM] $(XDK_PATH_LIB)/*.a - $(RM) $(XDK_PATH_LIB)/*.a -# $(HALFVERBOSEECHO) [RM] $(XDK_PATH_INC)/*.h -# $(RM) $(XDK_PATH_INC)/*.h - $(HALFVERBOSEECHO) [RMDIR] $(XDK_PATH_LIB) - $(RMDIR) $(XDK_PATH_LIB) -# $(HALFVERBOSEECHO) [RMDIR] $(XDK_PATH_INC) -# $(RMDIR) $(XDK_PATH_INC) - -dk_install: - -.PHONY: dk dk_implib dk_clean dk_install - - -# -# Interfaces -# -iface_native: - $(MAKE) --silent -C tools/nci - -iface_native_implib: - -iface_native_test: - -iface_native_clean: - $(MAKE) --silent -C tools/nci clean - -iface_native_install: - -iface_native_bootcd: - -.PHONY: iface_native iface_native_implib iface_native_test iface_native_clean \ - iface_native_install iface_native_bootcd - - -# -# Bus driver rules -# -$(BUS): %: $(IMPLIB) - $(MAKE) -C drivers/bus/$* - -$(BUS:%=%_implib): %_implib: dk - $(MAKE) --silent -C drivers/bus/$* implib - -$(BUS:%=%_test): %_test: - $(MAKE) -C drivers/bus/$* test - -$(BUS:%=%_clean): %_clean: - $(MAKE) -C drivers/bus/$* clean - -$(BUS:%=%_install): %_install: - $(MAKE) -C drivers/bus/$* install - -$(BUS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/bus/$* bootcd - -.PHONY: $(BUS) $(BUS:%=%_implib) $(BUS:%=%_clean) \ - $(BUS:%=%_install) $(BUS:%=%_bootcd) - - -# -# Driver support libraries rules -# -$(DRIVERS_LIB): %: $(IMPLIB) - $(MAKE) -C drivers/lib/$* - -$(DRIVERS_LIB:%=%_implib): %_implib: dk - $(MAKE) --silent -C drivers/lib/$* implib - -$(DRIVERS_LIB:%=%_test): %_test: - $(MAKE) -C drivers/lib/$* test - -$(DRIVERS_LIB:%=%_clean): %_clean: - $(MAKE) -C drivers/lib/$* clean - -$(DRIVERS_LIB:%=%_install): %_install: - $(MAKE) -C drivers/lib/$* install - -$(DRIVERS_LIB:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/lib/$* bootcd - -.PHONY: $(DRIVERS_LIB) $(DRIVERS_LIB:%=%_implib) $(DRIVERS_LIB:%=%_test) \ - $(DRIVERS_LIB:%=%_clean) $(DRIVERS_LIB:%=%_install) $(DRIVERS_LIB:%=%_bootcd) - - -# -# Device driver rules -# -$(DEVICE_DRIVERS): %: $(IMPLIB) - $(MAKE) -C drivers/dd/$* - -$(DEVICE_DRIVERS:%=%_implib): %_implib: dk - $(MAKE) --silent -C drivers/dd/$* implib - -$(DEVICE_DRIVERS:%=%_test): %_test: - $(MAKE) -C drivers/dd/$* test - -$(DEVICE_DRIVERS:%=%_clean): %_clean: - $(MAKE) -C drivers/dd/$* clean - -$(DEVICE_DRIVERS:%=%_install): %_install: - $(MAKE) -C drivers/dd/$* install - -$(DEVICE_DRIVERS:%=%_bootcd): %_bootcd: - $(MAKE) -C drivers/dd/$* bootcd - -.PHONY: $(DEVICE_DRIVERS) $(DEVICE_DRIVERS:%=%_implib) $(DEVICE_DRIVERS:%=%_test) \ - $(DEVICE_DRIVERS:%=%_clean) $(DEVICE_DRIVERS:%=%_install) $(DEVICE_DRIVERS:%=%_bootcd) - - -# -# Video device driver rules -# -VIDEO_DRIVERS: $(IMPLIB) - $(MAKE) -C drivers/video - -VIDEO_DRIVERS_implib: dk [truncated at 1000 lines; 51735 more skipped]

19 years, 6 months

[ekohl] 15796: - Create device instance key for root device node.

by ekohl＠svn.reactos.com

- Create device instance key for root device node. - Add DeviceReference value for each non-root device node. Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-06-04 21:35:07 UTC (rev 15795) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-06-04 22:55:58 UTC (rev 15796) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: include/internal/io.h @@ -341,6 +340,9 @@ PnpInit(VOID); VOID +PnpInit2(VOID); + +VOID IopInitDriverImplementation(VOID); VOID _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-04 21:35:07 UTC (rev 15795) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-06-04 22:55:58 UTC (rev 15796) @@ -40,7 +40,7 @@ NPAGED_LOOKASIDE_LIST IoSmallIrpLookaside; /* INIT FUNCTIONS ************************************************************/ - + VOID INIT_FUNCTION IoInitCancelHandling(VOID) @@ -64,11 +64,11 @@ ULONG i; PKPRCB Prcb; PNPAGED_LOOKASIDE_LIST CurrentList = NULL; - + /* Calculate the sizes */ LargeIrpSize = sizeof(IRP) + (8 * sizeof(IO_STACK_LOCATION)); SmallIrpSize = sizeof(IRP) + sizeof(IO_STACK_LOCATION); - + /* Initialize the Lookaside List for Large IRPs */ ExInitializeNPagedLookasideList(&IoLargeIrpLookaside, NULL, @@ -77,7 +77,7 @@ LargeIrpSize, IO_LARGEIRP, 0); - + /* Initialize the Lookaside List for Small IRPs */ ExInitializeNPagedLookasideList(&IoSmallIrpLookaside, NULL, @@ -95,14 +95,14 @@ sizeof(IO_COMPLETION_PACKET), IOC_TAG1, 0); - + /* Now allocate the per-processor lists */ for (i = 0; i < KeNumberProcessors; i++) { /* Get the PRCB for this CPU */ Prcb = ((PKPCR)(KPCR_BASE + i * PAGE_SIZE))->Prcb; DPRINT("Setting up lookaside for CPU: %x, PRCB: %p\n", i, Prcb); - + /* Set the Large IRP List */ Prcb->PPLookasideList[LookasideLargeIrpList].L = &IoLargeIrpLookaside.L; CurrentList = ExAllocatePoolWithTag(NonPagedPool, @@ -124,7 +124,7 @@ CurrentList = &IoLargeIrpLookaside; } Prcb->PPLookasideList[LookasideLargeIrpList].P = &CurrentList->L; - + /* Set the Small IRP List */ Prcb->PPLookasideList[LookasideSmallIrpList].L = &IoSmallIrpLookaside.L; CurrentList = ExAllocatePoolWithTag(NonPagedPool, @@ -146,7 +146,7 @@ CurrentList = &IoSmallIrpLookaside; } Prcb->PPLookasideList[LookasideSmallIrpList].P = &CurrentList->L; - + /* Set the I/O Completion List */ Prcb->PPLookasideList[LookasideCompletionList].L = &IoCompletionPacketLookaside.L; CurrentList = ExAllocatePoolWithTag(NonPagedPool, @@ -169,7 +169,7 @@ } Prcb->PPLookasideList[LookasideCompletionList].P = &CurrentList->L; } - + DPRINT("Done allocation\n"); } @@ -187,7 +187,7 @@ IopInitDriverImplementation(); DPRINT("Creating Device Object Type\n"); - + /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Device"); @@ -198,16 +198,16 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = IopFileMapping; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoDeviceObjectType); - + /* Do the Adapter Type */ RtlInitUnicodeString(&Name, L"Adapter"); ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoAdapterObjectType); - + /* Do the Controller Type */ RtlInitUnicodeString(&Name, L"Controller"); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(CONTROLLER_OBJECT); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoControllerObjectType); - + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoControllerObjectType); + /* Initialize the File object type */ RtlInitUnicodeString(&Name, L"File"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); @@ -315,7 +315,7 @@ */ PnpInit(); } - + VOID INIT_FUNCTION IoInit2(BOOLEAN BootLog) @@ -325,6 +325,8 @@ MODULE_OBJECT ModuleObject; NTSTATUS Status; + PnpInit2(); + IoCreateDriverList(); KeInitializeSpinLock (&IoStatisticsLock); _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-04 21:35:07 UTC (rev 15795) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-06-04 22:55:58 UTC (rev 15796) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/io/pnpmgr.c @@ -893,6 +892,39 @@ ZwClose(LogConfKey); } + if (DeviceNode->PhysicalDeviceObject != NULL) + { + /* Create the 'Control' key */ + RtlInitUnicodeString(&KeyName, + L"Control"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF, + InstanceKey, + NULL); + Status = ZwCreateKey(&LogConfKey, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (NT_SUCCESS(Status)) + { + ULONG Reference = (ULONG)DeviceNode->PhysicalDeviceObject; + RtlInitUnicodeString(&KeyName, + L"DeviceReference"); + Status = ZwSetValueKey(LogConfKey, + &KeyName, + 0, + REG_DWORD, + &Reference, + sizeof(PVOID)); + + ZwClose(LogConfKey); + } + } + DPRINT("IopSetDeviceInstanceData() done\n"); return STATUS_SUCCESS; @@ -909,17 +941,17 @@ ULONG NumberOfResources = 0; ULONG i; NTSTATUS Status; - + /* Fill DeviceNode->ResourceList and DeviceNode->ResourceListTranslated; * by using DeviceNode->ResourceRequirements */ - + if (!DeviceNode->ResourceRequirements || DeviceNode->ResourceRequirements->AlternativeLists == 0) { DeviceNode->ResourceList = DeviceNode->ResourceListTranslated = NULL; return STATUS_SUCCESS; } - + /* FIXME: that's here that PnP arbiter should go */ /* Actually, simply use resource list #0 as assigned resource list */ ResourceList = &DeviceNode->ResourceRequirements->List[0]; @@ -928,45 +960,45 @@ Status = STATUS_REVISION_MISMATCH; goto ByeBye; } - - DeviceNode->ResourceList = ExAllocatePool(PagedPool, + + DeviceNode->ResourceList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (!DeviceNode->ResourceList) { Status = STATUS_INSUFFICIENT_RESOURCES; goto ByeBye; } - - DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool, + + DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); if (!DeviceNode->ResourceListTranslated) { Status = STATUS_INSUFFICIENT_RESOURCES; goto ByeBye; } - + DeviceNode->ResourceList->Count = 1; DeviceNode->ResourceList->List[0].InterfaceType = DeviceNode->ResourceRequirements->InterfaceType; DeviceNode->ResourceList->List[0].BusNumber = DeviceNode->ResourceRequirements->BusNumber; DeviceNode->ResourceList->List[0].PartialResourceList.Version = 1; DeviceNode->ResourceList->List[0].PartialResourceList.Revision = 1; - + DeviceNode->ResourceListTranslated->Count = 1; DeviceNode->ResourceListTranslated->List[0].InterfaceType = DeviceNode->ResourceRequirements->InterfaceType; DeviceNode->ResourceListTranslated->List[0].BusNumber = DeviceNode->ResourceRequirements->BusNumber; DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Version = 1; DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Revision = 1; - + for (i = 0; i < ResourceList->Count; i++) { ResourceDescriptor = &ResourceList->Descriptors[i]; - + if (ResourceDescriptor->Option == 0 || ResourceDescriptor->Option == IO_RESOURCE_PREFERRED) { DescriptorRaw = &DeviceNode->ResourceList->List[0].PartialResourceList.PartialDescriptor s[NumberOfResources]; DescriptorTranslated = &DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Partial Descriptors[NumberOfResources]; NumberOfResources++; - + /* Copy ResourceDescriptor to DescriptorRaw and DescriptorTranslated */ DescriptorRaw->Type = DescriptorTranslated->Type = ResourceDescriptor->Type; DescriptorRaw->ShareDisposition = DescriptorTranslated->ShareDisposition = ResourceDescriptor->ShareDisposition; @@ -1001,7 +1033,7 @@ DescriptorRaw->u.Interrupt.Vector = 9; else DescriptorRaw->u.Interrupt.Vector = ResourceDescriptor->u.Interrupt.MinimumVector; - + DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector( DeviceNode->ResourceRequirements->InterfaceType, DeviceNode->ResourceRequirements->BusNumber, @@ -1069,12 +1101,12 @@ NumberOfResources--; } } - + } - + DeviceNode->ResourceList->List[0].PartialResourceList.Count = NumberOfResources; DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Count = NumberOfResources; - + return STATUS_SUCCESS; ByeBye: @@ -1818,7 +1850,8 @@ DeviceNode, IopActionInitBootServices, DeviceNode); - } else + } + else { IopInitDeviceTreeTraverseContext( &Context, @@ -1981,6 +2014,35 @@ } +static NTSTATUS INIT_FUNCTION +IopSetRootDeviceInstanceData(PDEVICE_NODE DeviceNode) +{ + PWSTR KeyBuffer; + HANDLE InstanceKey = NULL; + NTSTATUS Status; + + /* Create registry key for the instance id, if it doesn't exist yet */ + KeyBuffer = ExAllocatePool(PagedPool, + (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length); + wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer); + Status = IopCreateDeviceKeyPath(KeyBuffer, + &InstanceKey); + ExFreePool(KeyBuffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create the instance key! (Status %lx)\n", Status); + return Status; + } + + /* FIXME: Set 'ConfigFlags' value */ + + ZwClose(InstanceKey); + + return Status; +} + + VOID INIT_FUNCTION PnpInit(VOID) { @@ -2026,7 +2088,7 @@ } if (!IopCreateUnicodeString(&IopRootDeviceNode->InstancePath, - L"HTREE\\Root\\0", + L"HTREE\\ROOT\\0", PagedPool)) { CPRINT("Failed to create the instance path!\n"); @@ -2044,4 +2106,19 @@ IopRootDeviceNode->PhysicalDeviceObject); } + +VOID INIT_FUNCTION +PnpInit2(VOID) +{ + NTSTATUS Status; + + /* Set root device instance data */ + Status = IopSetRootDeviceInstanceData(IopRootDeviceNode); + if (!NT_SUCCESS(Status)) + { + CPRINT("Failed to set instance data\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } +} + /* EOF */

19 years, 6 months

[fireball] 15795: Fix a few critical typos/mistakes (like interruptvector/interruptlevel), stdcall for thread's func, etc. Also added some "hacks" into hub's thread, but at least it leads to first steps to device enumeration.

by fireball＠svn.reactos.com

Fix a few critical typos/mistakes (like interruptvector/interruptlevel), stdcall for thread's func, etc. Also added some "hacks" into hub's thread, but at least it leads to first steps to device enumeration. Driver (OHCI) bugchecks on my_pci_pool_allocation now (when trying to send URB). Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c --- trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-04 21:07:00 UTC (rev 15794) +++ trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-06-04 21:35:07 UTC (rev 15795) @@ -1019,6 +1019,7 @@ * safe since we delete the hub from the event list. * Not the most efficient, but avoids deadlocks. */ + DPRINT1("hub_events() called\n"); while (m<5) { m++; @@ -1138,7 +1139,8 @@ spin_unlock_irqrestore(&hub_event_lock, flags); } -static int hub_thread(void *__hub) +// ReactOS: STDCALL is needed here +static int STDCALL hub_thread(void *__hub) { /* * This thread doesn't need any user-level access, @@ -1149,14 +1151,25 @@ allow_signal(SIGKILL); /* Send me a signal to get me die (for debugging) */ do { - + + /* The following is just for debug */ + inc_jiffies(1); + do_all_timers(); + handle_irqs(-1); + /* End of debug hack*/ + hub_events(); + /* The following is just for debug */ + handle_irqs(-1); + /* End of debug hack*/ + + //FIXME: Correct this //wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); // interruptable_sleep_on analog - below - while (!list_empty(&hub_event_list)) { - interruptible_sleep_on(&khubd_wait); - } + //while (!list_empty(&hub_event_list)) { + // interruptible_sleep_on(&khubd_wait); + //} if (current->flags & PF_FREEZE) refrigerator(PF_IOTHREAD); _____ Modified: trunk/reactos/drivers/usb/cromwell/host/ohci_main.c --- trunk/reactos/drivers/usb/cromwell/host/ohci_main.c 2005-06-04 21:07:00 UTC (rev 15794) +++ trunk/reactos/drivers/usb/cromwell/host/ohci_main.c 2005-06-04 21:35:07 UTC (rev 15795) @@ -125,7 +125,8 @@ ohci_hcd_pci_cleanup(); } -NTSTATUS InitLinuxWrapper(PDEVICE_OBJECT DeviceObject) +NTSTATUS +InitLinuxWrapper(PDEVICE_OBJECT DeviceObject) { NTSTATUS Status; POHCI_DEVICE_EXTENSION DeviceExtension = (POHCI_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -134,7 +135,7 @@ dev = ExAllocatePoolWithTag(PagedPool, sizeof(struct pci_dev), USB_OHCI_TAG); init_wrapper(dev); - dev->irq = DeviceExtension->InterruptLevel; + dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_OHCI_TAG); // 128 max len for slot name @@ -151,7 +152,7 @@ // Probe device with real id now ohci_pci_driver.probe(dev, pci_ids); - DPRINT("InitLinuxWrapper() done\n"); + DPRINT1("InitLinuxWrapper() done\n"); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-06-04 21:07:00 UTC (rev 15794) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-06-04 21:35:07 UTC (rev 15795) @@ -517,7 +517,7 @@ #define flush_scheduled_work() do {} while(0) #define refrigerator(x) do {} while(0) -#define signal_pending(x) 1 // fall through threads +#define signal_pending(x) 0 // Don't fall through threads! ReactOS implements this correctly #define complete_and_exit(a,b) return 0 //#define kill_proc(a,b,c) 0 _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c --- trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-06-04 21:07:00 UTC (rev 15794) +++ trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-06-04 21:35:07 UTC (rev 15795) @@ -126,6 +126,8 @@ (PKSTART_ROUTINE)handler, parm); + DPRINT1("usbcore: Created system thread %d\n", (int)hThread); + return (int)hThread; // FIXME: Correct? }

19 years, 6 months

[ion] 15794: Fix filip's fixme and alex's fixme (ie: make IRP cancellation work properly). This should appease Hartmut even more =).

by ion＠svn.reactos.com

Fix filip's fixme and alex's fixme (ie: make IRP cancellation work properly). This should appease Hartmut even more =). Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-06-04 20:48:51 UTC (rev 15793) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-06-04 21:07:00 UTC (rev 15794) @@ -37,6 +37,87 @@ IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); } +VOID +STDCALL +IopRemoveThreadIrp(VOID) +{ + KIRQL OldIrql; + PIRP DeadIrp; + PETHREAD IrpThread; + PLIST_ENTRY IrpEntry; + PIO_ERROR_LOG_PACKET ErrorLogEntry; + + /* First, raise to APC to protect IrpList */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Get the Thread and check the list */ + IrpThread = PsGetCurrentThread(); + if (IsListEmpty(&IrpThread->IrpList)) + { + /* It got completed now, so quit */ + KeLowerIrql(OldIrql); + return; + } + + /* Get the misbehaving IRP */ + IrpEntry = IrpThread->IrpList.Flink; + DeadIrp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); + + /* Disown the IRP! */ + DeadIrp->Tail.Overlay.Thread = NULL; + InitializeListHead(&DeadIrp->ThreadListEntry); + RemoveHeadList(&IrpThread->IrpList); + + /* Lower IRQL now */ + KeLowerIrql(OldIrql); + + /* Check if we can send an Error Log Entry*/ + if (DeadIrp->CurrentLocation <= DeadIrp->StackCount) + { + /* Allocate an entry */ + ErrorLogEntry = IoAllocateErrorLogEntry(IoGetCurrentIrpStackLocation(DeadIrp)->DeviceObj ect, + sizeof(IO_ERROR_LOG_PACKET)); + + /* Write the entry */ + ErrorLogEntry->ErrorCode = 0xBAADF00D; /* FIXME */ + IoWriteErrorLogEntry(ErrorLogEntry); + } +} + +VOID +STDCALL +IopCleanupIrp(PIRP Irp, + PFILE_OBJECT FileObject) +{ + PMDL Mdl; + + /* Check if there's an MDL */ + while ((Mdl = Irp->MdlAddress)) + { + /* Clear all of them */ + Irp->MdlAddress = Mdl->Next; + IoFreeMdl(Mdl); + } + + /* Free the buffer */ + if (Irp->Flags & IRP_DEALLOCATE_BUFFER) + { + ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); + } + + /* Derefernce the User Event */ + if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) && FileObject) + { + ObDereferenceObject(Irp->UserEvent); + } + + /* Dereference the File Object */ + if (FileObject) ObDereferenceObject(FileObject); + + /* Free the IRP */ + IoFreeIrp(Irp); +} + /* * FUNCTION: Performs the second stage of irp completion for read/write irps * @@ -884,59 +965,55 @@ * @param Thread * Thread to cancel requests for. */ - VOID STDCALL IoCancelThreadIo(PETHREAD Thread) { - PLIST_ENTRY IrpEntry; - PIRP Irp; - KIRQL OldIrql; - ULONG Retries = 3000; - LARGE_INTEGER Interval; + PLIST_ENTRY IrpEntry; + PIRP Irp; + KIRQL OldIrql; + ULONG Retries = 3000; + LARGE_INTEGER Interval; - OldIrql = KfRaiseIrql(APC_LEVEL); + /* Raise to APC to protect the IrpList */ + OldIrql = KfRaiseIrql(APC_LEVEL); - /* - * Start by cancelling all the IRPs in the current thread queue. - */ - - for (IrpEntry = Thread->IrpList.Flink; + /* Start by cancelling all the IRPs in the current thread queue. */ + for (IrpEntry = Thread->IrpList.Flink; IrpEntry != &Thread->IrpList; IrpEntry = IrpEntry->Flink) - { - Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); - IoCancelIrp(Irp); - } + { + /* Get the IRP */ + Irp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); + + /* Cancel it */ + IoCancelIrp(Irp); + } + + /* Wait 100 milliseconds */ + Interval.QuadPart = -1000000; - /* - * Wait till all the IRPs are completed or cancelled. - */ + /* Wait till all the IRPs are completed or cancelled. */ + while (!IsListEmpty(&Thread->IrpList)) + { + /* Now we can lower */ + KfLowerIrql(OldIrql); - while (!IsListEmpty(&Thread->IrpList)) - { - KfLowerIrql(OldIrql); + /* Wait a short while and then look if all our IRPs were completed. */ + KeDelayExecutionThread(KernelMode, FALSE, &Interval); - /* Wait a short while and then look if all our IRPs were completed. */ - Interval.QuadPart = -1000000; /* 100 milliseconds */ - KeDelayExecutionThread(KernelMode, FALSE, &Interval); + /* + * Don't stay here forever if some broken driver doesn't complete + * the IRP. + */ + if (Retries-- == 0) IopRemoveThreadIrp(); - /* - * Don't stay here forever if some broken driver doesn't complete - * the IRP. - */ - - if (Retries-- == 0) - { - /* FIXME: Handle this gracefully. */ - DPRINT1("Thread with dead IRPs!"); - ASSERT(FALSE); - } - - OldIrql = KfRaiseIrql(APC_LEVEL); - } - - KfLowerIrql(OldIrql); + /* Raise the IRQL Again */ + OldIrql = KfRaiseIrql(APC_LEVEL); + } + + /* We're done, lower the IRQL */ + KfLowerIrql(OldIrql); } #ifdef IoCallDriver @@ -1204,8 +1281,29 @@ } else { - /* The IRP just got cancelled... don't think this happens in ROS yet */ - DPRINT1("The IRP was cancelled. Go Bug Alex\n"); + /* The IRP just got cancelled... does a thread still own it? */ + if ((Thread = Irp->Tail.Overlay.Thread)) + { + /* Yes! There is still hope! */ + DPRINT("KMODE APC QUEUE\n"); + KeInitializeApc(&Irp->Tail.Apc, + &Thread->Tcb, + Irp->ApcEnvironment, + IopCompleteRequest, + NULL, + (PKNORMAL_ROUTINE) NULL, + KernelMode, + NULL); + KeInsertQueueApc(&Irp->Tail.Apc, + FileObject, + NULL, /* This is used for REPARSE stuff */ + PriorityBoost); + } + else + { + /* Nothing left for us to do, kill it */ + IopCleanupIrp(Irp, FileObject); + } } }

19 years, 6 months

[mf] 15793: german resource for property dialog

by mf＠svn.reactos.com

german resource for property dialog Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-06-04 20:37:15 UTC (rev 15792) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-06-04 20:48:51 UTC (rev 15793) @@ -198,7 +198,37 @@ PUSHBUTTON "Abbrechen",IDCANCEL,104,24,50,14 END +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Properties for %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,191,29,50,14 + LTEXT "&Dateiname:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Pfad:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Letzte &?nderung:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Version:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Copyright:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Gr÷?e:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Attribute",-1,7,79,158,46 + CONTROL "&Schreibgesch³tzt",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Versteckt",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "Sys&tem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Komprimiert",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versionsinformationen",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Anwenden der Schriftarteinstellung" _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-06-04 20:37:15 UTC (rev 15792) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-06-04 20:48:51 UTC (rev 15793) @@ -221,12 +221,12 @@ LTEXT "Size:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributes",-1,7,79,158,46 - GROUPBOX "&Version Information",-1,7,129,234,79 CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + GROUPBOX "&Version Information",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END

19 years, 6 months

[mf] 15792: sync winefile's header between WINE and ReactOS

by mf＠svn.reactos.com

sync winefile's header between WINE and ReactOS Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-06-04 20:17:19 UTC (rev 15791) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-06-04 20:37:15 UTC (rev 15792) @@ -18,6 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef __WINE__ +#include "config.h" +#include "wine/port.h" +#endif + #include "winefile.h" #include "resource.h" _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-06-04 20:17:19 UTC (rev 15791) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-06-04 20:37:15 UTC (rev 15792) @@ -1,5 +1,5 @@ /* - * Copyright 2000, 2003, 2004 Martin Fuchs + * Copyright 2000, 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,7 +35,7 @@ #include <commdlg.h> #ifdef UNICODE -#define _UNICODE +#define _UNICODE #include <wchar.h> #endif #include <tchar.h> @@ -44,7 +44,6 @@ #include <stdio.h> #include <ctype.h> #include <locale.h> -#include <time.h> #ifndef __WINE__ #include <malloc.h> /* for alloca() */ @@ -143,6 +142,8 @@ #endif } WINEFILE_GLOBALS; +extern WINEFILE_GLOBALS Globals; + #ifdef __WINE__ #ifdef UNICODE extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);

19 years, 6 months

[hbirr] 15791: Copied a missing file to the branch.

by hbirr＠svn.reactos.com

Copied a missing file to the branch. Added: branches/cache_manager_rewrite/reactos/subsys/system/winefile/pl.rc _____ Copied: branches/cache_manager_rewrite/reactos/subsys/system/winefile/pl.rc (from rev 15583, trunk/reactos/subsys/system/winefile/pl.rc)

19 years, 6 months

[hbirr] 15790: Copied a missing file to the branch.

by hbirr＠svn.reactos.com

Copied a missing file to the branch. Added: branches/cache_manager_rewrite/reactos/subsys/system/winefile/cs.rc _____ Copied: branches/cache_manager_rewrite/reactos/subsys/system/winefile/cs.rc (from rev 15583, trunk/reactos/subsys/system/winefile/cs.rc)

19 years, 6 months

← Newer
1
...
54
55
56
57
58
59
60
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005