Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[hbirr] 13815: Implemented 48(32)bit lba support.

by hbirr＠svn.reactos.com

Implemented 48(32)bit lba support. Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/atapi/atapi.h _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2005-03-04 04:57:42 UTC (rev 13814) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2005-03-04 09:43:34 UTC (rev 13815) @@ -1327,6 +1327,8 @@ DrvParms->TMSectorCountHi, DrvParms->TMSectorCountLo, (ULONG)((DrvParms->TMSectorCountHi << 16) + DrvParms->TMSectorCountLo)); + DPRINT("SupportedFeatures83: %x, EnabledFeatures86 %x\n", DrvParms->SupportedFeatures83, DrvParms->EnabledFeatures86); + DPRINT("Max48BitAddress: %I64d\n", *(PULONGLONG)DrvParms->Max48BitAddress); if (DrvParms->TMFieldsValid & 0x0004) { if ((DrvParms->UltraDmaModes >> 8) && (DrvParms->UltraDmaModes & 0xff)) @@ -1952,7 +1954,7 @@ { PREAD_CAPACITY_DATA CapacityData; PIDE_DRIVE_IDENTIFY DeviceParams; - ULONG LastSector; + LARGE_INTEGER LastSector; DPRINT("SCSIOP_READ_CAPACITY: TargetId: %lu\n", Srb->TargetId); CapacityData = (PREAD_CAPACITY_DATA)Srb->DataBuffer; @@ -1964,15 +1966,34 @@ /* Calculate last sector (big-endian). */ if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { - LastSector = (ULONG)((DeviceParams->TMSectorCountHi << 16) + - DeviceParams->TMSectorCountLo) - 1; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + ((PUSHORT)&LastSector)[0] = DeviceParams->Max48BitAddress[0]; + ((PUSHORT)&LastSector)[1] = DeviceParams->Max48BitAddress[1]; + ((PUSHORT)&LastSector)[2] = DeviceParams->Max48BitAddress[2]; + ((PUSHORT)&LastSector)[3] = DeviceParams->Max48BitAddress[3]; + LastSector.QuadPart -= 1; + + } + else + { + LastSector.u.HighPart = 0; + LastSector.u.LowPart = (ULONG)((DeviceParams->TMSectorCountHi << 16) + + DeviceParams->TMSectorCountLo)-1; + } } else { - LastSector = (ULONG)(DeviceParams->LogicalCyls * - DeviceParams->LogicalHeads * - DeviceParams->SectorsPerTrack)-1; + LastSector.u.HighPart = 0; + LastSector.u.LowPart = (ULONG)(DeviceParams->LogicalCyls * + DeviceParams->LogicalHeads * + DeviceParams->SectorsPerTrack)-1; } + if (LastSector.u.HighPart) + { + DPRINT1("Disk is too large for our implementation (%I64d sectors\n", LastSector.QuadPart); + KEBUGCHECK(0); + } CapacityData->LogicalBlockAddress = (((PUCHAR)&LastSector)[0] << 24) | (((PUCHAR)&LastSector)[1] << 16) | @@ -1996,10 +2017,10 @@ PIDE_DRIVE_IDENTIFY DeviceParams; ULONG StartingSector; ULONG SectorCount; - UCHAR CylinderHigh; - UCHAR CylinderLow; + UCHAR CylinderHigh[2]; + UCHAR CylinderLow[2]; UCHAR DrvHead; - UCHAR SectorNumber; + UCHAR SectorNumber[2]; UCHAR Command; ULONG Retries; UCHAR Status; @@ -2025,47 +2046,61 @@ Srb->DataTransferLength, SectorCount); - if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) { - SectorNumber = StartingSector & 0xff; - CylinderLow = (StartingSector >> 8) & 0xff; - CylinderHigh = (StartingSector >> 16) & 0xff; - DrvHead = ((StartingSector >> 24) & 0x0f) | - (Srb->TargetId ? IDE_DH_DRV1 : 0) | - IDE_DH_LBA; + SectorNumber[0] = StartingSector & 0xff; + CylinderLow[0] = (StartingSector >> 8) & 0xff; + CylinderHigh[0] = (StartingSector >> 16) & 0xff; + SectorNumber[1] = (StartingSector >> 24) & 0xff; + CylinderLow[1] = 0; + CylinderHigh[1] = 0; + DrvHead = (Srb->TargetId ? IDE_DH_DRV1 : 0) | IDE_DH_LBA; + + DPRINT("%s:BUS=%04x:DRV=%d:LBA48=1:BLK=%08d:SC=%02x:CM=%02x\n", + (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE", + DeviceExtension->CommandPortBase, + DrvHead & IDE_DH_DRV1 ? 1 : 0, + (SectorNumber[1] << 24) + + (CylinderHigh[0] << 16) + (CylinderLow[0] << 8) + DectorNumberLow[0], + SectorCount, + Command); } - else + else if (DeviceParams->Capabilities & IDE_DRID_LBA_SUPPORTED) { - SectorNumber = (StartingSector % DeviceParams->SectorsPerTrack) + 1; - StartingSector /= DeviceParams->SectorsPerTrack; - DrvHead = (StartingSector % DeviceParams->LogicalHeads) | - (Srb->TargetId ? IDE_DH_DRV1 : 0); - StartingSector /= DeviceParams->LogicalHeads; - CylinderLow = StartingSector & 0xff; - CylinderHigh = StartingSector >> 8; - } + SectorNumber[0] = StartingSector & 0xff; + CylinderLow[0] = (StartingSector >> 8) & 0xff; + CylinderHigh[0] = (StartingSector >> 16) & 0xff; + DrvHead = ((StartingSector >> 24) & 0x0f) | + (Srb->TargetId ? IDE_DH_DRV1 : 0) | + IDE_DH_LBA; - if (DrvHead & IDE_DH_LBA) - { DPRINT("%s:BUS=%04x:DRV=%d:LBA=1:BLK=%08d:SC=%02x:CM=%02x\n", (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE", DeviceExtension->CommandPortBase, DrvHead & IDE_DH_DRV1 ? 1 : 0, ((DrvHead & 0x0f) << 24) + - (CylinderHigh << 16) + (CylinderLow << 8) + SectorNumber, + (CylinderHigh[0] << 16) + (CylinderLow[0] << 8) + SectorNumber[0], SectorCount, Command); } else { + SectorNumber[0] = (StartingSector % DeviceParams->SectorsPerTrack) + 1; + StartingSector /= DeviceParams->SectorsPerTrack; + DrvHead = (StartingSector % DeviceParams->LogicalHeads) | + (Srb->TargetId ? IDE_DH_DRV1 : 0); + StartingSector /= DeviceParams->LogicalHeads; + CylinderLow[0] = StartingSector & 0xff; + CylinderHigh[0] = StartingSector >> 8; + DPRINT("%s:BUS=%04x:DRV=%d:LBA=0:CH=%02x:CL=%02x:HD=%01x:SN=%02x:SC=%02x :CM=%02x\n", (Srb->SrbFlags & SRB_FLAGS_DATA_IN) ? "READ" : "WRITE", DeviceExtension->CommandPortBase, DrvHead & IDE_DH_DRV1 ? 1 : 0, - CylinderHigh, - CylinderLow, + CylinderHigh[0], + CylinderLow[0], DrvHead & 0x0f, - SectorNumber, + SectorNumber[0], SectorCount, Command); } @@ -2119,11 +2154,21 @@ #endif /* Setup command parameters */ + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + IDEWritePrecomp(DeviceExtension->CommandPortBase, 0); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, SectorCount >> 8); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, SectorNumber[1]); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow[1]); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh[1]); + } + IDEWritePrecomp(DeviceExtension->CommandPortBase, 0); - IDEWriteSectorCount(DeviceExtension->CommandPortBase, SectorCount); - IDEWriteSectorNum(DeviceExtension->CommandPortBase, SectorNumber); - IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh); - IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow); + IDEWriteSectorCount(DeviceExtension->CommandPortBase, SectorCount & 0xff); + IDEWriteSectorNum(DeviceExtension->CommandPortBase, SectorNumber[0]); + IDEWriteCylinderLow(DeviceExtension->CommandPortBase, CylinderLow[0]); + IDEWriteCylinderHigh(DeviceExtension->CommandPortBase, CylinderHigh[0]); + IDEWriteDriveHead(DeviceExtension->CommandPortBase, IDE_DH_FIXED | DrvHead); #ifdef ENABLE_DMA @@ -2135,7 +2180,14 @@ if (DeviceExtension->UseDma) { Handler = AtapiDmaInterrupt; - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA : IDE_CMD_WRITE_DMA; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA_EXT : IDE_CMD_WRITE_DMA_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_DMA : IDE_CMD_WRITE_DMA; + } } else #endif @@ -2143,11 +2195,25 @@ Handler = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? AtapiReadInterrupt : AtapiWriteInterrupt; if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_MULTI_SECTOR_CMD) { - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE_EXT : IDE_CMD_WRITE_MULTIPLE_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_MULTIPLE : IDE_CMD_WRITE_MULTIPLE; + } } else { - Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + if (DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS) + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ_EXT : IDE_CMD_WRITE_EXT; + } + else + { + Command = Srb->SrbFlags & SRB_FLAGS_DATA_IN ? IDE_CMD_READ : IDE_CMD_WRITE; + } } } @@ -2274,7 +2340,9 @@ ScsiPortStallExecution(10); /* Issue command to drive */ - AtapiExecuteCommand(DeviceExtension, IDE_CMD_FLUSH_CACHE, AtapiNoDataInterrupt); + AtapiExecuteCommand(DeviceExtension, + DeviceExtension->DeviceFlags[Srb->TargetId] & DEVICE_48BIT_ADDRESS ? IDE_CMD_FLUSH_CACHE_EXT : IDE_CMD_FLUSH_CACHE, + AtapiNoDataInterrupt); /* Wait for controller ready */ for (Retries = 0; Retries < IDE_MAX_WRITE_RETRIES; Retries++) _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.h --- trunk/reactos/drivers/storage/atapi/atapi.h 2005-03-04 04:57:42 UTC (rev 13814) +++ trunk/reactos/drivers/storage/atapi/atapi.h 2005-03-04 09:43:34 UTC (rev 13815) @@ -64,21 +64,27 @@ #define IDE_REG_COMMAND 0x0007 /* IDE/ATA commands */ -#define IDE_CMD_RESET 0x08 -#define IDE_CMD_READ 0x20 -#define IDE_CMD_READ_RETRY 0x21 -#define IDE_CMD_WRITE 0x30 -#define IDE_CMD_WRITE_RETRY 0x31 -#define IDE_CMD_PACKET 0xA0 -#define IDE_CMD_READ_MULTIPLE 0xC4 -#define IDE_CMD_WRITE_MULTIPLE 0xC5 -#define IDE_CMD_READ_DMA 0xC8 -#define IDE_CMD_WRITE_DMA 0xCA -#define IDE_CMD_FLUSH_CACHE 0xE7 -#define IDE_CMD_FLUSH_CACHE_EXT 0xEA -#define IDE_CMD_IDENT_ATA_DRV 0xEC -#define IDE_CMD_IDENT_ATAPI_DRV 0xA1 -#define IDE_CMD_GET_MEDIA_STATUS 0xDA +#define IDE_CMD_RESET 0x08 +#define IDE_CMD_READ 0x20 +#define IDE_CMD_READ_ONCE 0x21 +#define IDE_CMD_READ_EXT 0x24 /* 48 bit */ +#define IDE_CMD_READ_DMA_EXT 0x25 /* 48 bit */ +#define IDE_CMD_READ_MULTIPLE_EXT 0x29 /* 48 bit */ +#define IDE_CMD_WRITE 0x30 +#define IDE_CMD_WRITE_ONCE 0x31 +#define IDE_CMD_WRITE_EXT 0x34 /* 48 bit */ +#define IDE_CMD_WRITE_DMA_EXT 0x35 /* 48 bit */ +#define IDE_CMD_WRITE_MULTIPLE_EXT 0x39 /* 48 bit */ +#define IDE_CMD_PACKET 0xA0 +#define IDE_CMD_READ_MULTIPLE 0xC4 +#define IDE_CMD_WRITE_MULTIPLE 0xC5 +#define IDE_CMD_READ_DMA 0xC8 +#define IDE_CMD_WRITE_DMA 0xCA +#define IDE_CMD_FLUSH_CACHE 0xE7 +#define IDE_CMD_FLUSH_CACHE_EXT 0xEA /* 48 bit */ +#define IDE_CMD_IDENT_ATA_DRV 0xEC +#define IDE_CMD_IDENT_ATAPI_DRV 0xA1 +#define IDE_CMD_GET_MEDIA_STATUS 0xDA // // Access macros for command registers

19 years, 9 months

[arty] 13814: Recommented vprintf out. Not strictly needed but I should figure out what to

by arty＠svn.reactos.com

Recommented vprintf out. Not strictly needed but I should figure out what to do here eventually. Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-03-04 04:15:46 UTC (rev 13813) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-03-04 04:57:42 UTC (rev 13814) @@ -134,7 +134,9 @@ va_list arg; int i; va_start(arg, fmt); +#ifndef __NTDRIVER__ i = vprintf ( fmt, arg ); +#endif va_end(arg); return i; }

19 years, 9 months

[ion] 13813: Fix queue item not being cleaned. Thank you Jim

by ion＠svn.reactos.com

Fix queue item not being cleaned. Thank you Jim Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c 2005-03-04 04:10:03 UTC (rev 13812) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c 2005-03-04 04:15:46 UTC (rev 13813) @@ -207,7 +207,7 @@ /* Remove the Entry */ RemoveEntryList(ListEntry); - Entry->Flink = NULL; + ListEntry->Flink = NULL; /* Nothing to wait on */ break;

19 years, 9 months

[ion] 13812: Fix queue item not being cleaned. Thank you Jim

by ion＠svn.reactos.com

Fix queue item not being cleaned. Thank you Jim Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/mutex.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/mutex.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/mutex.c 2005-03-04 02:09:43 UTC (rev 13811) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/mutex.c 2005-03-04 04:10:03 UTC (rev 13812) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/mutex.c _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c --- branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c 2005-03-04 02:09:43 UTC (rev 13811) +++ branches/alex_devel_branch/reactos/ntoskrnl/ke/queue.c 2005-03-04 04:10:03 UTC (rev 13812) @@ -207,6 +207,7 @@ /* Remove the Entry */ RemoveEntryList(ListEntry); + Entry->Flink = NULL; /* Nothing to wait on */ break;

19 years, 9 months

[arty] 13811: Warning cleanups.

by arty＠svn.reactos.com

Warning cleanups. - #define log to something else that isn't a gcc intrinsic - Move some definitions around in the bsd headers so that proper order is maintained between selinfo and socket and functions that take these as arguments. - Miscellaneous casts. Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/select.h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socketvar .h Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/select.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/select.h 2005-03-04 01:47:01 UTC (rev 13810) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/select.h 2005-03-04 02:09:43 UTC (rev 13811) @@ -40,19 +40,14 @@ struct listener_mgr; #endif -/* - * Used to maintain information about processes that wish to be - * notified when I/O becomes possible. - */ -struct selinfo { -#if defined(OSKIT) - struct listener_mgr *si_sel; -#endif /* OSKIT */ - pid_t si_pid; /* process to be notified */ - short si_flags; /* see below */ -}; -#define SI_COLL 0x0001 /* collision occurred */ +/* Included to suppress warnings about struct socket being declared in the + * parameter list. Selinfo reoredered with struct socket. */ +struct selinfo; +struct socket; + +#include <sys/socketvar.h> + #ifdef KERNEL struct proc; _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socketvar .h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socketvar .h 2005-03-04 01:47:01 UTC (rev 13810) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socketvar .h 2005-03-04 02:09:43 UTC (rev 13811) @@ -40,7 +40,26 @@ #include <sys/filedesc.h> /* for struct filedesc */ #include <sys/select.h> /* for struct selinfo */ +/* Warning suppression */ +struct sockaddr; + /* + * Used to maintain information about processes that wish to be + * notified when I/O becomes possible. + * + * Moved from sys/select.h and replaced with an #include. + */ +struct selinfo { +#if defined(OSKIT) + struct listener_mgr *si_sel; +#endif /* OSKIT */ + pid_t si_pid; /* process to be notified */ + short si_flags; /* see below */ +}; +#define SI_COLL 0x0001 /* collision occurred */ + + +/* * Kernel structure per socket. * Contains send and receive buffer queues, * handle on protocol and pointer to protocol _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-03-04 01:47:01 UTC (rev 13810) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h 2005-03-04 02:09:43 UTC (rev 13811) @@ -125,16 +125,16 @@ #include <oskitfreebsd.h> #include <oskitdebug.h> + int __cdecl vprintf(const char *, va_list); -static inline int log ( int blah, const char* fmt, ... ) +#define log bsd_log +static inline int bsd_log ( int blah, const char* fmt, ... ) { va_list arg; int i; va_start(arg, fmt); -#ifndef __NTDRIVER__ i = vprintf ( fmt, arg ); -#endif va_end(arg); return i; } _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c 2005-03-04 01:47:01 UTC (rev 13810) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c 2005-03-04 02:09:43 UTC (rev 13811) @@ -312,7 +312,7 @@ * Don't do pcblookup call here; return interface in plocal_sin * and exit to caller, that will do the lookup. */ - *plocal_sin = ia->ia_ifa.ifa_addr; + *plocal_sin = (struct sockaddr_in *)ia->ia_ifa.ifa_addr; OS_DbgPrint(OSK_MID_TRACE,("plocal sin %x\n", (*plocal_sin)->sin_addr.s_addr)); _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-03-04 01:47:01 UTC (rev 13810) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-03-04 02:09:43 UTC (rev 13811) @@ -365,7 +365,7 @@ */ so = head->so_q; - inp = so ? so->so_pcb : 0; + inp = so ? (struct inpcb *)so->so_pcb : NULL; if( inp ) { ((struct sockaddr_in *)AddrOut)->sin_addr.s_addr = inp->inp_faddr.s_addr; @@ -381,7 +381,7 @@ /*so->so_state &= ~SS_COMP;*/ - mnam.m_data = &sa; + mnam.m_data = (char *)&sa; mnam.m_len = sizeof(sa); (void) soaccept(so, &mnam); @@ -452,7 +452,7 @@ OSK_UINT RemoteAddress, OSK_UI16 RemotePort ) { struct socket *so = socket; - struct inpcb *inp = so->so_pcb; + struct inpcb *inp = (struct inpcb *)so->so_pcb; inp->inp_laddr.s_addr = LocalAddress; inp->inp_lport = LocalPort; inp->inp_faddr.s_addr = RemoteAddress; @@ -465,7 +465,7 @@ OSK_UINT *RemoteAddress, OSK_UI16 *RemotePort ) { struct socket *so = socket; - struct inpcb *inp = so ? so->so_pcb : 0; + struct inpcb *inp = so ? (struct inpcb *)so->so_pcb : NULL; if( inp ) { *LocalAddress = inp->inp_laddr.s_addr; *LocalPort = inp->inp_lport; @@ -589,7 +589,7 @@ if( ifaddr ) { - sin = (struct sockaddr *)&ifaddr->ifa_addr; + sin = (struct sockaddr_in *)&ifaddr->ifa_addr; OS_DbgPrint(OSK_MID_TRACE,("ifaddr->addr = %x\n", sin->sin_addr.s_addr)); _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c 2005-03-04 01:47:01 UTC (rev 13810) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/route.c 2005-03-04 02:09:43 UTC (rev 13811) @@ -314,8 +314,8 @@ register struct ifaddr *ifa; OS_DbgPrint(OSK_MID_TRACE,("Called: flags %\n", flags)); - OskitDumpBuffer( dst, sizeof(*dst) ); - OskitDumpBuffer( gateway, sizeof(*gateway) ); + OskitDumpBuffer( (void *)dst, sizeof(*dst) ); + OskitDumpBuffer( (void *)gateway, sizeof(*gateway) ); if ((flags & RTF_GATEWAY) == 0) { /*

19 years, 9 months

[arty] 13810: Some warning suppression. Read the <rant/>.

by arty＠svn.reactos.com

Some warning suppression. Read the <rant/>. Modified: trunk/reactos/lib/adns/Makefile Modified: trunk/reactos/lib/adns/adns_win32/adns_win32.h Modified: trunk/reactos/lib/adns/src/event.c _____ Modified: trunk/reactos/lib/adns/Makefile --- trunk/reactos/lib/adns/Makefile 2005-03-04 00:18:25 UTC (rev 13809) +++ trunk/reactos/lib/adns/Makefile 2005-03-04 01:47:01 UTC (rev 13810) @@ -8,7 +8,7 @@ TARGET_CFLAGS = \ -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - -Wstrict-prototypes -Wmissing-prototypes -Wall -DADNS_JGAA_WIN32 + -Wstrict-prototypes -Wmissing-prototypes -Wall -DADNS_JGAA_WIN32 -D__USE_W32API -D__REACTOS__ # require os code to explicitly request A/W version of structs/functions TARGET_CFLAGS += -Isrc -Iadns_win32 _____ Modified: trunk/reactos/lib/adns/adns_win32/adns_win32.h --- trunk/reactos/lib/adns/adns_win32/adns_win32.h 2005-03-04 00:18:25 UTC (rev 13809) +++ trunk/reactos/lib/adns/adns_win32/adns_win32.h 2005-03-04 01:47:01 UTC (rev 13810) @@ -157,5 +157,34 @@ #include "timercmp.h" /* arty added: mingw headers don't seem to have it */ +/* + * <rant> + * These fix the following warning in GCC: + * warning: passing arg 1 of `ntohs' with different width due to prototype + * + * Even if you declare an unsigned char or unsigned short variable and pass + * it to htons or ntohs, this warning will be generated. I believe this is + * a gcc bug. You can try to reproduce the bug like this: + * + * u_short foo(u_short bar) { + * return htons(bar); + * } + * + * Using the reactos compiler settings this generates the error. Unless I'm + * missing something, the active prototypes for htons and ntohs are: + * + * u_short PASCAL htons(u_short); + * u_short PASCAL ntohs(u_short); + * + * From winsock2.h. Since the function above has exactly the same signature + * as htons except for the required PASCAL (__stdcall) decoration, gcc is + * erroneously detecting a narrowed value. + * </rant> + */ +#ifdef __REACTOS__ +#define htons(x) ((((x)&0xff)<<8)|(((x)>>8)&0xff)) +#define ntohs(x) htons(x) +#endif + #endif /* ADNS_WIN32_H_INCLUDED */ _____ Modified: trunk/reactos/lib/adns/src/event.c --- trunk/reactos/lib/adns/src/event.c 2005-03-04 00:18:25 UTC (rev 13809) +++ trunk/reactos/lib/adns/src/event.c 2005-03-04 01:47:01 UTC (rev 13810) @@ -52,7 +52,7 @@ serv= ads->tcpserver; adns_socket_close(ads->tcpsocket); - ads->tcpsocket= -1; + ads->tcpsocket= INVALID_SOCKET; ads->tcprecv.used= ads->tcprecv_skip= ads->tcpsend.used= 0; }

19 years, 9 months

[ion] 13809: Remove kdbg profiling so that NT Native Kernel profiling can be used with it (to come before the merge), more cleanup and movning stuff around, fix building with kdbg (a bug is left with debug flag though), implement KeRemoveSystemDescriptorTable, merge with latest HEAD

by ion＠svn.reactos.com

Remove kdbg profiling so that NT Native Kernel profiling can be used with it (to come before the merge), more cleanup and movning stuff around, fix building with kdbg (a bug is left with debug flag though), implement KeRemoveSystemDescriptorTable, merge with latest HEAD Modified: branches/alex_devel_branch/reactos/config Modified: branches/alex_devel_branch/reactos/include/ddk/kefuncs.h Modified: branches/alex_devel_branch/reactos/lib/user32/misc/display.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/Makefile Deleted: branches/alex_devel_branch/reactos/ntoskrnl/dbg/profile.c Deleted: branches/alex_devel_branch/reactos/ntoskrnl/ex/btree.c Deleted: branches/alex_devel_branch/reactos/ntoskrnl/ex/hashtab.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/init.c Deleted: branches/alex_devel_branch/reactos/ntoskrnl/ex/stree.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/sysinfo.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/io/iomgr.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/kd/kdebug.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/gdt.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/idt.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/irq.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/ldt.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/i386/main.S Modified: branches/alex_devel_branch/reactos/ntoskrnl/ke/process.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ntoskrnl.def Modified: branches/alex_devel_branch/reactos/subsys/smss/initss.c Modified: branches/alex_devel_branch/reactos/subsys/smss/smapiexec.c Modified: branches/alex_devel_branch/reactos/subsys/smss/smss.h _____ Modified: branches/alex_devel_branch/reactos/config --- branches/alex_devel_branch/reactos/config 2005-03-03 21:26:27 UTC (rev 13808) +++ branches/alex_devel_branch/reactos/config 2005-03-04 00:18:25 UTC (rev 13809) @@ -7,12 +7,12 @@ # -# Which cpu should reactos optimze for +# Which cpu should reactos optimize for # example : i486, i586, pentium, pentium2, pentium3, pentium4 # athlon-xp, athlon-mp, k6-2, # -# see gcc manual for more cpu name and which cpu it can -# be optimze for. +# see gcc manual for more cpu names and which cpus it can +# be optimized for. # OARCH := pentium2 @@ -20,7 +20,7 @@ # # Whether to compile in the kernel debugger # -KDBG := 0 +KDBG := 1 # # Whether to compile for debugging _____ Modified: branches/alex_devel_branch/reactos/include/ddk/kefuncs.h --- branches/alex_devel_branch/reactos/include/ddk/kefuncs.h 2005-03-03 21:26:27 UTC (rev 13808) +++ branches/alex_devel_branch/reactos/include/ddk/kefuncs.h 2005-03-04 00:18:25 UTC (rev 13809) @@ -720,7 +720,7 @@ BOOLEAN STDCALL KeRemoveSystemServiceTable( - IN PUCHAR Number + IN ULONG TableIndex ); NTSTATUS _____ Modified: branches/alex_devel_branch/reactos/lib/user32/misc/display.c --- branches/alex_devel_branch/reactos/lib/user32/misc/display.c 2005-03-03 21:26:27 UTC (rev 13808) +++ branches/alex_devel_branch/reactos/lib/user32/misc/display.c 2005-03-04 00:18:25 UTC (rev 13809) @@ -200,22 +200,32 @@ { BOOL rc; UNICODE_STRING DeviceName; + LPDEVMODEW lpDevModeW; + lpDevModeW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DEVMODEW) + lpDevMode->dmDriverExtra); + if ( lpDevModeW == NULL ) + { + SetLastError ( ERROR_OUTOFMEMORY ); + return FALSE; + } + if ( !RtlCreateUnicodeStringFromAsciiz ( &DeviceName, (PCSZ)lpszDeviceName ) ) { SetLastError ( ERROR_OUTOFMEMORY ); return FALSE; } - /* - * NOTE: We don't need to convert between DEVMODEW and DEVMODEA because - * only dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmDisplayFlags and - * dmDisplayFrequency fields are set. - */ - rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, (LPDEVMODEW)lpDevMode, + lpDevModeW->dmSize = sizeof(DEVMODEW); + lpDevModeW->dmDriverExtra = 0; + + rc = NtUserEnumDisplaySettings ( &DeviceName, iModeNum, lpDevModeW, dwFlags ); + RosRtlDevModeW2A ( lpDevMode, lpDevModeW ); + RtlFreeUnicodeString ( &DeviceName ); + HeapFree ( GetProcessHeap(), 0, lpDevModeW ); return rc; } _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/Makefile --- branches/alex_devel_branch/reactos/ntoskrnl/Makefile 2005-03-03 21:26:27 UTC (rev 13808) +++ branches/alex_devel_branch/reactos/ntoskrnl/Makefile 2005-03-04 00:18:25 UTC (rev 13809) @@ -37,7 +37,7 @@ OBJECTS_KDBG := endif ifeq ($(DBG_OR_KDBG), 1) -OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o dbg/profile.o +OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o endif TARGET_ASFLAGS = -I./include @@ -58,9 +58,6 @@ TARGET_CFLAGS += -DDBG endif -# enable thread event pair features (NT4 only!) -# TARGET_CFLAGS += -D_ENABLE_THRDEVTPAIR - # # Javascript extension for kdb # @@ -238,24 +235,20 @@ # Executive Subsystem (Ex) OBJECTS_EX = \ - ex/btree.o \ ex/callback.o \ ex/error.o \ ex/event.o \ ex/evtpair.o \ ex/fmutex.o \ - ex/hashtab.o \ ex/init.o \ ex/interlck.o \ ex/list.o \ ex/lookas.o \ ex/mutant.o \ - ex/napi.o \ ex/power.o \ ex/profile.o \ ex/resource.o \ ex/rundown.o \ - ex/stree.o \ ex/sem.o \ ex/synch.o \ ex/sysinfo.o \ @@ -549,8 +542,6 @@ $(PATH_TO_TOP)/include/reactos/bugcodes.h \ $(DEP_OBJECTS) $(DEP_FILES) MSG00409.bin bugcodes.rc -ex/napi.o: ex/zw.S $(PATH_TO_TOP)/include/ntdll/napi.h - ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h $(TARGET_PCH): $(PATH_TO_TOP)/include/reactos/bugcodes.h _____ Deleted: branches/alex_devel_branch/reactos/ntoskrnl/dbg/profile.c --- branches/alex_devel_branch/reactos/ntoskrnl/dbg/profile.c 2005-03-03 21:26:27 UTC (rev 13808) +++ branches/alex_devel_branch/reactos/ntoskrnl/dbg/profile.c 2005-03-04 00:18:25 UTC (rev 13809) @@ -1,478 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/dbg/profile.c - * PURPOSE: Kernel profiling - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include "kdb.h" - -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -#define PROFILE_SESSION_LENGTH 30 /* Session length in seconds */ - -typedef struct _PROFILE_DATABASE_ENTRY -{ - ULONG_PTR Address; -} PROFILE_DATABASE_ENTRY, *PPROFILE_DATABASE_ENTRY; - -#define PDE_BLOCK_ENTRIES ((PAGE_SIZE - (sizeof(LIST_ENTRY) + sizeof(ULONG))) / sizeof(PROFILE_DATABASE_ENTRY)) - -typedef struct _PROFILE_DATABASE_BLOCK -{ - LIST_ENTRY ListEntry; - ULONG UsedEntries; - PROFILE_DATABASE_ENTRY Entries[PDE_BLOCK_ENTRIES]; -} PROFILE_DATABASE_BLOCK, *PPROFILE_DATABASE_BLOCK; - -typedef struct _PROFILE_DATABASE -{ - LIST_ENTRY ListHead; -} PROFILE_DATABASE, *PPROFILE_DATABASE; - -typedef struct _SAMPLE_GROUP_INFO -{ - ULONG_PTR Address; - ULONG Count; - CHAR Description[128]; - LIST_ENTRY ListEntry; -} SAMPLE_GROUP_INFO, *PSAMPLE_GROUP_INFO; - -static volatile BOOLEAN KdbProfilingInitialized = FALSE; -static volatile BOOLEAN KdbProfilingEnabled = FALSE; -static volatile BOOLEAN KdbProfilingSuspended = FALSE; -static PPROFILE_DATABASE KdbProfileDatabase = NULL; -static KDPC KdbProfilerCollectorDpc; -static HANDLE KdbProfilerThreadHandle; -static CLIENT_ID KdbProfilerThreadCid; -static HANDLE KdbProfilerLogFile; -static KTIMER KdbProfilerTimer; -static KMUTEX KdbProfilerLock; -static BOOLEAN KdbEnableProfiler = FALSE; - -VOID -KdbDeleteProfileDatabase(PPROFILE_DATABASE ProfileDatabase) -{ - PLIST_ENTRY current = NULL; - - current = RemoveHeadList(&ProfileDatabase->ListHead); - while (current != &ProfileDatabase->ListHead) - { - PPROFILE_DATABASE_BLOCK block = CONTAINING_RECORD( - current, PROFILE_DATABASE_BLOCK, ListEntry); - ExFreePool(block); - current = RemoveHeadList(&ProfileDatabase->ListHead); - } -} - -VOID -KdbAddEntryToProfileDatabase(PPROFILE_DATABASE ProfileDatabase, ULONG_PTR Address) -{ - PPROFILE_DATABASE_BLOCK block; - - if (IsListEmpty(&ProfileDatabase->ListHead)) - { - block = ExAllocatePool(NonPagedPool, sizeof(PROFILE_DATABASE_BLOCK)); - ASSERT(block); - block->UsedEntries = 0; - InsertTailList(&ProfileDatabase->ListHead, &block->ListEntry); - block->Entries[block->UsedEntries++].Address = Address; - return; - } - - block = CONTAINING_RECORD(ProfileDatabase->ListHead.Blink, PROFILE_DATABASE_BLOCK, ListEntry); - if (block->UsedEntries >= PDE_BLOCK_ENTRIES) - { - block = ExAllocatePool(NonPagedPool, sizeof(PROFILE_DATABASE_BLOCK)); - ASSERT(block); - block->UsedEntries = 0; - InsertTailList(&ProfileDatabase->ListHead, &block->ListEntry); - } - block->Entries[block->UsedEntries++].Address = Address; -} - -VOID INIT_FUNCTION -KdbInitProfiling() -{ - KdbEnableProfiler = TRUE; -} - -VOID INIT_FUNCTION -KdbInitProfiling2() -{ - if (KdbEnableProfiler) - { - KdbEnableProfiling(); - KdbProfilingInitialized = TRUE; - } -} - -VOID -KdbSuspendProfiling() -{ - KdbProfilingSuspended = TRUE; -} - -VOID -KdbResumeProfiling() -{ - KdbProfilingSuspended = FALSE; -} - -BOOLEAN -KdbProfilerGetSymbolInfo(PVOID address, OUT PCH NameBuffer) -{ - PLIST_ENTRY current_entry; - MODULE_TEXT_SECTION* current; - extern LIST_ENTRY ModuleTextListHead; - ULONG_PTR RelativeAddress; - NTSTATUS Status; - CHAR FileName[256]; - CHAR FunctionName[256]; - - current_entry = ModuleTextListHead.Flink; - - while (current_entry != &ModuleTextListHead && - current_entry != NULL) - { - current = - CONTAINING_RECORD(current_entry, MODULE_TEXT_SECTION, ListEntry); - - if (address >= (PVOID)current->Base && - address < (PVOID)(current->Base + current->Length)) - { - RelativeAddress = (ULONG_PTR) address - current->Base; - Status = KdbSymGetAddressInformation(current->RosSymInfo, - RelativeAddress, - NULL, - FileName, - FunctionName); - if (NT_SUCCESS(Status)) - { - sprintf(NameBuffer, "%s (%s)", FunctionName, FileName); - return(TRUE); - } - return(TRUE); - } - current_entry = current_entry->Flink; - } - return(FALSE); -} - -PLIST_ENTRY -KdbProfilerLargestSampleGroup(PLIST_ENTRY SamplesListHead) -{ - PLIST_ENTRY current; - PLIST_ENTRY largest; - ULONG count; - - count = 0; - largest = SamplesListHead->Flink; - current = SamplesListHead->Flink; - while (current != SamplesListHead) - { - PSAMPLE_GROUP_INFO sgi = CONTAINING_RECORD( - current, SAMPLE_GROUP_INFO, ListEntry); - - if (sgi->Count > count) - { - largest = current; - count = sgi->Count; - } - - current = current->Flink; - } - if (count == 0) - { - return NULL; - } - return largest; -} - -VOID -KdbProfilerWriteString(PCH String) -{ - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - ULONG Length; - - Length = strlen(String); - Status = NtWriteFile(KdbProfilerLogFile, - NULL, - NULL, - NULL, - &Iosb, - String, - Length, - NULL, - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtWriteFile() failed with status 0x%.08x\n", Status); - } -} - -NTSTATUS -KdbProfilerWriteSampleGroups(PLIST_ENTRY SamplesListHead) -{ - CHAR Buffer[256]; - PLIST_ENTRY current = NULL; - PLIST_ENTRY Largest; - - KdbProfilerWriteString("\r\n\r\n"); - KdbProfilerWriteString("Count Symbol\r\n"); - KdbProfilerWriteString("------------------------------------------------ --\r\n"); - - current = SamplesListHead->Flink; - while (current != SamplesListHead) - { - Largest = KdbProfilerLargestSampleGroup(SamplesListHead); - if (Largest != NULL) - { - PSAMPLE_GROUP_INFO sgi = CONTAINING_RECORD( - Largest, SAMPLE_GROUP_INFO, ListEntry); - - //DbgPrint("%.08lu %s\n", sgi->Count, sgi->Description); - - sprintf(Buffer, "%.08lu %s\r\n", sgi->Count, sgi->Description); - KdbProfilerWriteString(Buffer); - - RemoveEntryList(Largest); - ExFreePool(sgi); - } - else - { - break; - } - - current = SamplesListHead->Flink; - } - - return STATUS_SUCCESS; -} - -LONG STDCALL -KdbProfilerKeyCompare(IN PVOID Key1, - IN PVOID Key2) -{ - int value = strcmp(Key1, Key2); - - if (value == 0) - return 0; - - return (value < 0) ? -1 : 1; -} - - -NTSTATUS -KdbProfilerAnalyzeSamples() -{ - CHAR NameBuffer[512]; - ULONG KeyLength; - PLIST_ENTRY current = NULL; - HASH_TABLE Hashtable; - LIST_ENTRY SamplesListHead; - ULONG Index; - ULONG_PTR Address; - - if (!ExInitializeHashTable(&Hashtable, 12, KdbProfilerKeyCompare, TRUE)) - { - DPRINT1("ExInitializeHashTable() failed."); - KEBUGCHECK(0); - } - - InitializeListHead(&SamplesListHead); - - current = RemoveHeadList(&KdbProfileDatabase->ListHead); - while (current != &KdbProfileDatabase->ListHead) - { - PPROFILE_DATABASE_BLOCK block; - - block = CONTAINING_RECORD(current, PROFILE_DATABASE_BLOCK, ListEntry); - - for (Index = 0; Index < block->UsedEntries; Index++) - { - PSAMPLE_GROUP_INFO sgi; - Address = block->Entries[Index].Address; - if (KdbProfilerGetSymbolInfo((PVOID) Address, (PCH) &NameBuffer)) - { - } - else - { - sprintf(NameBuffer, "(0x%.08lx)", (ULONG) Address); - } - - KeyLength = strlen(NameBuffer); - if (!ExSearchHashTable(&Hashtable, (PVOID) NameBuffer, KeyLength, (PVOID *) &sgi)) - { - sgi = ExAllocatePool(NonPagedPool, sizeof(SAMPLE_GROUP_INFO)); - ASSERT(sgi); - sgi->Address = Address; - sgi->Count = 1; - strcpy(sgi->Description, NameBuffer); - InsertTailList(&SamplesListHead, &sgi->ListEntry); - ExInsertHashTable(&Hashtable, sgi->Description, KeyLength, (PVOID) sgi); - } - else - { - sgi->Count++; - } - } - - ExFreePool(block); - - current = RemoveHeadList(&KdbProfileDatabase->ListHead); - } - - KdbProfilerWriteSampleGroups(&SamplesListHead); - - ExDeleteHashTable(&Hashtable); - - KdbDeleteProfileDatabase(KdbProfileDatabase); - - return STATUS_SUCCESS; -} - -VOID STDCALL -KdbProfilerThreadMain(PVOID Context) -{ - for (;;) - { - KeWaitForSingleObject(&KdbProfilerTimer, Executive, KernelMode, TRUE, NULL); - - KeWaitForSingleObject(&KdbProfilerLock, Executive, KernelMode, FALSE, NULL); - - KdbSuspendProfiling(); - - KdbProfilerAnalyzeSamples(); - - KdbResumeProfiling(); - - KeReleaseMutex(&KdbProfilerLock, FALSE); - } -} - -VOID -KdbDisableProfiling() -{ - if (KdbProfilingEnabled == TRUE) - { - /* FIXME: Implement */ -#if 0 - KdbProfilingEnabled = FALSE; - /* Stop timer */ - /* Close file */ - if (KdbProfileDatabase != NULL) - { - KdbDeleteProfileDatabase(KdbProfileDatabase); - ExFreePool(KdbProfileDatabase); - KdbProfileDatabase = NULL; - } -#endif - } -} - -/* - * SystemArgument1 = EIP - */ -static VOID STDCALL -KdbProfilerCollectorDpcRoutine(PKDPC Dpc, PVOID DeferredContext, - PVOID SystemArgument1, PVOID SystemArgument2) -{ - ULONG_PTR address = (ULONG_PTR) SystemArgument1; - - KdbAddEntryToProfileDatabase(KdbProfileDatabase, address); -} - -VOID INIT_FUNCTION -KdbEnableProfiling() -{ - if (KdbProfilingEnabled == FALSE) - { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING FileName; - IO_STATUS_BLOCK Iosb; - LARGE_INTEGER DueTime; - - RtlInitUnicodeString(&FileName, L"\\SystemRoot\\profiler.log"); - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - 0, - NULL, - NULL); - - Status = NtCreateFile(&KdbProfilerLogFile, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - FILE_SUPERSEDE, - FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create profiler log file\n"); - return; - } - KeInitializeMutex(&KdbProfilerLock, 0); - - KdbProfileDatabase = ExAllocatePool(NonPagedPool, sizeof(PROFILE_DATABASE)); - ASSERT(KdbProfileDatabase); - InitializeListHead(&KdbProfileDatabase->ListHead); - KeInitializeDpc(&KdbProfilerCollectorDpc, KdbProfilerCollectorDpcRoutine, NULL); - - /* Initialize our periodic timer and its associated DPC object. When the timer - expires, the KdbProfilerSessionEndDpc deferred procedure call (DPC) is queued */ - KeInitializeTimerEx(&KdbProfilerTimer, SynchronizationTimer); - - Status = PsCreateSystemThread(&KdbProfilerThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &KdbProfilerThreadCid, - KdbProfilerThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create profiler thread\n"); - return; - } - - /* Start the periodic timer with an initial and periodic - relative expiration time of PROFILE_SESSION_LENGTH seconds */ - DueTime.QuadPart = -(LONGLONG) PROFILE_SESSION_LENGTH * 1000 * 10000; - KeSetTimerEx(&KdbProfilerTimer, DueTime, PROFILE_SESSION_LENGTH * 1000, NULL); - - KdbProfilingEnabled = TRUE; - } -} - -VOID -KdbProfileInterrupt(ULONG_PTR Address) -{ - ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); - - if (KdbProfilingInitialized != TRUE) - { - return; - } - - if ((KdbProfilingEnabled) && (!KdbProfilingSuspended)) - { - (BOOLEAN) KeInsertQueueDpc(&KdbProfilerCollectorDpc, (PVOID) Address, NULL); - } -} _____ Deleted: branches/alex_devel_branch/reactos/ntoskrnl/ex/btree.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/btree.c 2005-03-03 21:26:27 UTC (rev 13808) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/btree.c 2005-03-04 00:18:25 UTC (rev 13809) @@ -1,644 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/btree.c - * PURPOSE: Binary tree support - * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* DATA **********************************************************************/ - -typedef struct _BINARY_TREE_NODE -{ - struct _BINARY_TREE_NODE * Parent; - struct _BINARY_TREE_NODE * LeftChild; - struct _BINARY_TREE_NODE * RightChild; - PVOID Key; - PVOID Value; -} BINARY_TREE_NODE, *PBINARY_TREE_NODE; - -typedef struct _TRAVERSE_CONTEXT { - PTRAVERSE_ROUTINE Routine; - PVOID Context; -} TRAVERSE_CONTEXT, *PTRAVERSE_CONTEXT; - -/* FUNCTIONS ****************************************************************/ - -#define ExpBinaryTreeRootNode(Tree)(((PBINARY_TREE) (Tree))->RootNode) -#define ExpBinaryTreeIsExternalNode(Node)(((Node)->LeftChild == NULL) && ((Node)->RightChild == NULL)) -#define ExpBinaryTreeIsInternalNode(Node)(!ExpBinaryTreeIsExternalNode(Node)) -#define ExpBinaryTreeNodeKey(Node)((Node)->Key) -#define ExpBinaryTreeNodeValue(Node)((Node)->Value) -#define ExpBinaryTreeParentNode(Node)((Node)->Parent) -#define ExpBinaryTreeLeftChildNode(Node)((Node)->LeftChild) -#define ExpBinaryTreeRightChildNode(Node)((Node)->RightChild) -#define ExpBinaryTreeNodeEqual(Equality)((Equality) == 0) -#define ExpBinaryTreeNodeLess(Equality)((Equality) < 0) -#define ExpBinaryTreeNodeMore(Equality)((Equality) > 0) - - -/* - * Lock the binary tree - */ -inline VOID -ExpLockBinaryTree(PBINARY_TREE Tree, - PKIRQL OldIrql) -{ - if (Tree->UseNonPagedPool) - { - KeAcquireSpinLock(&Tree->Lock.NonPaged, OldIrql); - } - else - { - ExAcquireFastMutex(&Tree->Lock.Paged); - } -} - - -/* - * Unlock the binary tree - */ -inline VOID -ExpUnlockBinaryTree(PBINARY_TREE Tree, - PKIRQL OldIrql) -{ - if (Tree->UseNonPagedPool) - { - KeReleaseSpinLock(&Tree->Lock.NonPaged, *OldIrql); - } - else - { - ExReleaseFastMutex(&Tree->Lock.Paged); - } -} - - -/* - * Allocate resources for a new node and initialize it. - */ -inline PBINARY_TREE_NODE -ExpCreateBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Parent, - PVOID Value) -{ - PBINARY_TREE_NODE Node; - - if (Tree->UseNonPagedPool) - { - Node = (PBINARY_TREE_NODE) ExAllocateFromNPagedLookasideList(&Tree->List.NonPaged); - } - else - { - Node = (PBINARY_TREE_NODE) ExAllocateFromPagedLookasideList(&Tree->List.Paged); - } - - if (Node) - { - ExpBinaryTreeParentNode(Node) = Parent; - ExpBinaryTreeLeftChildNode(Node) = NULL; - ExpBinaryTreeRightChildNode(Node) = NULL; - ExpBinaryTreeNodeValue(Node) = Value; - } - - return Node; -} - - -/* - * Release resources for the node. - */ -inline VOID -ExpDestroyBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - if (Tree->UseNonPagedPool) - { - ExFreeToNPagedLookasideList(&Tree->List.NonPaged, Node); - } - else - { - ExFreeToPagedLookasideList(&Tree->List.Paged, Node); - } -} - - -/* - * Replaces a child node of a node with a new node. - * The lock for the tree must be acquired when this routine is called. - */ -inline VOID -ExpBinaryTreeReplaceChildNode(PBINARY_TREE_NODE Child, - PBINARY_TREE_NODE NewChild) -{ - if (ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Child)) == Child) - { - ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Child)) = NewChild; - } - else - { - ExpBinaryTreeRightChildNode(ExpBinaryTreeParentNode(Child)) = NewChild; - } -} - - -/* - * Returns the sibling node of a node. - * The lock for the tree must be acquired when this routine is called. - */ -inline PBINARY_TREE_NODE -ExpSiblingBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - if (Node == ExpBinaryTreeRootNode(Tree)) - { - return NULL; - } - else - { - if (ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Node)) == Node) - { - return ExpBinaryTreeRightChildNode(ExpBinaryTreeParentNode(Node)); - } - else - { - return ExpBinaryTreeLeftChildNode(ExpBinaryTreeParentNode(Node)); - } - } -} - - -/* - * Expands an external node to an internal node. - * The lock for the tree must be acquired when this routine is called. - */ -VOID -ExpExpandExternalBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - ExpBinaryTreeLeftChildNode(Node) = ExpCreateBinaryTreeNode(Tree, Node, NULL); - - if (!ExpBinaryTreeLeftChildNode(Node)) - { - /* FIXME: Throw exception */ - DbgPrint("ExpCreateBinaryTreeNode() failed\n"); - } - - ExpBinaryTreeRightChildNode(Node) = ExpCreateBinaryTreeNode(Tree, Node, NULL); - - if (!ExpBinaryTreeRightChildNode(Node)) - { - ExpDestroyBinaryTreeNode(Tree, ExpBinaryTreeLeftChildNode(Node)); - /* FIXME: Throw exception */ - DbgPrint("ExpCreateBinaryTreeNode() failed\n"); - } -} - - -/* - * Searches a tree for a node with the specified key. If a node with the - * specified key is not found, the external node where it should be is - * returned. - * The lock for the tree must be acquired when this routine is called. - */ -inline PBINARY_TREE_NODE -ExpSearchBinaryTree(PBINARY_TREE Tree, - PVOID Key, - PBINARY_TREE_NODE Node) -{ - LONG Equality; - - /* FIXME: Possibly do this iteratively due to the small kernel-mode stack */ - - if (ExpBinaryTreeIsExternalNode(Node)) - { - return Node; - } - - Equality = (*Tree->Compare)(Key, ExpBinaryTreeNodeKey(Node)); - - if (ExpBinaryTreeNodeEqual(Equality)) - { - return Node; - } - - if (ExpBinaryTreeNodeLess(Equality)) - { - return ExpSearchBinaryTree(Tree, Key, ExpBinaryTreeLeftChildNode(Node)); - } - -/* if (ExpBinaryTreeNodeMore(Equality)) */ - { - return ExpSearchBinaryTree(Tree, Key, ExpBinaryTreeRightChildNode(Node)); - } -} - - -/* - * Removes an external node and it's parent node from the tree. - * The lock for the tree must be acquired when this routine is called. - */ -VOID -ExpRemoveAboveExternalBinaryTreeNode(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - ASSERTMSG(ExpBinaryTreeIsExternalNode(Node), ("Node is not external")); - - if (Node == ExpBinaryTreeRootNode(Tree)) - { - return; - } - else - { - PBINARY_TREE_NODE GrandParent; - PBINARY_TREE_NODE NewChild; - - GrandParent = ExpBinaryTreeParentNode(ExpBinaryTreeParentNode(Node)); - NewChild = ExpSiblingBinaryTreeNode(Tree, Node); - - if (GrandParent != NULL) - { - ExpBinaryTreeReplaceChildNode(ExpBinaryTreeParentNode(Node), NewChild); - } - - ExpDestroyBinaryTreeNode(Tree, ExpBinaryTreeParentNode(Node)); - ExpDestroyBinaryTreeNode(Tree, Node); - } -} - - -/* - * Release resources used by nodes of a binary (sub)tree. - */ -VOID -ExpDeleteBinaryTree(PBINARY_TREE Tree, - PBINARY_TREE_NODE Node) -{ - /* FIXME: Possibly do this iteratively due to the small kernel-mode stack */ - - if (ExpBinaryTreeIsInternalNode(Node)) - { - ExpDeleteBinaryTree(Tree, ExpBinaryTreeLeftChildNode(Node)); - ExpDeleteBinaryTree(Tree, ExpBinaryTreeRightChildNode(Node)); - } - - ExpDestroyBinaryTreeNode(Tree, Node); -} - - -/* - * Traverse a binary tree using preorder traversal method. - * Returns FALSE, if the traversal was terminated prematurely or - * TRUE if the callback routine did not request that the traversal - * be terminated prematurely. - * The lock for the tree must be acquired when this routine is called. - */ -BOOLEAN -ExpTraverseBinaryTreePreorder(PTRAVERSE_CONTEXT Context, - PBINARY_TREE_NODE Node) -{ - if (ExpBinaryTreeIsInternalNode(Node)) - { - /* Call the traversal routine */ - if (!(*Context->Routine)(Context->Context, - ExpBinaryTreeNodeKey(Node), - ExpBinaryTreeNodeValue(Node))) - { - return FALSE; - } - - /* Traverse left subtree */ - ExpTraverseBinaryTreePreorder(Context, ExpBinaryTreeLeftChildNode(Node)); - - /* Traverse right subtree */ - ExpTraverseBinaryTreePreorder(Context, ExpBinaryTreeRightChildNode(Node)); - } - - return TRUE; -} - - -/* - * Traverse a binary tree using inorder traversal method. - * Returns FALSE, if the traversal was terminated prematurely or - * TRUE if the callback routine did not request that the traversal - * be terminated prematurely. - * The lock for the tree must be acquired when this routine is called. - */ -BOOLEAN -ExpTraverseBinaryTreeInorder(PTRAVERSE_CONTEXT Context, - PBINARY_TREE_NODE Node) -{ - if (ExpBinaryTreeIsInternalNode(Node)) - { - /* Traverse left subtree */ - ExpTraverseBinaryTreeInorder(Context, ExpBinaryTreeLeftChildNode(Node)); - - /* Call the traversal routine */ - if (!(*Context->Routine)(Context->Context, - ExpBinaryTreeNodeKey(Node), - ExpBinaryTreeNodeValue(Node))) - { - return FALSE; - } - - /* Traverse right subtree */ - ExpTraverseBinaryTreeInorder(Context, ExpBinaryTreeRightChildNode(Node)); - } - - return TRUE; -} - - -/* - * Traverse a binary tree using postorder traversal method. - * Returns FALSE, if the traversal was terminated prematurely or - * TRUE if the callback routine did not request that the traversal - * be terminated prematurely. - * The lock for the tree must be acquired when this routine is called. - */ -BOOLEAN -ExpTraverseBinaryTreePostorder(PTRAVERSE_CONTEXT Context, - PBINARY_TREE_NODE Node) -{ - if (ExpBinaryTreeIsInternalNode(Node)) - { [truncated at 1000 lines; 3008 more skipped]

19 years, 9 months

[chorns] 13808: Copy non-generated files to cd

by chorns＠svn.reactos.com

Copy non-generated files to cd Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/bootdata/bootdata.xml Added: branches/xmlbuildsystem/reactos/media/directory.xml Added: branches/xmlbuildsystem/reactos/media/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml Added: branches/xmlbuildsystem/reactos/media/nls/nls.xml _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-03-03 21:00:30 UTC (rev 13807) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-03-03 21:26:27 UTC (rev 13808) @@ -29,6 +29,9 @@ <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> @@ -41,6 +44,9 @@ <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> + <directory name="media"> + <xi:include href="media/directory.xml" /> + </directory> <directory name="ntoskrnl"> <xi:include href="ntoskrnl/ntoskrnl.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/bootdata/bootdata.xml --- branches/xmlbuildsystem/reactos/bootdata/bootdata.xml 2005-03-03 21:00:30 UTC (rev 13807) +++ branches/xmlbuildsystem/reactos/bootdata/bootdata.xml 2005-03-03 21:26:27 UTC (rev 13808) @@ -0,0 +1,8 @@ +<cdfile>autorun.inf</cdfile> +<cdfile>icon.ico</cdfile> +<cdfile>readme.txt</cdfile> +<cdfile base="reactos">hivecls.inf</cdfile> +<cdfile base="reactos">hivedef.inf</cdfile> +<cdfile base="reactos">hiveinst.inf</cdfile> +<cdfile base="reactos">hivesft.inf</cdfile> +<cdfile base="reactos">hivesys.inf</cdfile> _____ Added: branches/xmlbuildsystem/reactos/media/directory.xml --- branches/xmlbuildsystem/reactos/media/directory.xml 2005-03-03 21:00:30 UTC (rev 13807) +++ branches/xmlbuildsystem/reactos/media/directory.xml 2005-03-03 21:26:27 UTC (rev 13808) @@ -0,0 +1,6 @@ +<directory name="drivers"> + <xi:include href="drivers/directory.xml" /> +</directory> +<directory name="nls"> + <xi:include href="nls/nls.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/media/drivers/directory.xml --- branches/xmlbuildsystem/reactos/media/drivers/directory.xml 2005-03-03 21:00:30 UTC (rev 13807) +++ branches/xmlbuildsystem/reactos/media/drivers/directory.xml 2005-03-03 21:26:27 UTC (rev 13808) @@ -0,0 +1,3 @@ +<directory name="etc"> + <xi:include href="etc/etc.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml --- branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml 2005-03-03 21:00:30 UTC (rev 13807) +++ branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml 2005-03-03 21:26:27 UTC (rev 13808) @@ -0,0 +1 @@ +<cdfile base="reactos">services</cdfile> _____ Added: branches/xmlbuildsystem/reactos/media/nls/nls.xml --- branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-03-03 21:00:30 UTC (rev 13807) +++ branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-03-03 21:26:27 UTC (rev 13808) @@ -0,0 +1,3 @@ +<cdfile base="reactos">c_437.nls</cdfile> +<cdfile base="reactos">c_1252.nls</cdfile> +<cdfile base="reactos">l_intl.nls</cdfile>

19 years, 9 months

[chorns] 13807: Support for copying non-generated files to cd

by chorns＠svn.reactos.com

Support for copying non-generated files to cd Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Added: branches/xmlbuildsystem/reactos/tools/rbuild/cdfile.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/cdfiletest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/cdfile.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/linkerflagtest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -1970,9 +1970,25 @@ } } +void +MingwIsoModuleHandler::OutputCdfileCopyCommands ( const string bootcdDirectory, + const Module& module ) const +{ + for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) + { + const CDFile& cdfile = *module.project.cdfiles[i]; + string targetFilenameNoFixup = bootcdDirectory + SSEP + cdfile.base + SSEP + cdfile.nameoncd; + string targetFilename = PassThruCacheDirectory ( FixupTargetFilename ( targetFilenameNoFixup ) ); + fprintf ( fMakefile, + "\t${cp} %s %s\n", + cdfile.GetPath ().c_str (), + targetFilename.c_str () ); + } +} + string -MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string bootcdDirectory, + const Module& module ) const { string directories; for ( size_t i = 0; i < module.project.modules.size (); i++ ) @@ -1990,23 +2006,76 @@ } string -MingwIsoModuleHandler::GetCdFiles ( const string bootcdDirectory, - const Module& module ) const +MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string bootcdDirectory, + const Module& module ) const { - string files; + string directories; + for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) + { + const CDFile& cdfile = *module.project.cdfiles[i]; + string targetDirecctory = bootcdDirectory + SSEP + cdfile.base; + if ( directories.size () > 0 ) + directories += " "; + directories += FixupTargetFilename ( targetDirecctory ); + } + return directories; +} + +string +MingwIsoModuleHandler::GetCdDirectories ( const string bootcdDirectory, + const Module& module ) const +{ + string directories = GetBootstrapCdDirectories ( bootcdDirectory, + module ); + directories += " " + GetNonModuleCdDirectories ( bootcdDirectory, + module ); + return directories; +} + +string +MingwIsoModuleHandler::GetBootstrapCdFiles ( const string bootcdDirectory, + const Module& module ) const +{ + string cdfiles; for ( size_t i = 0; i < module.project.modules.size (); i++ ) { const Module& m = *module.project.modules[i]; if ( m.bootstrap != NULL ) { - if ( files.size () > 0 ) - files += " "; - files += FixupTargetFilename ( m.GetPath () ); + if ( cdfiles.size () > 0 ) + cdfiles += " "; + cdfiles += FixupTargetFilename ( m.GetPath () ); } } - return files; + return cdfiles; } +string +MingwIsoModuleHandler::GetNonModuleCdFiles ( const string bootcdDirectory, + const Module& module ) const +{ + string cdfiles; + for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) + { + const CDFile& cdfile = *module.project.cdfiles[i]; + if ( cdfiles.size () > 0 ) + cdfiles += " "; + cdfiles += NormalizeFilename ( cdfile.GetPath () ); + } + return cdfiles; +} + +string +MingwIsoModuleHandler::GetCdFiles ( const string bootcdDirectory, + const Module& module ) const +{ + string cdfiles = GetBootstrapCdFiles ( bootcdDirectory, + module ); + cdfiles += " " + GetNonModuleCdFiles ( bootcdDirectory, + module ); + return cdfiles; +} + void MingwIsoModuleHandler::GenerateIsoModuleTarget ( const Module& module ) { @@ -2044,6 +2113,8 @@ reactosInf.c_str () ); OutputBootstrapfileCopyCommands ( bootcdDirectory, module ); + OutputCdfileCopyCommands ( bootcdDirectory, + module ); fprintf ( fMakefile, "\t${cdmake} -v -m -b %s %s REACTOS ReactOS.iso\n", isoboot.c_str (), _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-03-03 21:00:30 UTC (rev 13807) @@ -291,12 +291,22 @@ virtual void Process ( const Module& module ); private: void GenerateIsoModuleTarget ( const Module& module ); + std::string GetBootstrapCdDirectories ( const std::string bootcdDirectory, + const Module& module ) const; + std::string GetNonModuleCdDirectories ( const std::string bootcdDirectory, + const Module& module ) const; std::string GetCdDirectories ( const std::string bootcdDirectory, const Module& module ) const; + std::string GetBootstrapCdFiles ( const std::string bootcdDirectory, + const Module& module ) const; + std::string GetNonModuleCdFiles ( const std::string bootcdDirectory, + const Module& module ) const; std::string GetCdFiles ( const std::string bootcdDirectory, const Module& module ) const; void OutputBootstrapfileCopyCommands ( const std::string bootcdDirectory, const Module& module ) const; + void OutputCdfileCopyCommands ( const std::string bootcdDirectory, + const Module& module ) const; }; #endif /* MINGW_MODULEHANDLER_H */ _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/cdfile.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/cdfile.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/cdfile.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -0,0 +1,42 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; + +CDFile::CDFile ( const Project& project_, + const XMLElement& cdfileNode, + const string& path ) + : project ( project_ ), + node ( cdfileNode ) +{ + const XMLAttribute* att = node.GetAttribute ( "base", false ); + if ( att != NULL ) + base = att->value; + else + base = ""; + + att = node.GetAttribute ( "nameoncd", false ); + if ( att != NULL ) + nameoncd = att->value; + else + nameoncd = node.value; + name = node.value; + this->path = path; +} + +CDFile::~CDFile () +{ +} + +string +CDFile::GetPath () const +{ + return path + SSEP + name; +} + +void +CDFile::ProcessXML() +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-03 21:00:30 UTC (rev 13807) @@ -22,6 +22,7 @@ $(RBUILD_BACKEND_BASE_SOURCES) \ automaticdependency.cpp \ bootstrap.cpp \ + cdfile.cpp \ compilerflag.cpp \ define.cpp \ exception.cpp \ @@ -61,7 +62,8 @@ tests$(SEP)linkerflagtest.cpp \ tests$(SEP)moduletest.cpp \ tests$(SEP)projecttest.cpp \ - tests$(SEP)sourcefiletest.cpp + tests$(SEP)sourcefiletest.cpp \ + tests$(SEP)cdfiletest.cpp RBUILD_TEST_SPECIAL_SOURCES = \ $(addprefix $(RBUILD_BASE)$(SEP), $(RBUILD_TESTS)) \ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -30,6 +30,8 @@ delete properties[i]; for ( i = 0; i < ifs.size (); i++ ) delete ifs[i]; + for ( i = 0; i < cdfiles.size (); i++ ) + delete cdfiles[i]; delete head; } @@ -216,26 +218,28 @@ makefile = att->value; size_t i; - for ( i = 0; i < node->subElements.size(); i++ ) + for ( i = 0; i < node->subElements.size (); i++ ) ProcessXMLSubElement ( *node->subElements[i], path ); - for ( i = 0; i < modules.size(); i++ ) - modules[i]->ProcessXML(); - for ( i = 0; i < includes.size(); i++ ) - includes[i]->ProcessXML(); - for ( i = 0; i < defines.size(); i++ ) - defines[i]->ProcessXML(); - for ( i = 0; i < linkerFlags.size(); i++ ) - linkerFlags[i]->ProcessXML(); + for ( i = 0; i < modules.size (); i++ ) + modules[i]->ProcessXML (); + for ( i = 0; i < includes.size (); i++ ) + includes[i]->ProcessXML (); + for ( i = 0; i < defines.size (); i++ ) + defines[i]->ProcessXML (); + for ( i = 0; i < linkerFlags.size (); i++ ) + linkerFlags[i]->ProcessXML (); for ( i = 0; i < properties.size(); i++ ) - properties[i]->ProcessXML(); - for ( i = 0; i < ifs.size(); i++ ) - ifs[i]->ProcessXML(); + properties[i]->ProcessXML (); + for ( i = 0; i < ifs.size (); i++ ) + ifs[i]->ProcessXML (); + for ( i = 0; i < cdfiles.size (); i++ ) + ifs[i]->ProcessXML (); } void Project::ProcessXMLSubElement ( const XMLElement& e, const string& path, - If* pIf /*= NULL*/ ) + If* pIf ) { bool subs_invalid = false; string subpath(path); @@ -255,6 +259,12 @@ modules.push_back ( module ); return; // defer processing until later } + else if ( e.name == "cdfile" ) + { + CDFile* cdfile = new CDFile ( *this, e, path ); + cdfiles.push_back ( cdfile ); + subs_invalid = true; + } else if ( e.name == "directory" ) { const XMLAttribute* att = e.GetAttribute ( "name", true ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-03-03 21:00:30 UTC (rev 13807) @@ -52,6 +52,7 @@ class Property; class AutomaticDependency; class Bootstrap; +class CDFile; class SourceFileTest; @@ -68,6 +69,7 @@ std::vector<LinkerFlag*> linkerFlags; std::vector<Property*> properties; std::vector<If*> ifs; + std::vector<CDFile*> cdfiles; Project ( const std::string& filename ); ~Project (); @@ -472,6 +474,25 @@ }; +class CDFile +{ +public: + const Project& project; + const XMLElement& node; + std::string name; + std::string base; + std::string nameoncd; + std::string path; + + CDFile ( const Project& project, + const XMLElement& bootstrapNode, + const std::string& path ); + ~CDFile (); + void ProcessXML(); + std::string GetPath () const; +}; + + extern std::string FixSeparator ( const std::string& s ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-03-03 21:00:30 UTC (rev 13807) @@ -161,6 +161,24 @@ None. +CDFile element +-------------- +A cdfile element specifies the name of a file that is to be put on the bootable CD. + +Syntax: + <cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile> + +Attributes: + base - Put file in this directory on the bootable CD. This attribute is optional. + nameoncd - Name of file on the bootable CD. This attribute is optional. + +Value: + Name of file. + +Elements: + None. + + Define element -------------- A define element specifies the name and (optionally) value of a define for the C/C++ compiler and resource compiler. @@ -211,7 +229,7 @@ None. Elements: - directory, file, if, property. + cdfile, directory, file, if, property. File element _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/test.h --- branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/test.h 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,6 +4,8 @@ #include "rbuild.h" #include "backend/mingw/mingw.h" +#define RBUILD_BASE "tools" SSEP "rbuild" SSEP + class BaseTest { public: @@ -117,4 +119,11 @@ }; + +class CDFileTest : public BaseTest +{ +public: + void Run (); +}; + #endif /* __TEST_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/alltests.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -178,6 +178,7 @@ tests.push_back(new IfTest()); tests.push_back(new FunctionTest()); tests.push_back(new SourceFileTest()); + tests.push_back(new CDFileTest()); } }; _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/cdfiletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -0,0 +1,22 @@ +#include "test.h" + +using std::string; + +void CDFileTest::Run() +{ + string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" ); + Project project( projectFilename ); + ARE_EQUAL ( 3, project.cdfiles.size () ); + + CDFile& cdfile1 = *project.cdfiles[0]; + ARE_EQUAL("dir1", cdfile1.base); + ARE_EQUAL("ReadMe1.txt", cdfile1.nameoncd); + + CDFile& cdfile2 = *project.cdfiles[1]; + ARE_EQUAL("dir2", cdfile2.base); + ARE_EQUAL("readme2.txt", cdfile2.nameoncd); + + CDFile& cdfile3 = *project.cdfiles[2]; + //ARE_EQUAL("", cdfile3.base); + ARE_EQUAL("readme3.txt", cdfile3.nameoncd); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy.xml 2005-03-03 21:00:30 UTC (rev 13807) @@ -1,11 +1,15 @@ <?xml version="1.0" ?> <project name="Project" makefile="Makefile"> - <directory name="tests"> - <directory name="data"> - <module name="module1" type="buildtool"> - <include base="module1">.</include> - <file>sourcefile1.c</file> - </module> + <directory name="tools"> + <directory name="rbuild"> + <directory name="tests"> + <directory name="data"> + <module name="module1" type="buildtool"> + <include base="module1">.</include> + <file>sourcefile1.c</file> + </module> + </directory> + </directory> </directory> </directory> </project> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/automaticdepende ncy_include.xml 2005-03-03 21:00:30 UTC (rev 13807) @@ -1,12 +1,16 @@ <?xml version="1.0" ?> <project name="Project" makefile="Makefile"> - <directory name="tests"> - <directory name="data"> - <module name="module1" type="buildtool"> - <include base="module1">.</include> - <include base="module1">sourcefile1</include> - <file>sourcefile_include.c</file> - </module> + <directory name="tools"> + <directory name="rbuild"> + <directory name="tests"> + <directory name="data"> + <module name="module1" type="buildtool"> + <include base="module1">.</include> + <include base="module1">sourcefile1</include> + <file>sourcefile_include.c</file> + </module> + </directory> + </directory> </directory> </directory> </project> _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/cdfile.xml --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/cdfile.xml 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/data/cdfile.xml 2005-03-03 21:00:30 UTC (rev 13807) @@ -0,0 +1,8 @@ +<?xml version="1.0" ?> +<project name="Project" makefile="Makefile"> + <directory name="dir1"> + <cdfile base="dir1" nameoncd="ReadMe1.txt">readme1.txt</cdfile> + <cdfile base="dir2">readme2.txt</cdfile> + <cdfile>readme3.txt</cdfile> + </directory> +</project> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/definetest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void DefineTest::Run() { - string projectFilename ( "tests/data/define.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/define.xml" ); Project project ( projectFilename ); ARE_EQUAL(1, project.defines.size()); Define& define1 = *project.defines[0]; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/iftest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void IfTest::Run() { - string projectFilename ( "tests/data/if.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/if.xml" ); Project project ( projectFilename ); ARE_EQUAL ( 1, project.modules.size () ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/includetest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void IncludeTest::Run() { - string projectFilename ( "tests/data/include.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/include.xml" ); Project project ( projectFilename ); ARE_EQUAL(1, project.includes.size()); Include& include1 = *project.includes[0]; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/invoketest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void InvokeTest::Run() { - string projectFilename ( "tests/data/invoke.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" ); Project project ( projectFilename ); ARE_EQUAL(1, project.modules.size()); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/linkerflagtest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/linkerflagtest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/linkerflagtest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void LinkerFlagTest::Run() { - string projectFilename ( "tests/data/linkerflag.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml" ); Project project ( projectFilename ); ARE_EQUAL(1, project.linkerFlags.size()); LinkerFlag& linkerFlag1 = *project.linkerFlags[0]; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/moduletest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void ModuleTest::Run() { - string projectFilename ( "tests/data/module.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/module.xml" ); Project project ( projectFilename ); ARE_EQUAL(2, project.modules.size()); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/projecttest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -4,7 +4,7 @@ void ProjectTest::Run() { - string projectFilename ( "tests/data/project.xml" ); + string projectFilename ( RBUILD_BASE "tests/data/project.xml" ); Project project( projectFilename ); ARE_EQUAL(2, project.modules.size()); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-03-03 06:18:18 UTC (rev 13806) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-03-03 21:00:30 UTC (rev 13807) @@ -34,26 +34,26 @@ void SourceFileTest::IncludeTest () { - const Project project ( "tests" SSEP "data" SSEP "automaticdependency_include.xml" ); + const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" ); AutomaticDependency automaticDependency ( project ); automaticDependency.Process (); ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); - const SourceFile* include = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile_include.h" ); + const SourceFile* include = automaticDependency.RetrieveFromCache ( "." SSEP RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile_include.h" ); IS_NOT_NULL( include ); - const SourceFile* includenext = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" ); + const SourceFile* includenext = automaticDependency.RetrieveFromCache ( "." SSEP RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" ); IS_NOT_NULL( includenext ); } void SourceFileTest::FullParseTest () { - const Project project ( "tests" SSEP "data" SSEP "automaticdependency.xml" ); + const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" ); AutomaticDependency automaticDependency ( project ); automaticDependency.Process (); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); - const SourceFile* header1 = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); + const SourceFile* header1 = automaticDependency.RetrieveFromCache ( "." SSEP RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1_header1.h" ); IS_NOT_NULL( header1 ); - const SourceFile* recurse = automaticDependency.RetrieveFromCache ( "." SSEP "tests" SSEP "data" SSEP "sourcefile1_recurse.h" ); + const SourceFile* recurse = automaticDependency.RetrieveFromCache ( "." SSEP RBUILD_BASE"tests" SSEP "data" SSEP "sourcefile1_recurse.h" ); IS_NOT_NULL( recurse ); IS_TRUE( IsParentOf ( header1, recurse ) );

19 years, 9 months

[ion] 13806: Move Win32K callbacks to Win32K where they belong. Registrationis done with Ps function just like on XP+. Also allows non-win32k stuff to manage their own desktops and Window stations

by ion＠svn.reactos.com

Move Win32K callbacks to Win32K where they belong. Registrationis done with Ps function just like on XP+. Also allows non-win32k stuff to manage their own desktops and Window stations Modified: branches/alex_devel_branch/reactos/include/ddk/defines.h Modified: branches/alex_devel_branch/reactos/include/ddk/psfuncs.h Modified: branches/alex_devel_branch/reactos/include/ddk/pstypes.h Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/win32k.c Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/win32.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/include/desktop.h Modified: branches/alex_devel_branch/reactos/subsys/win32k/include/winsta.h Modified: branches/alex_devel_branch/reactos/subsys/win32k/main/dllmain.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/desktop.c Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/winsta.c _____ Modified: branches/alex_devel_branch/reactos/include/ddk/defines.h --- branches/alex_devel_branch/reactos/include/ddk/defines.h 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/include/ddk/defines.h 2005-03-03 06:18:18 UTC (rev 13806) @@ -77,6 +77,27 @@ #define HIGH_LEVEL 31 // Highest interrupt level #define SYNCH_LEVEL (IPI_LEVEL-1) // synchronization level +#define WINSTA_ACCESSCLIPBOARD (0x4L) +#define WINSTA_ACCESSGLOBALATOMS (0x20L) +#define WINSTA_CREATEDESKTOP (0x8L) +#define WINSTA_ENUMDESKTOPS (0x1L) +#define WINSTA_ENUMERATE (0x100L) +#define WINSTA_EXITWINDOWS (0x40L) +#define WINSTA_READATTRIBUTES (0x2L) +#define WINSTA_READSCREEN (0x200L) +#define WINSTA_WRITEATTRIBUTES (0x10L) + +#define DF_ALLOWOTHERACCOUNTHOOK (0x1L) +#define DESKTOP_CREATEMENU (0x4L) +#define DESKTOP_CREATEWINDOW (0x2L) +#define DESKTOP_ENUMERATE (0x40L) +#define DESKTOP_HOOKCONTROL (0x8L) +#define DESKTOP_JOURNALPLAYBACK (0x20L) +#define DESKTOP_JOURNALRECORD (0x10L) +#define DESKTOP_READOBJECTS (0x1L) +#define DESKTOP_SWITCHDESKTOP (0x100L) +#define DESKTOP_WRITEOBJECTS (0x80L) + #endif /* __ASM__ */ /* Values returned by KeGetPreviousMode() */ _____ Modified: branches/alex_devel_branch/reactos/include/ddk/psfuncs.h --- branches/alex_devel_branch/reactos/include/ddk/psfuncs.h 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/include/ddk/psfuncs.h 2005-03-03 06:18:18 UTC (rev 13806) @@ -360,7 +360,7 @@ VOID STDCALL STDCALL PsEstablishWin32Callouts (PW32_PROCESS_CALLBACK W32ProcessCallback, PW32_THREAD_CALLBACK W32ThreadCallback, - PVOID Param3, + PW32_OBJECT_CALLBACK W32ObjectCallback, PVOID Param4, ULONG W32ThreadSize, ULONG W32ProcessSize); _____ Modified: branches/alex_devel_branch/reactos/include/ddk/pstypes.h --- branches/alex_devel_branch/reactos/include/ddk/pstypes.h 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/include/ddk/pstypes.h 2005-03-03 06:18:18 UTC (rev 13806) @@ -66,7 +66,41 @@ typedef NTSTATUS STDCALL_FUNC (*PW32_THREAD_CALLBACK)(struct _ETHREAD *Thread, BOOLEAN Create); + +/* + * Callbacks used for Win32 objects... this define won't be needed after the Object Manager + * rewrite -- Alex + */ +typedef NTSTATUS STDCALL_FUNC +(*OBJECT_CREATE_ROUTINE)(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); +typedef NTSTATUS STDCALL_FUNC +(*OBJECT_PARSE_ROUTINE)(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); + +typedef VOID STDCALL_FUNC +(*OBJECT_DELETE_ROUTINE)(PVOID DeletedObject); + +typedef PVOID STDCALL_FUNC +(*OBJECT_FIND_ROUTINE)(PVOID WinStaObject, + PWSTR Name, + ULONG Attributes); + +typedef struct _W32_OBJECT_CALLBACK { + OBJECT_CREATE_ROUTINE WinStaCreate; + OBJECT_PARSE_ROUTINE WinStaParse; + OBJECT_DELETE_ROUTINE WinStaDelete; + OBJECT_FIND_ROUTINE WinStaFind; + OBJECT_CREATE_ROUTINE DesktopCreate; + OBJECT_DELETE_ROUTINE DesktopDelete; +} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; + typedef struct _STACK_INFORMATION { PVOID BaseAddress; _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ex/win32k.c --- branches/alex_devel_branch/reactos/ntoskrnl/ex/win32k.c 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/ntoskrnl/ex/win32k.c 2005-03-03 06:18:18 UTC (rev 13806) @@ -1,11 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ex/win32k.c * PURPOSE: Executive Win32 subsystem support * - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Moved callbacks to win32k and cleanup. + * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include <ntoskrnl.h> @@ -14,320 +14,160 @@ /* DATA **********************************************************************/ -#define WINSTA_ACCESSCLIPBOARD (0x4L) -#define WINSTA_ACCESSGLOBALATOMS (0x20L) -#define WINSTA_CREATEDESKTOP (0x8L) -#define WINSTA_ENUMDESKTOPS (0x1L) -#define WINSTA_ENUMERATE (0x100L) -#define WINSTA_EXITWINDOWS (0x40L) -#define WINSTA_READATTRIBUTES (0x2L) -#define WINSTA_READSCREEN (0x200L) -#define WINSTA_WRITEATTRIBUTES (0x10L) - -#define DF_ALLOWOTHERACCOUNTHOOK (0x1L) -#define DESKTOP_CREATEMENU (0x4L) -#define DESKTOP_CREATEWINDOW (0x2L) -#define DESKTOP_ENUMERATE (0x40L) -#define DESKTOP_HOOKCONTROL (0x8L) -#define DESKTOP_JOURNALPLAYBACK (0x20L) -#define DESKTOP_JOURNALRECORD (0x10L) -#define DESKTOP_READOBJECTS (0x1L) -#define DESKTOP_SWITCHDESKTOP (0x100L) -#define DESKTOP_WRITEOBJECTS (0x80L) - POBJECT_TYPE EXPORTED ExWindowStationObjectType = NULL; POBJECT_TYPE EXPORTED ExDesktopObjectType = NULL; static GENERIC_MAPPING ExpWindowStationMapping = { - STANDARD_RIGHTS_READ | WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_READATTRIBUTES | WINSTA_READSCREEN, - STANDARD_RIGHTS_WRITE | WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | WINSTA_WRITEATTRIBUTES, - STANDARD_RIGHTS_EXECUTE | WINSTA_ACCESSGLOBALATOMS | WINSTA_EXITWINDOWS, - STANDARD_RIGHTS_REQUIRED | WINSTA_ACCESSCLIPBOARD | WINSTA_ACCESSGLOBALATOMS | WINSTA_CREATEDESKTOP | - WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_EXITWINDOWS | - WINSTA_READATTRIBUTES | WINSTA_READSCREEN | WINSTA_WRITEATTRIBUTES + + STANDARD_RIGHTS_READ | WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_READATTRIBUTES | WINSTA_READSCREEN, + STANDARD_RIGHTS_WRITE | WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | WINSTA_WRITEATTRIBUTES, + STANDARD_RIGHTS_EXECUTE | WINSTA_ACCESSGLOBALATOMS | WINSTA_EXITWINDOWS, + STANDARD_RIGHTS_REQUIRED | WINSTA_ACCESSCLIPBOARD | WINSTA_ACCESSGLOBALATOMS | WINSTA_CREATEDESKTOP | + WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_EXITWINDOWS | + WINSTA_READATTRIBUTES | WINSTA_READSCREEN | WINSTA_WRITEATTRIBUTES }; static GENERIC_MAPPING ExpDesktopMapping = { - STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | DESKTOP_READOBJECTS, - STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_HOOKCONTROL | - DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | DESKTOP_WRITEOBJECTS, - STANDARD_RIGHTS_EXECUTE | DESKTOP_SWITCHDESKTOP, - STANDARD_RIGHTS_REQUIRED | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_ENUMERATE | - DESKTOP_HOOKCONTROL | DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | - DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | DESKTOP_WRITEOBJECTS + + STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | DESKTOP_READOBJECTS, + STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_HOOKCONTROL | + DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | DESKTOP_WRITEOBJECTS, + STANDARD_RIGHTS_EXECUTE | DESKTOP_SWITCHDESKTOP, + STANDARD_RIGHTS_REQUIRED | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_ENUMERATE | + DESKTOP_HOOKCONTROL | DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | + DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | DESKTOP_WRITEOBJECTS }; +OBJECT_CREATE_ROUTINE ExpWindowStationObjectCreate = NULL; +OBJECT_PARSE_ROUTINE ExpWindowStationObjectParse = NULL; +OBJECT_DELETE_ROUTINE ExpWindowStationObjectDelete = NULL; +OBJECT_FIND_ROUTINE ExpWindowStationObjectFind = NULL; +OBJECT_CREATE_ROUTINE ExpDesktopObjectCreate = NULL; +OBJECT_DELETE_ROUTINE ExpDesktopObjectDelete = NULL; + /* FUNCTIONS ****************************************************************/ - -NTSTATUS STDCALL +NTSTATUS +STDCALL ExpWinStaObjectCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes) + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes) { - PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)ObjectBody; - UNICODE_STRING UnicodeString; - NTSTATUS Status; - - if (RemainingPath == NULL) - { - return STATUS_SUCCESS; - } - - if (wcschr((RemainingPath + 1), '\\') != NULL) - { - return STATUS_UNSUCCESSFUL; - } - - RtlInitUnicodeString(&UnicodeString, (RemainingPath + 1)); - - DPRINT("Creating window station (0x%X) Name (%wZ)\n", WinSta, &UnicodeString); - - Status = RtlpCreateUnicodeString(&WinSta->Name, UnicodeString.Buffer, NonPagedPool); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - KeInitializeSpinLock(&WinSta->Lock); - - InitializeListHead(&WinSta->DesktopListHead); - -#if 1 - WinSta->AtomTable = NULL; -#endif - - Status = RtlCreateAtomTable(37, &WinSta->AtomTable); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&WinSta->Name); - return Status; - } - - WinSta->SystemMenuTemplate = (HANDLE)0; - - DPRINT("Window station successfully created. Name (%wZ)\n", &WinSta->Name); - - return STATUS_SUCCESS; + /* Call the Registered Callback */ + return ExpWindowStationObjectCreate(ObjectBody, + Parent, + RemainingPath, + ObjectAttributes); } -VOID STDCALL +VOID +STDCALL ExpWinStaObjectDelete(PVOID DeletedObject) { - PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeletedObject; - - DPRINT("Deleting window station (0x%X)\n", WinSta); - - RtlDestroyAtomTable(WinSta->AtomTable); - - RtlFreeUnicodeString(&WinSta->Name); + /* Call the Registered Callback */ + ExpWindowStationObjectDelete(DeletedObject); } PVOID +STDCALL ExpWinStaObjectFind(PWINSTATION_OBJECT WinStaObject, - PWSTR Name, - ULONG Attributes) + PWSTR Name, + ULONG Attributes) { - PLIST_ENTRY Current; - PDESKTOP_OBJECT CurrentObject; - - DPRINT("WinStaObject (0x%X) Name (%wS)\n", WinStaObject, Name); - - if (Name[0] == 0) - { - return NULL; - } - - Current = WinStaObject->DesktopListHead.Flink; - while (Current != &WinStaObject->DesktopListHead) - { - CurrentObject = CONTAINING_RECORD(Current, DESKTOP_OBJECT, ListEntry); - DPRINT("Scanning %wZ for %wS\n", &CurrentObject->Name, Name); - if (Attributes & OBJ_CASE_INSENSITIVE) - { - if (_wcsicmp(CurrentObject->Name.Buffer, Name) == 0) - { - DPRINT("Found desktop at (0x%X)\n", CurrentObject); - return CurrentObject; - } - } - else - { - if (wcscmp(CurrentObject->Name.Buffer, Name) == 0) - { - DPRINT("Found desktop at (0x%X)\n", CurrentObject); - return CurrentObject; - } - } - Current = Current->Flink; - } - - DPRINT("Returning NULL\n"); - - return NULL; + /* Call the Registered Callback */ + return ExpWindowStationObjectFind(WinStaObject, + Name, + Attributes); } -NTSTATUS STDCALL +NTSTATUS +STDCALL ExpWinStaObjectParse(PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes) + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes) { - PVOID FoundObject; - NTSTATUS Status; - PWSTR End; - - DPRINT("Object (0x%X) Path (0x%X) *Path (%wS)\n", Object, Path, *Path); - - *NextObject = NULL; - - if ((Path == NULL) || ((*Path) == NULL)) - { - return STATUS_SUCCESS; - } - - End = wcschr((*Path) + 1, '\\'); - if (End != NULL) - { - DPRINT("Name contains illegal characters\n"); - return STATUS_UNSUCCESSFUL; - } - - FoundObject = ExpWinStaObjectFind(Object, (*Path) + 1, Attributes); - if (FoundObject == NULL) - { - DPRINT("Name was not found\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = ObReferenceObjectByPointer( - FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); - - *NextObject = FoundObject; - *Path = NULL; - - return Status; + /* Call the Registered Callback */ + return ExpWindowStationObjectParse(Object, + NextObject, + FullPath, + Path, + Attributes); } -NTSTATUS STDCALL -ExpDesktopObjectCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes) +NTSTATUS +STDCALL +ExpDesktopCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes) { - PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)ObjectBody; - UNICODE_STRING UnicodeString; - - if (RemainingPath == NULL) - { - return STATUS_SUCCESS; - } - - if (wcschr((RemainingPath + 1), '\\') != NULL) - { - return STATUS_UNSUCCESSFUL; - } - - RtlInitUnicodeString(&UnicodeString, (RemainingPath + 1)); - - DPRINT("Creating desktop (0x%X) Name (%wZ)\n", Desktop, &UnicodeString); - - KeInitializeSpinLock(&Desktop->Lock); - - Desktop->WindowStation = (PWINSTATION_OBJECT)Parent; - - /* Put the desktop on the window station's list of associcated desktops */ - ExInterlockedInsertTailList( - &Desktop->WindowStation->DesktopListHead, - &Desktop->ListEntry, - &Desktop->WindowStation->Lock); - - return RtlpCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer, NonPagedPool); + /* Call the Registered Callback */ + return ExpDesktopObjectCreate(ObjectBody, + Parent, + RemainingPath, + ObjectAttributes); } -VOID STDCALL -ExpDesktopObjectDelete(PVOID DeletedObject) +VOID +STDCALL +ExpDesktopDelete(PVOID DeletedObject) { - PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)DeletedObject; - KIRQL OldIrql; - - DPRINT("Deleting desktop (0x%X)\n", Desktop); - - /* Remove the desktop from the window station's list of associcated desktops */ - KeAcquireSpinLock(&Desktop->WindowStation->Lock, &OldIrql); - RemoveEntryList(&Desktop->ListEntry); - KeReleaseSpinLock(&Desktop->WindowStation->Lock, OldIrql); - - RtlFreeUnicodeString(&Desktop->Name); + /* Call the Registered Callback */ + ExpDesktopObjectDelete(DeletedObject); } -VOID INIT_FUNCTION +VOID +INIT_FUNCTION ExpWin32kInit(VOID) { - /* Create window station object type */ - ExWindowStationObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - if (ExWindowStationObjectType == NULL) - { - CPRINT("Could not create window station object type\n"); - KEBUGCHECK(0); - } + /* Create window station object type */ + ExWindowStationObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + ExWindowStationObjectType->Tag = TAG('W', 'I', 'N', 'S'); + ExWindowStationObjectType->TotalObjects = 0; + ExWindowStationObjectType->TotalHandles = 0; + ExWindowStationObjectType->PeakObjects = 0; + ExWindowStationObjectType->PeakHandles = 0; + ExWindowStationObjectType->PagedPoolCharge = 0; + ExWindowStationObjectType->NonpagedPoolCharge = sizeof(WINSTATION_OBJECT); + ExWindowStationObjectType->Mapping = &ExpWindowStationMapping; + ExWindowStationObjectType->Dump = NULL; + ExWindowStationObjectType->Open = NULL; + ExWindowStationObjectType->Close = NULL; + ExWindowStationObjectType->Delete = ExpWinStaObjectDelete; + ExWindowStationObjectType->Parse = ExpWinStaObjectParse; + ExWindowStationObjectType->Security = NULL; + ExWindowStationObjectType->QueryName = NULL; + ExWindowStationObjectType->OkayToClose = NULL; + ExWindowStationObjectType->Create = ExpWinStaObjectCreate; + ExWindowStationObjectType->DuplicationNotify = NULL; + RtlInitUnicodeString(&ExWindowStationObjectType->TypeName, L"WindowStation"); + ObpCreateTypeObject(ExWindowStationObjectType); - ExWindowStationObjectType->Tag = TAG('W', 'I', 'N', 'S'); - ExWindowStationObjectType->TotalObjects = 0; - ExWindowStationObjectType->TotalHandles = 0; - ExWindowStationObjectType->PeakObjects = 0; - ExWindowStationObjectType->PeakHandles = 0; - ExWindowStationObjectType->PagedPoolCharge = 0; - ExWindowStationObjectType->NonpagedPoolCharge = sizeof(WINSTATION_OBJECT); - ExWindowStationObjectType->Mapping = &ExpWindowStationMapping; - ExWindowStationObjectType->Dump = NULL; - ExWindowStationObjectType->Open = NULL; - ExWindowStationObjectType->Close = NULL; - ExWindowStationObjectType->Delete = ExpWinStaObjectDelete; - ExWindowStationObjectType->Parse = ExpWinStaObjectParse; - ExWindowStationObjectType->Security = NULL; - ExWindowStationObjectType->QueryName = NULL; - ExWindowStationObjectType->OkayToClose = NULL; - ExWindowStationObjectType->Create = ExpWinStaObjectCreate; - ExWindowStationObjectType->DuplicationNotify = NULL; - RtlInitUnicodeString(&ExWindowStationObjectType->TypeName, L"WindowStation"); - - ObpCreateTypeObject(ExWindowStationObjectType); - - /* Create desktop object type */ - ExDesktopObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - if (ExDesktopObjectType == NULL) - { - CPRINT("Could not create desktop object type\n"); - KEBUGCHECK(0); - } - - ExDesktopObjectType->Tag = TAG('D', 'E', 'S', 'K'); - ExDesktopObjectType->TotalObjects = 0; - ExDesktopObjectType->TotalHandles = 0; - ExDesktopObjectType->PeakObjects = 0; - ExDesktopObjectType->PeakHandles = 0; - ExDesktopObjectType->PagedPoolCharge = 0; - ExDesktopObjectType->NonpagedPoolCharge = sizeof(DESKTOP_OBJECT); - ExDesktopObjectType->Mapping = &ExpDesktopMapping; - ExDesktopObjectType->Dump = NULL; - ExDesktopObjectType->Open = NULL; - ExDesktopObjectType->Close = NULL; - ExDesktopObjectType->Delete = ExpDesktopObjectDelete; - ExDesktopObjectType->Parse = NULL; - ExDesktopObjectType->Security = NULL; - ExDesktopObjectType->QueryName = NULL; - ExDesktopObjectType->OkayToClose = NULL; - ExDesktopObjectType->Create = ExpDesktopObjectCreate; - ExDesktopObjectType->DuplicationNotify = NULL; - RtlInitUnicodeString(&ExDesktopObjectType->TypeName, L"Desktop"); - - ObpCreateTypeObject(ExDesktopObjectType); + /* Create desktop object type */ + ExDesktopObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + ExDesktopObjectType->Tag = TAG('D', 'E', 'S', 'K'); + ExDesktopObjectType->TotalObjects = 0; + ExDesktopObjectType->TotalHandles = 0; + ExDesktopObjectType->PeakObjects = 0; + ExDesktopObjectType->PeakHandles = 0; + ExDesktopObjectType->PagedPoolCharge = 0; + ExDesktopObjectType->NonpagedPoolCharge = sizeof(DESKTOP_OBJECT); + ExDesktopObjectType->Mapping = &ExpDesktopMapping; + ExDesktopObjectType->Dump = NULL; + ExDesktopObjectType->Open = NULL; + ExDesktopObjectType->Close = NULL; + ExDesktopObjectType->Delete = ExpDesktopDelete; + ExDesktopObjectType->Parse = NULL; + ExDesktopObjectType->Security = NULL; + ExDesktopObjectType->QueryName = NULL; + ExDesktopObjectType->OkayToClose = NULL; + ExDesktopObjectType->Create = ExpDesktopCreate; + ExDesktopObjectType->DuplicationNotify = NULL; + RtlInitUnicodeString(&ExDesktopObjectType->TypeName, L"Desktop"); + ObpCreateTypeObject(ExDesktopObjectType); } /* EOF */ _____ Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/win32.c --- branches/alex_devel_branch/reactos/ntoskrnl/ps/win32.c 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/ntoskrnl/ps/win32.c 2005-03-03 06:18:18 UTC (rev 13806) @@ -21,6 +21,13 @@ static ULONG PspWin32ProcessSize = 0; static ULONG PspWin32ThreadSize = 0; +extern OBJECT_CREATE_ROUTINE ExpWindowStationObjectCreate; +extern OBJECT_PARSE_ROUTINE ExpWindowStationObjectParse; +extern OBJECT_DELETE_ROUTINE ExpWindowStationObjectDelete; +extern OBJECT_FIND_ROUTINE ExpWindowStationObjectFind; +extern OBJECT_CREATE_ROUTINE ExpDesktopObjectCreate; +extern OBJECT_DELETE_ROUTINE ExpDesktopObjectDelete; + /* FUNCTIONS ***************************************************************/ PW32THREAD STDCALL @@ -59,7 +66,7 @@ VOID STDCALL PsEstablishWin32Callouts (PW32_PROCESS_CALLBACK W32ProcessCallback, PW32_THREAD_CALLBACK W32ThreadCallback, - PVOID Param3, + PW32_OBJECT_CALLBACK W32ObjectCallback, PVOID Param4, ULONG W32ThreadSize, ULONG W32ProcessSize) @@ -69,9 +76,15 @@ PspWin32ProcessSize = W32ProcessSize; PspWin32ThreadSize = W32ThreadSize; + + ExpWindowStationObjectCreate = W32ObjectCallback->WinStaCreate; + ExpWindowStationObjectParse = W32ObjectCallback->WinStaParse; + ExpWindowStationObjectDelete = W32ObjectCallback->WinStaDelete; + ExpWindowStationObjectFind = W32ObjectCallback->WinStaFind; + ExpDesktopObjectCreate = W32ObjectCallback->DesktopCreate; + ExpDesktopObjectDelete = W32ObjectCallback->DesktopDelete; } - NTSTATUS PsInitWin32Thread (PETHREAD Thread) { _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/include/desktop.h --- branches/alex_devel_branch/reactos/subsys/win32k/include/desktop.h 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/subsys/win32k/include/desktop.h 2005-03-03 06:18:18 UTC (rev 13806) @@ -20,6 +20,16 @@ NTSTATUS FASTCALL CleanupDesktopImpl(VOID); +NTSTATUS +STDCALL +IntDesktopObjectCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); + +VOID STDCALL +IntDesktopObjectDelete(PVOID DeletedObject); + VOID FASTCALL IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect); _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/include/winsta.h --- branches/alex_devel_branch/reactos/subsys/win32k/include/winsta.h 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/subsys/win32k/include/winsta.h 2005-03-03 06:18:18 UTC (rev 13806) @@ -23,6 +23,29 @@ NTSTATUS FASTCALL CleanupWindowStationImpl(VOID); +NTSTATUS +STDCALL +IntWinStaObjectCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); + +VOID STDCALL +IntWinStaObjectDelete(PVOID DeletedObject); + +PVOID STDCALL +IntWinStaObjectFind(PVOID Object, + PWSTR Name, + ULONG Attributes); + +NTSTATUS +STDCALL +IntWinStaObjectParse(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); + NTSTATUS FASTCALL IntValidateWindowStationHandle( HWINSTA WindowStation, _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/main/dllmain.c --- branches/alex_devel_branch/reactos/subsys/win32k/main/dllmain.c 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/subsys/win32k/main/dllmain.c 2005-03-03 06:18:18 UTC (rev 13806) @@ -35,11 +35,45 @@ struct _ETHREAD *Thread, BOOLEAN Create); +/* + * Callbacks used for Win32 objects... this define won't be needed after the Object Manager + * rewrite -- Alex + */ +typedef NTSTATUS STDCALL_FUNC +(*OBJECT_CREATE_ROUTINE)(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); + +typedef NTSTATUS STDCALL_FUNC +(*OBJECT_PARSE_ROUTINE)(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); + +typedef VOID STDCALL_FUNC +(*OBJECT_DELETE_ROUTINE)(PVOID DeletedObject); + +typedef PVOID STDCALL_FUNC +(*OBJECT_FIND_ROUTINE)(PVOID WinStaObject, + PWSTR Name, + ULONG Attributes); + +typedef struct _W32_OBJECT_CALLBACK { + OBJECT_CREATE_ROUTINE WinStaCreate; + OBJECT_PARSE_ROUTINE WinStaParse; + OBJECT_DELETE_ROUTINE WinStaDelete; + OBJECT_FIND_ROUTINE WinStaFind; + OBJECT_CREATE_ROUTINE DesktopCreate; + OBJECT_DELETE_ROUTINE DesktopDelete; +} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; + VOID STDCALL PsEstablishWin32Callouts( PW32_PROCESS_CALLBACK W32ProcessCallback, PW32_THREAD_CALLBACK W32ThreadCallback, - PVOID Param3, + PW32_OBJECT_CALLBACK W32ObjectCallback, PVOID Param4, ULONG W32ThreadSize, ULONG W32ProcessSize); @@ -219,6 +253,7 @@ { NTSTATUS Status; BOOLEAN Result; + W32_OBJECT_CALLBACK Win32kObjectCallbacks; /* * Register user mode call interface @@ -234,14 +269,23 @@ DPRINT1("Adding system services failed!\n"); return STATUS_UNSUCCESSFUL; } - + + /* + * Register Object Manager Callbacks + */ + Win32kObjectCallbacks.WinStaCreate = IntWinStaObjectCreate; + Win32kObjectCallbacks.WinStaParse = IntWinStaObjectParse; + Win32kObjectCallbacks.WinStaDelete = IntWinStaObjectDelete; + Win32kObjectCallbacks.WinStaFind = IntWinStaObjectFind; + Win32kObjectCallbacks.DesktopCreate = IntDesktopObjectCreate; + Win32kObjectCallbacks.DesktopDelete = IntDesktopObjectDelete; /* * Register our per-process and per-thread structures. */ PsEstablishWin32Callouts (Win32kProcessCallback, Win32kThreadCallback, + &Win32kObjectCallbacks, 0, - 0, sizeof(W32THREAD), sizeof(W32PROCESS)); _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/desktop.c --- branches/alex_devel_branch/reactos/subsys/win32k/ntuser/desktop.c 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/subsys/win32k/ntuser/desktop.c 2005-03-03 06:18:18 UTC (rev 13806) @@ -66,6 +66,60 @@ return STATUS_SUCCESS; } +/* OBJECT CALLBACKS **********************************************************/ + +NTSTATUS STDCALL +IntDesktopObjectCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes) +{ + PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)ObjectBody; + UNICODE_STRING UnicodeString; + + if (RemainingPath == NULL) + { + return STATUS_SUCCESS; + } + + if (wcschr((RemainingPath + 1), '\\') != NULL) + { + return STATUS_UNSUCCESSFUL; + } + + RtlInitUnicodeString(&UnicodeString, (RemainingPath + 1)); + + DPRINT("Creating desktop (0x%X) Name (%wZ)\n", Desktop, &UnicodeString); + + KeInitializeSpinLock(&Desktop->Lock); + + Desktop->WindowStation = (PWINSTATION_OBJECT)Parent; + + /* Put the desktop on the window station's list of associcated desktops */ + ExInterlockedInsertTailList( + &Desktop->WindowStation->DesktopListHead, + &Desktop->ListEntry, + &Desktop->WindowStation->Lock); + + return RtlCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer); +} + +VOID STDCALL +IntDesktopObjectDelete(PVOID DeletedObject) +{ + PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)DeletedObject; + KIRQL OldIrql; + + DPRINT("Deleting desktop (0x%X)\n", Desktop); + + /* Remove the desktop from the window station's list of associcated desktops */ + KeAcquireSpinLock(&Desktop->WindowStation->Lock, &OldIrql); + RemoveEntryList(&Desktop->ListEntry); + KeReleaseSpinLock(&Desktop->WindowStation->Lock, OldIrql); + + RtlFreeUnicodeString(&Desktop->Name); +} + /* PRIVATE FUNCTIONS **********************************************************/ NTSTATUS FASTCALL _____ Modified: branches/alex_devel_branch/reactos/subsys/win32k/ntuser/winsta.c --- branches/alex_devel_branch/reactos/subsys/win32k/ntuser/winsta.c 2005-03-03 03:57:59 UTC (rev 13805) +++ branches/alex_devel_branch/reactos/subsys/win32k/ntuser/winsta.c 2005-03-03 06:18:18 UTC (rev 13806) @@ -80,6 +80,165 @@ return STATUS_SUCCESS; } +/* OBJECT CALLBACKS **********************************************************/ + +NTSTATUS +STDCALL +IntWinStaObjectCreate(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes) +{ + PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)ObjectBody; + UNICODE_STRING UnicodeString; + NTSTATUS Status; + + if (RemainingPath == NULL) + { + return STATUS_SUCCESS; + } + + if (wcschr((RemainingPath + 1), '\\') != NULL) + { + return STATUS_UNSUCCESSFUL; + } + + RtlInitUnicodeString(&UnicodeString, (RemainingPath + 1)); + + DPRINT("Creating window station (0x%X) Name (%wZ)\n", WinSta, &UnicodeString); + + Status = RtlCreateUnicodeString(&WinSta->Name, UnicodeString.Buffer); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + KeInitializeSpinLock(&WinSta->Lock); + + InitializeListHead(&WinSta->DesktopListHead); + +#if 1 + WinSta->AtomTable = NULL; +#endif + + Status = RtlCreateAtomTable(37, &WinSta->AtomTable); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&WinSta->Name); + return Status; + } + + WinSta->SystemMenuTemplate = (HANDLE)0; + + DPRINT("Window station successfully created. Name (%wZ)\n", &WinSta->Name); + + return STATUS_SUCCESS; +} + +VOID STDCALL +IntWinStaObjectDelete(PVOID DeletedObject) +{ + PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeletedObject; + + DPRINT("Deleting window station (0x%X)\n", WinSta); + + RtlDestroyAtomTable(WinSta->AtomTable); + + RtlFreeUnicodeString(&WinSta->Name); +} + +PVOID STDCALL +IntWinStaObjectFind(PVOID Object, + PWSTR Name, + ULONG Attributes) +{ + PLIST_ENTRY Current; + PDESKTOP_OBJECT CurrentObject; + PWINSTATION_OBJECT WinStaObject = (PWINSTATION_OBJECT)Object; + + DPRINT("WinStaObject (0x%X) Name (%wS)\n", WinStaObject, Name); + + if (Name[0] == 0) + { + return NULL; + } + + Current = WinStaObject->DesktopListHead.Flink; + while (Current != &WinStaObject->DesktopListHead) + { + CurrentObject = CONTAINING_RECORD(Current, DESKTOP_OBJECT, ListEntry); + DPRINT("Scanning %wZ for %wS\n", &CurrentObject->Name, Name); + if (Attributes & OBJ_CASE_INSENSITIVE) + { + if (_wcsicmp(CurrentObject->Name.Buffer, Name) == 0) + { + DPRINT("Found desktop at (0x%X)\n", CurrentObject); + return CurrentObject; + } + } + else + { + if (wcscmp(CurrentObject->Name.Buffer, Name) == 0) + { + DPRINT("Found desktop at (0x%X)\n", CurrentObject); + return CurrentObject; + } + } + Current = Current->Flink; + } + + DPRINT("Returning NULL\n"); + + return NULL; +} + +NTSTATUS +STDCALL +IntWinStaObjectParse(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes) +{ + PVOID FoundObject; + NTSTATUS Status; + PWSTR End; + + DPRINT("Object (0x%X) Path (0x%X) *Path (%wS)\n", Object, Path, *Path); + + *NextObject = NULL; + + if ((Path == NULL) || ((*Path) == NULL)) + { + return STATUS_SUCCESS; + } + + End = wcschr((*Path) + 1, '\\'); + if (End != NULL) + { + DPRINT("Name contains illegal characters\n"); + return STATUS_UNSUCCESSFUL; + } + + FoundObject = IntWinStaObjectFind(Object, (*Path) + 1, Attributes); + if (FoundObject == NULL) + { + DPRINT("Name was not found\n"); + return STATUS_UNSUCCESSFUL; + } + + Status = ObReferenceObjectByPointer( + FoundObject, + STANDARD_RIGHTS_REQUIRED, + NULL, + UserMode); + + *NextObject = FoundObject; + *Path = NULL; + + return Status; +} + /* PRIVATE FUNCTIONS **********************************************************/ /*

19 years, 9 months

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 March 2005