Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 14275: revert my changes
by weiden＠svn.reactos.com 23 Mar '05

23 Mar '05

revert my changes Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-03-22 23:34:08 UTC (rev 14274) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-03-23 13:26:38 UTC (rev 14275) @@ -250,7 +250,7 @@ /* It has a normal signal state, so unwait it and return */ KiSatisfyObjectWait(CurrentObject, CurrentThread); Status = STATUS_WAIT_0; - break; + goto WaitDone; } else { @@ -285,7 +285,7 @@ /* Return a timeout */ Status = STATUS_TIMEOUT; - break; + goto WaitDone; } /* Point to Timer Wait Block and Thread Timer */ @@ -311,7 +311,7 @@ /* Return a timeout if we couldn't insert the timer for some reason */ Status = STATUS_TIMEOUT; - break; + goto WaitDone; } } @@ -344,6 +344,7 @@ } while (TRUE); +WaitDone: /* Release the Lock, we are done */ DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); @@ -368,7 +369,7 @@ PKWAIT_BLOCK TimerWaitBlock; PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); - BOOLEAN AllObjectsSignaled; + ULONG AllObjectsSignaled; ULONG WaitIndex; NTSTATUS Status; NTSTATUS WaitStatus; @@ -506,7 +507,7 @@ /* Satisfy their Waits and return to the caller */ KiSatisifyMultipleObjectWaits(WaitBlock); Status = STATUS_WAIT_0; - break; + goto WaitDone; } /* Make sure we can satisfy the Alertable request */ @@ -523,7 +524,7 @@ /* Return a timeout */ Status = STATUS_TIMEOUT; - break; + goto WaitDone; } /* Point to Timer Wait Block and Thread Timer */ @@ -548,20 +549,22 @@ /* Return a timeout if we couldn't insert the timer for some reason */ Status = STATUS_TIMEOUT; - break; + goto WaitDone; } } /* Insert into Object's Wait List*/ - for (WaitBlock = CurrentThread->WaitBlockList; - WaitBlock != NULL; - WaitBlock = WaitBlock->NextWaitBlock) { + WaitBlock = CurrentThread->WaitBlockList; + while (WaitBlock) { /* Get the Current Object */ CurrentObject = WaitBlock->Object; /* Link the Object to this Wait Block */ InsertTailList(&CurrentObject->WaitListHead, &WaitBlock->WaitListEntry); + + /* Move to the next Wait Block */ + WaitBlock = WaitBlock->NextWaitBlock; } /* Handle Kernel Queues */ @@ -657,10 +660,8 @@ /* Loop the Wait Entries */ DPRINT("KiWaitTest for Object: %x\n", Object); WaitList = &Object->WaitListHead; - - for (WaitEntry = WaitList->Flink; - (WaitEntry != WaitList) && (Object->SignalState > 0); - WaitEntry = WaitEntry->Flink) { + WaitEntry = WaitList->Flink; + while ((WaitEntry != WaitList) && (Object->SignalState > 0)) { /* Get the current wait block */ CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); @@ -677,19 +678,21 @@ /* Everything must be satisfied */ DPRINT("Checking for a Wait All\n"); + NextWaitBlock = CurrentWaitBlock->NextWaitBlock; /* Loop first to make sure they are valid */ - for (NextWaitBlock = CurrentWaitBlock->NextWaitBlock; - NextWaitBlock != NULL; - NextWaitBlock = NextWaitBlock->NextWaitBlock) { + while (NextWaitBlock) { /* Check if the object is signaled */ if (!KiIsObjectSignaled(Object, CurrentWaitBlock->Thread)) { /* It's not, move to the next one */ DPRINT1("One of the object is non-signaled, sorry.\n"); - continue; + goto SkipUnwait; } + + /* Go to the next Wait block */ + NextWaitBlock = NextWaitBlock->NextWaitBlock; } /* All the objects are signaled, we can satisfy */ @@ -701,6 +704,10 @@ /* All waits satisfied, unwait the thread */ DPRINT("Unwaiting the Thread\n"); KiAbortWaitThread(CurrentWaitBlock->Thread, CurrentWaitBlock->WaitKey, Increment); + +SkipUnwait: + /* Next entry */ + WaitEntry = WaitEntry->Flink; } DPRINT("Done\n"); @@ -721,14 +728,15 @@ /* Remove the Wait Blocks from the list */ DPRINT("Removing waits\n"); - - for (WaitBlock = Thread->WaitBlockList; - WaitBlock != NULL; - WaitBlock = WaitBlock->NextWaitBlock) { + WaitBlock = Thread->WaitBlockList; + while (WaitBlock) { /* Remove it */ DPRINT("Removing Waitblock: %x, %x\n", WaitBlock, WaitBlock->NextWaitBlock); RemoveEntryList(&WaitBlock->WaitListEntry); + + /* Go to the next one */ + WaitBlock = WaitBlock->NextWaitBlock; }; /* Check if there's a Thread Timer */

1 0

[ea] 14274: updated an absolete comment
by ea＠svn.reactos.com 22 Mar '05

22 Mar '05

updated an absolete comment Modified: trunk/reactos/subsys/smss/initss.c _____ Modified: trunk/reactos/subsys/smss/initss.c --- trunk/reactos/subsys/smss/initss.c 2005-03-22 22:10:44 UTC (rev 14273) +++ trunk/reactos/subsys/smss/initss.c 2005-03-22 23:34:08 UTC (rev 14274) @@ -36,14 +36,10 @@ HANDLE hSmApiPort = (HANDLE) 0; -/* TODO: this file should be totally rewritten +/* TODO: * * a) look if a special option is set for smss.exe in * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options - * - * d) make smss initialize Debug (DBGSS) and Windows (CSRSS) as described - * in the registry key Required="Debug Windows" - * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems */ /********************************************************************** @@ -51,7 +47,7 @@ * * DESCRIPTION * Make smss register with itself for IMAGE_SUBSYSTEM_NATIVE - * (programmatically). This also open hSmApiPort to be used + * (programmatically). This also opens hSmApiPort to be used * in loading required subsystems. */

1 0

[weiden] 14267: improve readability by removing obsolete gotos and for loops where appropriate
by weiden＠svn.reactos.com 22 Mar '05

22 Mar '05

improve readability by removing obsolete gotos and for loops where appropriate Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-03-22 07:29:02 UTC (rev 14266) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-03-22 17:17:02 UTC (rev 14267) @@ -250,7 +250,7 @@ /* It has a normal signal state, so unwait it and return */ KiSatisfyObjectWait(CurrentObject, CurrentThread); Status = STATUS_WAIT_0; - goto WaitDone; + break; } else { @@ -285,7 +285,7 @@ /* Return a timeout */ Status = STATUS_TIMEOUT; - goto WaitDone; + break; } /* Point to Timer Wait Block and Thread Timer */ @@ -311,7 +311,7 @@ /* Return a timeout if we couldn't insert the timer for some reason */ Status = STATUS_TIMEOUT; - goto WaitDone; + break; } } @@ -344,7 +344,6 @@ } while (TRUE); -WaitDone: /* Release the Lock, we are done */ DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); @@ -369,7 +368,7 @@ PKWAIT_BLOCK TimerWaitBlock; PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); - ULONG AllObjectsSignaled; + BOOLEAN AllObjectsSignaled; ULONG WaitIndex; NTSTATUS Status; NTSTATUS WaitStatus; @@ -507,7 +506,7 @@ /* Satisfy their Waits and return to the caller */ KiSatisifyMultipleObjectWaits(WaitBlock); Status = STATUS_WAIT_0; - goto WaitDone; + break; } /* Make sure we can satisfy the Alertable request */ @@ -524,7 +523,7 @@ /* Return a timeout */ Status = STATUS_TIMEOUT; - goto WaitDone; + break; } /* Point to Timer Wait Block and Thread Timer */ @@ -549,22 +548,20 @@ /* Return a timeout if we couldn't insert the timer for some reason */ Status = STATUS_TIMEOUT; - goto WaitDone; + break; } } /* Insert into Object's Wait List*/ - WaitBlock = CurrentThread->WaitBlockList; - while (WaitBlock) { + for (WaitBlock = CurrentThread->WaitBlockList; + WaitBlock != NULL; + WaitBlock = WaitBlock->NextWaitBlock) { /* Get the Current Object */ CurrentObject = WaitBlock->Object; /* Link the Object to this Wait Block */ InsertTailList(&CurrentObject->WaitListHead, &WaitBlock->WaitListEntry); - - /* Move to the next Wait Block */ - WaitBlock = WaitBlock->NextWaitBlock; } /* Handle Kernel Queues */ @@ -660,8 +657,10 @@ /* Loop the Wait Entries */ DPRINT("KiWaitTest for Object: %x\n", Object); WaitList = &Object->WaitListHead; - WaitEntry = WaitList->Flink; - while ((WaitEntry != WaitList) && (Object->SignalState > 0)) { + + for (WaitEntry = WaitList->Flink; + (WaitEntry != WaitList) && (Object->SignalState > 0); + WaitEntry = WaitEntry->Flink) { /* Get the current wait block */ CurrentWaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); @@ -678,21 +677,19 @@ /* Everything must be satisfied */ DPRINT("Checking for a Wait All\n"); - NextWaitBlock = CurrentWaitBlock->NextWaitBlock; /* Loop first to make sure they are valid */ - while (NextWaitBlock) { + for (NextWaitBlock = CurrentWaitBlock->NextWaitBlock; + NextWaitBlock != NULL; + NextWaitBlock = NextWaitBlock->NextWaitBlock) { /* Check if the object is signaled */ if (!KiIsObjectSignaled(Object, CurrentWaitBlock->Thread)) { /* It's not, move to the next one */ DPRINT1("One of the object is non-signaled, sorry.\n"); - goto SkipUnwait; + continue; } - - /* Go to the next Wait block */ - NextWaitBlock = NextWaitBlock->NextWaitBlock; } /* All the objects are signaled, we can satisfy */ @@ -704,10 +701,6 @@ /* All waits satisfied, unwait the thread */ DPRINT("Unwaiting the Thread\n"); KiAbortWaitThread(CurrentWaitBlock->Thread, CurrentWaitBlock->WaitKey, Increment); - -SkipUnwait: - /* Next entry */ - WaitEntry = WaitEntry->Flink; } DPRINT("Done\n"); @@ -728,15 +721,14 @@ /* Remove the Wait Blocks from the list */ DPRINT("Removing waits\n"); - WaitBlock = Thread->WaitBlockList; - while (WaitBlock) { + + for (WaitBlock = Thread->WaitBlockList; + WaitBlock != NULL; + WaitBlock = WaitBlock->NextWaitBlock) { /* Remove it */ DPRINT("Removing Waitblock: %x, %x\n", WaitBlock, WaitBlock->NextWaitBlock); RemoveEntryList(&WaitBlock->WaitListEntry); - - /* Go to the next one */ - WaitBlock = WaitBlock->NextWaitBlock; }; /* Check if there's a Thread Timer */

2 1

[hpoussin] 14273: - Implement IOCTL_SERIAL_GET_COMMSTATUS, IOCTL_SERIAL_PURGE, IOCTL_SET_QUEUE_SIZE
by hpoussin＠svn.reactos.com 22 Mar '05

22 Mar '05

- Implement IOCTL_SERIAL_GET_COMMSTATUS, IOCTL_SERIAL_PURGE, IOCTL_SET_QUEUE_SIZE - Add a hack in IOCTL_SERIAL_GET_BAUD_RATE to get it working with mode.exe Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-03-22 20:15:04 UTC (rev 14272) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-03-22 22:10:44 UTC (rev 14273) @@ -8,7 +8,7 @@ * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) */ -//#define NDEBUG +#define NDEBUG #include "serial.h" NTSTATUS @@ -16,7 +16,8 @@ IN PCIRCULAR_BUFFER pBuffer, IN ULONG BufferSize) { - pBuffer->Buffer = ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); + DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); if (!pBuffer->Buffer) return STATUS_INSUFFICIENT_RESOURCES; pBuffer->Length = BufferSize; @@ -28,6 +29,7 @@ FreeCircularBuffer( IN PCIRCULAR_BUFFER pBuffer) { + DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); return STATUS_SUCCESS; } @@ -36,6 +38,7 @@ IsCircularBufferEmpty( IN PCIRCULAR_BUFFER pBuffer) { + DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); return (pBuffer->ReadPosition == pBuffer->WritePosition); } @@ -44,6 +47,7 @@ IN PCIRCULAR_BUFFER pBuffer, IN UCHAR Entry) { + DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); ASSERT(pBuffer->Length); ULONG NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; if (NextPosition == pBuffer->ReadPosition) @@ -58,6 +62,7 @@ IN PCIRCULAR_BUFFER pBuffer, OUT PUCHAR Entry) { + DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); ASSERT(pBuffer->Length); if (IsCircularBufferEmpty(pBuffer)) return STATUS_ARRAY_BOUNDS_EXCEEDED; @@ -65,3 +70,27 @@ pBuffer->ReadPosition = (pBuffer->ReadPosition + 1) % pBuffer->Length; return STATUS_SUCCESS; } + +NTSTATUS +IncreaseCircularBufferSize( + IN PCIRCULAR_BUFFER pBuffer, + IN ULONG NewBufferSize) +{ + PUCHAR NewBuffer; + + DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + ASSERT(pBuffer->Length); + if (pBuffer->Length > NewBufferSize) + return STATUS_INVALID_PARAMETER; + else if (pBuffer->Length == NewBufferSize) + return STATUS_SUCCESS; + + NewBuffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, NewBufferSize * sizeof(UCHAR), SERIAL_TAG); + if (!NewBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + RtlCopyMemory(NewBuffer, pBuffer->Buffer, pBuffer->Length * sizeof(UCHAR)); + ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); + pBuffer->Buffer = NewBuffer; + pBuffer->Length = NewBufferSize; + return STATUS_SUCCESS; +} _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-22 20:15:04 UTC (rev 14272) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-22 22:10:44 UTC (rev 14273) @@ -60,16 +60,13 @@ { UCHAR Lcr; DPRINT("Serial: SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); - /* FIXME: update DeviceExtension->LowerDevice when modifying LCR? */ /* Set Bit 7 of LCR to expose baud registers */ Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); - Lcr |= SR_LCR_DLAB; - WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr | SR_LCR_DLAB); /* Write the baud rate */ WRITE_PORT_UCHAR(SER_DLL(ComPortBase), divisor & 0xff); WRITE_PORT_UCHAR(SER_DLM(ComPortBase), divisor >> 8); /* Switch back to normal registers */ - Lcr ^= SR_LCR_DLAB; WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -77,7 +74,7 @@ } if (NT_SUCCESS(Status)) - DeviceExtension->BaudRate = NewBaudRate; + DeviceExtension->BaudRate = BaudRate; return Status; } @@ -213,6 +210,25 @@ return STATUS_SUCCESS; } +NTSTATUS +SerialGetCommStatus( + OUT PSERIAL_STATUS pSerialStatus, + IN PSERIAL_DEVICE_EXTENSION DeviceExtension) +{ + RtlZeroMemory(pSerialStatus, sizeof(SERIAL_STATUS)); + + pSerialStatus->Errors = 0; /* FIXME */ + pSerialStatus->HoldReasons = 0; /* FIXME */ + pSerialStatus->AmountInInQueue = (DeviceExtension->InputBuffer.WritePosition + DeviceExtension->InputBuffer.Length + - DeviceExtension->InputBuffer.ReadPosition) % DeviceExtension->InputBuffer.Length; + pSerialStatus->AmountInOutQueue = (DeviceExtension->OutputBuffer.WritePosition + DeviceExtension->OutputBuffer.Length + - DeviceExtension->OutputBuffer.ReadPosition) % DeviceExtension->OutputBuffer.Length; + pSerialStatus->EofReceived = FALSE; /* FIXME */ + pSerialStatus->WaitForImmediate = FALSE; /* FIXME */ + + return STATUS_SUCCESS; +} + NTSTATUS STDCALL SerialDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -289,6 +305,8 @@ case IOCTL_SERIAL_GET_BAUD_RATE: { DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); + /* FIXME: HACK!!! following line MUST NOT be here! */ + Buffer = Irp->UserBuffer; if (LengthOut < sizeof(SERIAL_BAUD_RATE)) Status = STATUS_BUFFER_TOO_SMALL; else if (Buffer == NULL) @@ -309,9 +327,22 @@ } case IOCTL_SERIAL_GET_COMMSTATUS: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_COMMSTATUS not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT("Serial: IOCTL_SERIAL_GET_COMMSTATUS\n"); + if (LengthOut < sizeof(SERIAL_STATUS)) + { + DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); + Status = STATUS_BUFFER_TOO_SMALL; + } + else if (Buffer == NULL) + { + DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = SerialGetCommStatus((PSERIAL_STATUS)Buffer, DeviceExtension); + Information = sizeof(SERIAL_STATUS); + } break; } case IOCTL_SERIAL_GET_DTRRTS: @@ -466,9 +497,18 @@ } case IOCTL_SERIAL_PURGE: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_PURGE not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT("Serial: IOCTL_SERIAL_PURGE\n"); + /* FIXME: lock input and output queues */ + DeviceExtension->InputBuffer.ReadPosition = DeviceExtension->InputBuffer.WritePosition = 0; + DeviceExtension->OutputBuffer.ReadPosition = DeviceExtension->OutputBuffer.WritePosition = 0; + /* Clear receive/transmit buffers */ + if (DeviceExtension->UartType >= Uart16550) + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), + SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT); + } + /* FIXME: unlock input and output queues */ + Status = STATUS_SUCCESS; break; } case IOCTL_SERIAL_RESET_DEVICE: @@ -572,9 +612,26 @@ } case IOCTL_SERIAL_SET_QUEUE_SIZE: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_QUEUE_SIZE not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + if (LengthIn < sizeof(SERIAL_QUEUE_SIZE )) + return STATUS_BUFFER_TOO_SMALL; + else if (Buffer == NULL) + return STATUS_INVALID_PARAMETER; + else + { + Status = STATUS_SUCCESS; + if (((PSERIAL_QUEUE_SIZE)Buffer)->InSize > DeviceExtension->InputBuffer.Length) + { + /* FIXME: lock input queue */ + Status = IncreaseCircularBufferSize(&DeviceExtension->InputBuffer, ((PSERIAL_QUEUE_SIZE)Buffer)->InSize); + /* FIXME: unlock input queue */ + } + if (NT_SUCCESS(Status) && ((PSERIAL_QUEUE_SIZE)Buffer)->OutSize > DeviceExtension->OutputBuffer.Length) + { + /* FIXME: lock output queue */ + Status = IncreaseCircularBufferSize(&DeviceExtension->OutputBuffer, ((PSERIAL_QUEUE_SIZE)Buffer)->OutSize); + /* FIXME: unlock output queue */ + } + } break; } case IOCTL_SERIAL_SET_RTS: _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-03-22 20:15:04 UTC (rev 14272) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-03-22 22:10:44 UTC (rev 14273) @@ -83,6 +83,7 @@ DPRINT("Serial: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); goto ByeBye; } + Fdo->Flags |= DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (pFdo) { _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-03-22 20:15:04 UTC (rev 14272) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-03-22 22:10:44 UTC (rev 14273) @@ -178,6 +178,11 @@ IN PCIRCULAR_BUFFER pBuffer, OUT PUCHAR Entry); +NTSTATUS +IncreaseCircularBufferSize( + IN PCIRCULAR_BUFFER pBuffer, + IN ULONG NewBufferSize); + /************************************ cleanup.c */ NTSTATUS STDCALL

1 0

[hbirr] 14272: Merge 13755:14269 from trunk.
by hbirr＠svn.reactos.com 22 Mar '05

22 Mar '05

Merge 13755:14269 from trunk. Modified: branches/cache_manager_rewrite/reactos/Makefile Modified: branches/cache_manager_rewrite/reactos/apps/utils/Makefile Added: branches/cache_manager_rewrite/reactos/apps/utils/binpatch/ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/consw/ Deleted: branches/cache_manager_rewrite/reactos/apps/utils/rundll32/ Added: branches/cache_manager_rewrite/reactos/apps/utils/winetest/ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Makefile Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/Makefile Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/hw acpi.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mult iboot.h Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/install/Makefile Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/tools/Makefile Modified: branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf Modified: branches/cache_manager_rewrite/reactos/bootdata/icon.ico Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff Modified: branches/cache_manager_rewrite/reactos/config Modified: branches/cache_manager_rewrite/reactos/doc/README.WINE Added: branches/cache_manager_rewrite/reactos/doc/irp cancel boilerplate.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/tables/tbget.c Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/utils/cmglobal.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/circularbuffer. c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/create.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/devctrl.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/info.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/legacy.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/makefile Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/misc.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/pnp.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/power.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.c Added: branches/cache_manager_rewrite/reactos/drivers/dd/serial/serial.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/finfo.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/fsctrl.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/npfs.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/npfs.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/rw.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/np/volume.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/finfo.c Modified: branches/cache_manager_rewrite/reactos/drivers/input/keyboard/keyboard.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/ip/network/interface. c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/ip/network/ports.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/ip/transport/tcp/acce pt.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/ip/transport/tcp/tcp. c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/oskittcp/include/free bsd/src/sys/sys/select.h Modified: branches/cache_manager_rewrite/reactos/drivers/lib/oskittcp/include/free bsd/src/sys/sys/socketvar.h Modified: branches/cache_manager_rewrite/reactos/drivers/lib/oskittcp/include/free bsd/src/sys/sys/systm.h Modified: branches/cache_manager_rewrite/reactos/drivers/lib/oskittcp/oskittcp/in_ pcb.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/oskittcp/oskittcp/int erface.c Modified: branches/cache_manager_rewrite/reactos/drivers/lib/oskittcp/oskittcp/rou te.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/listen.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/main.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/afd/read.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/afd/include/afd.h Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/datalink/lan.c Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/include/interfa ce.h Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/include/lan.h Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/include/precomp .h Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/include/tcpip.h Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/dispatch. c Modified: branches/cache_manager_rewrite/reactos/drivers/net/tcpip/tcpip/iinfo.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/atapi/atapi.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/atapi/atapi.h Modified: branches/cache_manager_rewrite/reactos/drivers/storage/disk/disk.c Modified: branches/cache_manager_rewrite/reactos/drivers/storage/floppy/floppy.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/framebuf/s creen.c Modified: branches/cache_manager_rewrite/reactos/drivers/video/displays/vga/main/e nable.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/generic/timer.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/apic.h Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/hal.h Added: branches/cache_manager_rewrite/reactos/hal/halx86/include/ioapic.h Modified: branches/cache_manager_rewrite/reactos/hal/halx86/include/mps.h Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/Makefile Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/apic.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/halinit_mp.c Added: branches/cache_manager_rewrite/reactos/hal/halx86/mp/ioapic.c Added: branches/cache_manager_rewrite/reactos/hal/halx86/mp/mpconfig.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/mpsirql.c Modified: branches/cache_manager_rewrite/reactos/hal/halx86/mp/processor_mp.c Modified: branches/cache_manager_rewrite/reactos/include/d3d.h Added: branches/cache_manager_rewrite/reactos/include/d3d8.h Added: branches/cache_manager_rewrite/reactos/include/d3d8caps.h Added: branches/cache_manager_rewrite/reactos/include/d3d8types.h Added: branches/cache_manager_rewrite/reactos/include/d3d9.h Added: branches/cache_manager_rewrite/reactos/include/d3d9caps.h Added: branches/cache_manager_rewrite/reactos/include/d3d9types.h Added: branches/cache_manager_rewrite/reactos/include/d3drm.h Modified: branches/cache_manager_rewrite/reactos/include/d3dtypes.h Added: branches/cache_manager_rewrite/reactos/include/d3dvec.inl Added: branches/cache_manager_rewrite/reactos/include/d3dx8core.h Modified: branches/cache_manager_rewrite/reactos/include/ddk/cmtypes.h [truncated at 100 lines; 642 more skipped] _____ Modified: branches/cache_manager_rewrite/reactos/Makefile --- branches/cache_manager_rewrite/reactos/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -61,8 +61,8 @@ DLLS = acledit aclui advapi32 advpack cabinet cards comctl32 crtdll comdlg32 d3d8thk dbghelp expat fmifs freetype \ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ - packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \ - twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ + packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smlib smdll snmpapi \ + syssetup twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound lsasrv $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) SUBSYS = smss win32k csrss ntvdm @@ -103,8 +103,8 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec -SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regedt32 regsvr32 \ - reporterror services setup taskmgr userinit usetup welcome vmwinst \ +SYS_APPS = autochk calc cmd explorer expand format ibrowser msiexec regsvr32 \ + reporterror services setup taskmgr userinit usetup welcome vmwinst rundll32 \ winlogon regedit winefile notepad reactos lsass # System services @@ -216,6 +216,8 @@ $(CP) media/nls/l_intl.nls $(BOOTCD_DIR)/reactos/l_intl.nls $(HALFVERBOSEECHO) [COPY] media/drivers/etc/services to $(BOOTCD_DIR)/reactos/services $(CP) media/drivers/etc/services $(BOOTCD_DIR)/reactos/services + $(HALFVERBOSEECHO) [COPY] media/drivers/etc/KDBinit to $(BOOTCD_DIR)/reactos/KDBinit + $(CP) media/drivers/etc/KDBinit $(BOOTCD_DIR)/reactos/KDBinit bootcd_basic: bootcd_directory_layout bootcd_bootstrap_files bootcd_install_before @@ -1043,6 +1045,8 @@ $(CP) media/nls/l_intl.nls $(INSTALL_DIR)/system32/casemap.nls $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/services to $(INSTALL_DIR)/system32/drivers/etc/services $(CP) media/drivers/etc/services $(INSTALL_DIR)/system32/drivers/etc/services + $(HALFVERBOSEECHO) [INSTALL] media/drivers/etc/KDBinit to $(INSTALL_DIR)/system32/drivers/etc/KDBinit + $(CP) media/drivers/etc/KDBinit $(INSTALL_DIR)/system32/drivers/etc/KDBinit .PHONY: install_clean install_dirs install_before _____ Modified: branches/cache_manager_rewrite/reactos/apps/utils/Makefile --- branches/cache_manager_rewrite/reactos/apps/utils/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/apps/utils/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -9,7 +9,7 @@ # Console system utilities # cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw rundll32 ps +UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount ps UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois _____ Copied: branches/cache_manager_rewrite/reactos/apps/utils/binpatch (from rev 14140, trunk/reactos/apps/utils/binpatch) _____ Copied: branches/cache_manager_rewrite/reactos/apps/utils/winetest (from rev 13990, trunk/reactos/apps/utils/winetest) _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile --- branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/bootsect/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -32,26 +32,26 @@ @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) dosmbr.bin : dosmbr.asm - @echo ===================================================== Assembling dosmbr + @echo freeldr: Assembling dosmbr @$(NASM_CMD) $(NFLAGS) -o dosmbr.bin -f bin dosmbr.asm fat.bin : fat.asm $(BIN2C) - @echo ===================================================== Assembling fat + @echo freeldr: Assembling fat @$(NASM_CMD) $(NFLAGS) -o fat.bin -f bin fat.asm @$(BIN2C) fat.bin fat.h fat_data fat32.bin : fat32.asm $(BIN2C) - @echo ===================================================== Assembling fat32 + @echo freeldr: Assembling fat32 @$(NASM_CMD) $(NFLAGS) -o fat32.bin -f bin fat32.asm @$(BIN2C) fat32.bin fat32.h fat32_data isoboot.bin : isoboot.asm - @echo ===================================================== Assembling isoboot + @echo freeldr: Assembling isoboot @$(NASM_CMD) $(NFLAGS) -o isoboot.bin -f bin isoboot.asm ext2.bin : ext2.asm - @echo ===================================================== Assembling ext2 + @echo freeldr: Assembling ext2 @$(NASM_CMD) $(NFLAGS) -o ext2.bin -f bin ext2.asm @$(BIN2C) ext2.bin ext2.h ext2_data @@ -77,4 +77,4 @@ clean: @-$(RM) *.bin @-$(RM) *.h - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Makefile --- branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/fdebug/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -30,23 +30,23 @@ all: fdebug.exe fdebug.exe: $(OBJS) - @echo ===================================================== LINKING fdebug + @echo freeldr: LINKING fdebug $(CC) $(FLAGS) -o fdebug.exe $(OBJS) -lgdi32 -lcomdlg32 -Wl,--subsystem,windows fdebug.res: fdebug.rc resource.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(RC) -o fdebug.res fdebug.rc -O coff fdebug.o: fdebug.c rs232.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o fdebug.o -c fdebug.c rs232.o: rs232.c rs232.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o rs232.o -c rs232.c clean: @-$(RM) *.o @-$(RM) *.res @-$(RM) *.exe - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/Makefile --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -57,7 +57,7 @@ @-$(RM) setupldr.sys @-$(RM) setupldr.map @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - @echo Clean ALL done. + @echo freeldr: Clean ALL done. ############################################# @@ -259,11 +259,11 @@ all : freeldr.sys setupldr.sys - @echo Make ALL done. + @echo freeldr: Make ALL done. freeldr.sys : $(ALL_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a - @echo ===================================================== LINKING $@ + @echo freeldr: LINKING $@ @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S freeldr.exe > freeldr.map @@ -274,7 +274,7 @@ setupldr.sys : $(ALL_OBJS) - @echo ===================================================== LINKING $@ + @echo freeldr: LINKING $@ @$(LD) $(LFLAGS) -Map setupldr.map -o setupldr.exe $(S_OBJS) ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S setupldr.exe > setupldr.map @@ -285,15 +285,15 @@ %.o :: %.c - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* @$(CC) $(CFLAGS) -o $@ -c $< @$(DEPTOOL) $*.d %.o :: %.S - @echo ===================================================== Assembling $* + @echo freeldr: Assembling $* @$(CC) $(CFLAGS) -o $@ -c $< @$(DEPTOOL) $*.d %.o :: %.asm - @echo ===================================================== Assembling $* + @echo freeldr: Assembling $* @$(NASM_CMD) $(NASMFLAGS) -o $@ $< _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/hw acpi.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/hw acpi.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/arch/i386/hw acpi.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -28,6 +28,7 @@ #include "../../reactos/registry.h" #include "hardware.h" +BOOLEAN AcpiPresent = FALSE; static BOOL FindAcpiBios(VOID) @@ -63,6 +64,7 @@ if (FindAcpiBios()) { + AcpiPresent = TRUE; /* Create new bus key */ sprintf(Buffer, "MultifunctionAdapter\\%u", *BusNumber); _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mult iboot.h --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mult iboot.h 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/include/mult iboot.h 2005-03-22 20:15:04 UTC (rev 14272) @@ -52,6 +52,7 @@ #define MB_INFO_FLAG_BOOT_LOADER_NAME 0x00000200 #define MB_INFO_FLAG_APM_TABLE 0x00000400 #define MB_INFO_FLAG_GRAPHICS_TABLE 0x00000800 +#define MB_INFO_FLAG_ACPI_TABLE 0x00001000 #ifndef ASM /* Do not include here in boot.S. */ _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/multiboot.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -164,9 +164,7 @@ /* Re-initalize EFLAGS */ Ke386EraseFlags(); - /* Get Kernel Base and Set MmSystemRangeStart */ - FrLdrGetKernelBase(); - + /* Get the PAE Mode */ FrLdrGetPaeMode(); /* Initialize the page directory */ @@ -531,6 +529,14 @@ ULONG_PTR TargetSection; ULONG SectionSize; LONG i; + PIMAGE_DATA_DIRECTORY RelocationDDir; + PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd; + ULONG Count; + ULONG_PTR Address, MaxAddress; + PUSHORT TypeOffset; + ULONG_PTR Delta; + PUSHORT ShortPtr; + PULONG LongPtr; /* Allocate 1024 bytes for PE Header */ ImageHeader = (PIMAGE_DOS_HEADER)MmAllocateMemory(1024); @@ -552,8 +558,9 @@ /* Now read the MZ header to get the offset to the PE Header */ NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)ImageHeader + ImageHeader->e_lfanew); - /* Save the Image Base */ - KernelBase = NtHeader->OptionalHeader.ImageBase; + /* Get Kernel Base */ + KernelBase = NtHeader->OptionalHeader.ImageBase; + FrLdrGetKernelBase(); /* Save Entrypoint */ KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); @@ -603,10 +610,65 @@ Section->Misc.VirtualSize - Section->SizeOfRawData); } } + + /* Get the Relocation Data Directory */ + RelocationDDir = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC] ; - /* Now relocate the file */ - /* FIXME: ADD RELOC CODE */ + /* Get the Relocation Section Start and End*/ + RelocationDir = (PIMAGE_BASE_RELOCATION)(KERNEL_BASE_PHYS + RelocationDDir->VirtualAddress); + RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); + + /* Calculate Difference between Real Base and Compiled Base*/ + Delta = KernelBase - NtHeader->OptionalHeader.ImageBase;; + /* Determine how far we shoudl relocate */ + MaxAddress = KERNEL_BASE_PHYS + ImageSize; + + /* Relocate until we've processed all the blocks */ + while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { + + /* See how many Relocation Blocks we have */ + Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); + + /* Calculate the Address of this Directory */ + Address = KERNEL_BASE_PHYS + RelocationDir->VirtualAddress; + + /* Calculate the Offset of the Type */ + TypeOffset = (PUSHORT)(RelocationDir + 1); + + for (i = 0; i < Count; i++) { + + ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF)); + + /* Don't relocate after the end of the loaded driver */ + if ((ULONG_PTR)ShortPtr >= MaxAddress) break; + + switch (*TypeOffset >> 12) { + + case IMAGE_REL_BASED_ABSOLUTE: + break; + + case IMAGE_REL_BASED_HIGH: + *ShortPtr += HIWORD(Delta); + break; + + case IMAGE_REL_BASED_LOW: + *ShortPtr += LOWORD(Delta); + break; + + case IMAGE_REL_BASED_HIGHLOW: + LongPtr = (PULONG)ShortPtr; + *LongPtr += Delta; + break; + } + + TypeOffset++; + } + + /* Move to the next Relocation Table */ + RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDir->SizeOfBlock); + } + /* Increase the next Load Base */ NextModuleBase = ROUND_UP(KERNEL_BASE_PHYS + ImageSize, PAGE_SIZE); _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c --- branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/freeldr/reactos/reac tos.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -578,8 +578,9 @@ PARTITION_TABLE_ENTRY PartitionTableEntry; ULONG rosPartition; - extern ULONG PageDirectoryStart; - extern ULONG PageDirectoryEnd; + extern ULONG PageDirectoryStart; + extern ULONG PageDirectoryEnd; + extern BOOLEAN AcpiPresent; // // Open the operating system section @@ -596,8 +597,8 @@ * Setup multiboot information structure */ LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; + LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.BootDevice = 0xffffffff; LoaderBlock.CommandLine = (unsigned long)multiboot_kernel_cmdline; LoaderBlock.ModsCount = 0; @@ -734,6 +735,7 @@ */ MachHwDetect(); + if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; UiDrawStatusText("Loading..."); UiDrawProgressBarCenter(0, 100, "Loading ReactOS..."); _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/install/Makefile --- branches/cache_manager_rewrite/reactos/boot/freeldr/install/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/install/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -35,18 +35,18 @@ @$(MAKE) --no-print-directory -C ../bootsect install.exe: $(OBJS) - @echo ===================================================== LINKING install + @echo freeldr: LINKING install $(CC) $(FLAGS) -o install.exe $(OBJS) install.o: install.c install.h volume.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o install.o -c install.c volume.o: volume.c volume.h install.h - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* $(CC) $(FLAGS) -o volume.o -c volume.c clean: @-$(RM) *.o @-$(RM) *.exe - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/cache_manager_rewrite/reactos/boot/freeldr/tools/Makefile --- branches/cache_manager_rewrite/reactos/boot/freeldr/tools/Makefile 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/boot/freeldr/tools/Makefile 2005-03-22 20:15:04 UTC (rev 14272) @@ -25,16 +25,16 @@ bin2c$(EXE_POSTFIX) all : $(TOOLS) - @echo Tools are up to date. + @echo freeldr: Tools are up to date. % :: all %$(EXE_POSTFIX): %.c - @echo ===================================================== Compiling $* + @echo freeldr: Compiling $* @$(HOST_CC) -Wall -O3 -o $@ $< .PHONY : clean clean: @-$(RM) $(TOOLS) - @echo Clean ALL done. + @echo freeldr: Clean ALL done. _____ Modified: branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf --- branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/bootdata/hivecls.inf 2005-03-22 20:15:04 UTC (rev 14272) @@ -344,4 +344,133 @@ HKCR,"WinNT\Clsid","",0x00000002,"{8b20cd60-0f29-11cf-abc4-02608c9e7553} " + +; For language support: + +HKCR,"MIME",,0x00000012 +HKCR,"MIME\Database",,0x00000012 +HKCR,"MIME\Database\Rfc1766",,0x00000012 +HKCR,"MIME\Database\Rfc1766","0436",0x00000000,"af;Afrikaans" +HKCR,"MIME\Database\Rfc1766","041C",0x00000000,"sq;Albanian" +HKCR,"MIME\Database\Rfc1766","0001",0x00000000,"ar;Arabic" +HKCR,"MIME\Database\Rfc1766","0401",0x00000000,"ar-sa;Arabic (Saudi Arabia)" +HKCR,"MIME\Database\Rfc1766","0801",0x00000000,"ar-iq;Arabic (Iraq)" +HKCR,"MIME\Database\Rfc1766","0C01",0x00000000,"ar-eg;Arabic (Egypt)" +HKCR,"MIME\Database\Rfc1766","1001",0x00000000,"ar-ly;Arabic (Libya)" +HKCR,"MIME\Database\Rfc1766","1401",0x00000000,"ar-dz;Arabic (Algeria)" +HKCR,"MIME\Database\Rfc1766","1801",0x00000000,"ar-ma;Arabic (Morocco)" +HKCR,"MIME\Database\Rfc1766","1C01",0x00000000,"ar-tn;Arabic (Tunisia)" +HKCR,"MIME\Database\Rfc1766","2001",0x00000000,"ar-om;Arabic (Oman)" +HKCR,"MIME\Database\Rfc1766","2401",0x00000000,"ar-ye;Arabic (Yemen)" +HKCR,"MIME\Database\Rfc1766","2801",0x00000000,"ar-sy;Arabic (Syria)" +HKCR,"MIME\Database\Rfc1766","2C01",0x00000000,"ar-jo;Arabic (Jordan)" +HKCR,"MIME\Database\Rfc1766","3001",0x00000000,"ar-lb;Arabic (Lebanon)" +HKCR,"MIME\Database\Rfc1766","3401",0x00000000,"ar-kw;Arabic (Kuwait)" +HKCR,"MIME\Database\Rfc1766","3801",0x00000000,"ar-ae;Arabic (U.A.E.)" +HKCR,"MIME\Database\Rfc1766","3C01",0x00000000,"ar-bh;Arabic (Bahrain)" +HKCR,"MIME\Database\Rfc1766","4001",0x00000000,"ar-qa;Arabic (Qatar)" +HKCR,"MIME\Database\Rfc1766","042D",0x00000000,"eu;Basque" +HKCR,"MIME\Database\Rfc1766","0402",0x00000000,"bg;Bulgarian" +HKCR,"MIME\Database\Rfc1766","0423",0x00000000,"be;Belarusian" +HKCR,"MIME\Database\Rfc1766","0403",0x00000000,"ca;Catalan" +HKCR,"MIME\Database\Rfc1766","0004",0x00000000,"zh;Chinese" +HKCR,"MIME\Database\Rfc1766","0404",0x00000000,"zh-tw;Chinese (Taiwan)" +HKCR,"MIME\Database\Rfc1766","0804",0x00000000,"zh-cn;Chinese (China)" +HKCR,"MIME\Database\Rfc1766","0C04",0x00000000,"zh-hk;Chinese (Hong Kong SAR)" +HKCR,"MIME\Database\Rfc1766","1004",0x00000000,"zh-sg;Chinese (Singapore)" +HKCR,"MIME\Database\Rfc1766","041A",0x00000000,"hr;Croatian" +HKCR,"MIME\Database\Rfc1766","0405",0x00000000,"cs;Czech" +HKCR,"MIME\Database\Rfc1766","0406",0x00000000,"da;Danish" +HKCR,"MIME\Database\Rfc1766","0413",0x00000000,"nl;Dutch (Netherlands)" +HKCR,"MIME\Database\Rfc1766","0813",0x00000000,"nl-be;Dutch (Belgium)" +HKCR,"MIME\Database\Rfc1766","0009",0x00000000,"en;English" +HKCR,"MIME\Database\Rfc1766","0409",0x00000000,"en-us;English (United States)" +HKCR,"MIME\Database\Rfc1766","0809",0x00000000,"en-gb;English (United Kingdom)" +HKCR,"MIME\Database\Rfc1766","0C09",0x00000000,"en-au;English (Australia)" +HKCR,"MIME\Database\Rfc1766","1009",0x00000000,"en-ca;English (Canada)" +HKCR,"MIME\Database\Rfc1766","1409",0x00000000,"en-nz;English (New Zealand)" +HKCR,"MIME\Database\Rfc1766","1809",0x00000000,"en-ie;English (Ireland)" +HKCR,"MIME\Database\Rfc1766","1C09",0x00000000,"en-za;English (South Africa)" +HKCR,"MIME\Database\Rfc1766","2009",0x00000000,"en-jm;English (Jamaica)" +HKCR,"MIME\Database\Rfc1766","2809",0x00000000,"en-bz;English (Belize)" +HKCR,"MIME\Database\Rfc1766","2C09",0x00000000,"en-tt;English (Trinidad)" +HKCR,"MIME\Database\Rfc1766","0425",0x00000000,"et;Estonian" +HKCR,"MIME\Database\Rfc1766","0438",0x00000000,"fo;Faeroese" +HKCR,"MIME\Database\Rfc1766","0429",0x00000000,"fa;Farsi" +HKCR,"MIME\Database\Rfc1766","040B",0x00000000,"fi;Finnish" +HKCR,"MIME\Database\Rfc1766","040C",0x00000000,"fr;French (France)" +HKCR,"MIME\Database\Rfc1766","080C",0x00000000,"fr-be;French (Belgium)" +HKCR,"MIME\Database\Rfc1766","0C0C",0x00000000,"fr-ca;French (Canada)" +HKCR,"MIME\Database\Rfc1766","100C",0x00000000,"fr-ch;French (Switzerland)" +HKCR,"MIME\Database\Rfc1766","140C",0x00000000,"fr-lu;French (Luxembourg)" +HKCR,"MIME\Database\Rfc1766","043C",0x00000000,"gd;Gaelic" +HKCR,"MIME\Database\Rfc1766","0407",0x00000000,"de;German (Germany)" +HKCR,"MIME\Database\Rfc1766","0807",0x00000000,"de-ch;German (Switzerland)" +HKCR,"MIME\Database\Rfc1766","0C07",0x00000000,"de-at;German (Austria)" +HKCR,"MIME\Database\Rfc1766","1007",0x00000000,"de-lu;German (Luxembourg)" +HKCR,"MIME\Database\Rfc1766","1407",0x00000000,"de-li;German (Liechtenstein)" +HKCR,"MIME\Database\Rfc1766","0408",0x00000000,"el;Greek" +HKCR,"MIME\Database\Rfc1766","040D",0x00000000,"he;Hebrew" +HKCR,"MIME\Database\Rfc1766","0439",0x00000000,"hi;Hindi" +HKCR,"MIME\Database\Rfc1766","040E",0x00000000,"hu;Hungarian" +HKCR,"MIME\Database\Rfc1766","040F",0x00000000,"is;Icelandic" +HKCR,"MIME\Database\Rfc1766","0421",0x00000000,"in;Indonesian" +HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" +HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" +HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" +HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" +HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" +HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" +HKCR,"MIME\Database\Rfc1766","042F",0x00000000,"mk;FYRO Macedonian" +HKCR,"MIME\Database\Rfc1766","043E",0x00000000,"ms;Malay (Malaysia)" +HKCR,"MIME\Database\Rfc1766","043A",0x00000000,"mt;Maltese" +HKCR,"MIME\Database\Rfc1766","0414",0x00000000,"no;Norwegian (Bokmal)" +HKCR,"MIME\Database\Rfc1766","0814",0x00000000,"no;Norwegian (Nynorsk)" +HKCR,"MIME\Database\Rfc1766","0415",0x00000000,"pl;Polish" +HKCR,"MIME\Database\Rfc1766","0416",0x00000000,"pt-br;Portuguese (Brazil)" +HKCR,"MIME\Database\Rfc1766","0816",0x00000000,"pt;Portuguese (Portugal)" +HKCR,"MIME\Database\Rfc1766","0417",0x00000000,"rm;Rhaeto-Romanic" +HKCR,"MIME\Database\Rfc1766","0418",0x00000000,"ro;Romanian" +HKCR,"MIME\Database\Rfc1766","0818",0x00000000,"ro-mo;Romanian (Moldova)" +HKCR,"MIME\Database\Rfc1766","0419",0x00000000,"ru;Russian" +HKCR,"MIME\Database\Rfc1766","0819",0x00000000,"ru-mo;Russian (Moldova)" +HKCR,"MIME\Database\Rfc1766","0C1A",0x00000000,"sr;Serbian (Cyrillic)" +HKCR,"MIME\Database\Rfc1766","081A",0x00000000,"sr;Serbian (Latin)" +HKCR,"MIME\Database\Rfc1766","041B",0x00000000,"sk;Slovak" +HKCR,"MIME\Database\Rfc1766","0424",0x00000000,"sl;Slovenian" +HKCR,"MIME\Database\Rfc1766","042E",0x00000000,"sb;Sorbian" +HKCR,"MIME\Database\Rfc1766","040A",0x00000000,"es;Spanish (Traditional Sort)" +HKCR,"MIME\Database\Rfc1766","080A",0x00000000,"es-mx;Spanish (Mexico)" +HKCR,"MIME\Database\Rfc1766","0C0A",0x00000000,"es;Spanish (International Sort)" +HKCR,"MIME\Database\Rfc1766","100A",0x00000000,"es-gt;Spanish (Guatemala)" +HKCR,"MIME\Database\Rfc1766","140A",0x00000000,"es-cr;Spanish (Costa Rica)" +HKCR,"MIME\Database\Rfc1766","180A",0x00000000,"es-pa;Spanish (Panama)" +HKCR,"MIME\Database\Rfc1766","1C0A",0x00000000,"es-do;Spanish (Dominican Republic)" +HKCR,"MIME\Database\Rfc1766","200A",0x00000000,"es-ve;Spanish (Venezuela)" +HKCR,"MIME\Database\Rfc1766","240A",0x00000000,"es-co;Spanish (Colombia)" +HKCR,"MIME\Database\Rfc1766","280A",0x00000000,"es-pe;Spanish (Peru)" +HKCR,"MIME\Database\Rfc1766","2C0A",0x00000000,"es-ar;Spanish (Argentina)" +HKCR,"MIME\Database\Rfc1766","300A",0x00000000,"es-ec;Spanish (Ecuador)" +HKCR,"MIME\Database\Rfc1766","340A",0x00000000,"es-cl;Spanish (Chile)" +HKCR,"MIME\Database\Rfc1766","380A",0x00000000,"es-uy;Spanish (Uruguay)" +HKCR,"MIME\Database\Rfc1766","3C0A",0x00000000,"es-py;Spanish (Paraguay)" +HKCR,"MIME\Database\Rfc1766","400A",0x00000000,"es-bo;Spanish (Bolivia)" +HKCR,"MIME\Database\Rfc1766","440A",0x00000000,"es-sv;Spanish (El Salvador)" +HKCR,"MIME\Database\Rfc1766","480A",0x00000000,"es-hn;Spanish (Honduras)" +HKCR,"MIME\Database\Rfc1766","4C0A",0x00000000,"es-ni;Spanish (Nicaragua)" +HKCR,"MIME\Database\Rfc1766","500A",0x00000000,"es-pr;Spanish (Puerto Rico)" +HKCR,"MIME\Database\Rfc1766","0430",0x00000000,"sx;Sutu" +HKCR,"MIME\Database\Rfc1766","041D",0x00000000,"sv;Swedish" +HKCR,"MIME\Database\Rfc1766","081D",0x00000000,"sv-fi;Swedish (Finland)" +HKCR,"MIME\Database\Rfc1766","041E",0x00000000,"th;Thai" +HKCR,"MIME\Database\Rfc1766","0431",0x00000000,"ts;Tsonga" +HKCR,"MIME\Database\Rfc1766","0432",0x00000000,"tn;Tswana" +HKCR,"MIME\Database\Rfc1766","041F",0x00000000,"tr;Turkish" +HKCR,"MIME\Database\Rfc1766","0422",0x00000000,"uk;Ukrainian" +HKCR,"MIME\Database\Rfc1766","0420",0x00000000,"ur;Urdu" +HKCR,"MIME\Database\Rfc1766","042A",0x00000000,"vi;Vietnamese" +HKCR,"MIME\Database\Rfc1766","0434",0x00000000,"xh;Xhosa" +HKCR,"MIME\Database\Rfc1766","043D",0x00000000,"ji;Yiddish" +HKCR,"MIME\Database\Rfc1766","0435",0x00000000,"zu;Zulu" + ; EOF _____ Modified: branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf --- branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/bootdata/hivesys.inf 2005-03-22 20:15:04 UTC (rev 14272) @@ -257,10 +257,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys " -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070000,"Posix Os2" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070000,"Debug Windows" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" ; 3Com 3c905 Driver @@ -674,8 +674,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ErrorControl",0x0001000 1,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Group",0x00000000,"Base " HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000," system32\drivers\serial.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x00 000004 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x0000 0001 +;hard coded values +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"AC PI\PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001 ,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x0 0010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\0000","Service",0x0000 0000,"serial" ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001 _____ Modified: branches/cache_manager_rewrite/reactos/bootdata/icon.ico (Binary files differ) _____ Modified: branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff --- branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/bootdata/packages/reactos.dff 2005-03-22 20:15:04 UTC (rev 14272) @@ -99,6 +99,7 @@ lib\msacm\msacm32.dll 1 lib\msafd\msafd.dll 1 lib\msgina\msgina.dll 1 +lib\msi\msi.dll 1 lib\msimg32\msimg32.dll 1 lib\msvcrt\msvcrt.dll 1 lib\msvcrt20\msvcrt20.dll 1 @@ -108,6 +109,7 @@ lib\oleaut32\oleaut32.dll 1 lib\olepro32\olepro32.dll 1 lib\psapi\psapi.dll 1 +lib\riched20\riched20.dll 1 lib\richedit\riched32.dll 1 lib\rpcrt4\rpcrt4.dll 1 lib\samlib\samlib.dll 1 @@ -147,11 +149,13 @@ subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1 subsys\system\format\format.exe 1 +subsys\system\ibrowser\ibrowser.exe 1 +subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 -subsys\system\regedt32\regedt32.exe 1 subsys\system\regsvr32\regsvr32.exe 1 subsys\system\reporterror\reporterror.exe 1 +subsys\system\rundll32\rundll32.exe 1 subsys\system\services\services.exe 1 subsys\system\setup\setup.exe 1 subsys\system\taskmgr\taskmgr.exe 1 _____ Modified: branches/cache_manager_rewrite/reactos/config --- branches/cache_manager_rewrite/reactos/config 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/config 2005-03-22 20:15:04 UTC (rev 14272) @@ -5,14 +5,13 @@ # Possible values in the future: alpha,i386,m68k,mips,powerpc ARCH := i386 - # -# 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 := i486 @@ -28,26 +27,11 @@ DBG := 0 # -# Whether to compile with optimizations -# -OPTIMIZED := 0 - -# # Whether to compile a multiprocessor or single processor version # CONFIG_SMP := 0 # -# Whether to compile for ACPI compliant systems -# -ACPI := 0 - -# -# whether to use a 3GB User, 1GB Kernel memory map -# -3GB := 0 - -# # Which version of NDIS do we support up to? # #NDISVERSION=NDIS50 _____ Modified: branches/cache_manager_rewrite/reactos/doc/README.WINE --- branches/cache_manager_rewrite/reactos/doc/README.WINE 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/doc/README.WINE 2005-03-22 20:15:04 UTC (rev 14272) @@ -26,52 +26,55 @@ work to import a new dll. The following build tools are derived from Wine. +reactos/tools/unicode # Synced to Wine-20050310 +reactos/tools/wpp # Synced to Wine-20050310 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050211 +reactos/tools/winebuild # Synced to Wine-20050310 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050211 +reactos/tools/wrc # Synced to Wine-20050310 +reactos/tools/widl # Synced to Wine-20050310 The following shared libraries are a 100% port from Winehq sources. -reactos/lib/cabinet # Synced to Wine-20050211 -reactos/lib/comctl32 # Synced to Wine-20050211 -reactos/lib/comdlg32 # Synced to Wine-20050211 -reactos/lib/dinput # Synced to Wine-20050211 -reactos/lib/dinput8 # Synced to Wine-20050211 -reactos/lib/icmp # Synced to Wine-20050211 +reactos/lib/cabinet # Synced to Wine-20050310 +reactos/lib/comctl32 # Synced to Wine-20050310 +reactos/lib/comdlg32 # Synced to Wine-20050310 +reactos/lib/dinput # Synced to Wine-20050310 +reactos/lib/dinput8 # Synced to Wine-20050310 +reactos/lib/icmp # Synced to Wine-20050310 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050211 +reactos/lib/mpr # Synced to Wine-20050310 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050211 -reactos/lib/msi # Synced to Wine-20050211 +reactos/lib/msimg32 # Synced to Wine-20050310 +reactos/lib/msi # Synced to Wine-20050310 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050211 -reactos/lib/oleaut32 # Synced to Wine-20050211 -reactos/lib/oledlg # Synced to Wine-20050211 -reactos/lib/olepro32 # Synced to Wine-20050211 -reactos/lib/richedit # Synced to Wine-20050211 -reactos/lib/rpcrt4 # Synced to Wine-20050211 -reactos/lib/setupapi # Synced to Wine-20050125 # CVS -reactos/lib/shell32 # Synced to Wine-20050211 -reactos/lib/shdocvw # Synced to Wine-20050211 -reactos/lib/shlwapi # Synced to Wine-20050211 +reactos/lib/ole32 # Synced to Wine-20050310 +reactos/lib/oleaut32 # Synced to Wine-20050310 +reactos/lib/oledlg # Synced to Wine-20050310 +reactos/lib/olepro32 # Synced to Wine-20050310 +reactos/lib/riched20 # Synced to Wine-20050310 +reactos/lib/richedit # Synced to Wine-20050310 +reactos/lib/rpcrt4 # Synced to Wine-20050310 +reactos/lib/setupapi # Synced to Wine-20050310 +reactos/lib/shell32 # Synced to Wine-20050310 +reactos/lib/shdocvw # Synced to Wine-20050310 +reactos/lib/shlwapi # Synced to Wine-20050310 reactos/lib/twain # Out of sync -reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20050211 -reactos/lib/urlmon # Synced to Wine-20050211 +reactos/lib/urlmon # Synced to Wine-20050310 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050211 -reactos/lib/winmm/midimap # Synced to Wine-20050211 -reactos/lib/winmm/wavemap # Synced to Wine-20050211 +reactos/lib/winmm # Synced to Wine-20050310 +reactos/lib/winmm/midimap # Synced to Wine-20050310 +reactos/lib/winmm/wavemap # Synced to Wine-20050310 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050211 +reactos/subsys/system/msiexec # Synced to Wine-20050311 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files _____ Copied: branches/cache_manager_rewrite/reactos/doc/irp cancel boilerplate.c (from rev 13860, trunk/reactos/doc/irp cancel boilerplate.c) --- trunk/reactos/doc/irp cancel boilerplate.c 2005-03-06 21:01:04 UTC (rev 13860) +++ branches/cache_manager_rewrite/reactos/doc/irp cancel boilerplate.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -0,0 +1,103 @@ + + +/* +Boiler plate for irp cancelation, for irp queues you manage yourself +-Gunnar +*/ + + + +CancelRoutine( + DEV_OBJ Dev, + Irp + ) +{ + //don't need this since we have our own sync. protecting irp cancellation + IoReleaseCancelSpinLock(Irp->CancelIrql); + + theLock = Irp->Tail.Overlay.DriverContext[3]; + + Lock(theLock); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} + + +QUEUE_BOLIERPLATE +{ + Lock(theLock); + + Irp->Tail.Overlay.DriverContext[3] = &theLock; + + IoSetCancelRoutine(Irp, CancelRoutine); + if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) + { + /* + Irp has already been cancelled (before we got to queue it), + and we got to remove the cancel routine before the canceler could, + so we cancel/complete the irp ourself. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return FALSE; + } + + //else were ok + + + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + + InsertTailList(Queue); + + Unlock(theLock); + +} + + +DEQUEUE_BOILERPLATE +{ + Lock(theLock); + + Irp = RemoveHeadList(Queue); + + if (!IoSetCancelRoutine(Irp, NULL)) + { + /* + Cancel routine WILL be called after we release the spinlock. It will try to remove + the irp from the list and cancel/complete this irp. Since we allready removed it, + make its ListEntry point to itself. + */ + + InitializeListHead(&Irp->Tail.Overlay.ListEntry); + + Unlock(theLock); + + return; + } + + + /* + Cancel routine will NOT be called, canceled or not. + The Irp might have been canceled (Irp->Cancel flag set) but we don't care, + since we are to complete this Irp now anyways. + */ + + Unlock(theLock); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +} _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/fdo.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -60,12 +60,7 @@ L"ACPI\\%S", Node->device.id.hid); - if (!AcpiCreateUnicodeString(DeviceID, Buffer, PagedPool)) - { - return FALSE; - } - - return TRUE; + return AcpiCreateUnicodeString(DeviceID, Buffer, PagedPool); } @@ -108,8 +103,15 @@ AcpiCreateInstanceIDString(PUNICODE_STRING InstanceID, BM_NODE *Node) { - /* FIXME: Create unique instnce id. */ - return AcpiCreateUnicodeString(InstanceID, L"0000", PagedPool); + WCHAR Buffer[10]; + + if (Node->device.id.uid[0]) + swprintf(Buffer, L"%S", Node->device.id.uid); + else + /* FIXME: Generate unique id! */ + swprintf(Buffer, L"0000"); + + return AcpiCreateUnicodeString(InstanceID, Buffer, PagedPool); } @@ -126,7 +128,7 @@ ANSI_STRING AnsiString; ACPI_STATUS AcpiStatus; PACPI_DEVICE Device; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BM_NODE *Node; ULONG Size; ULONG i; _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/ospm/osl.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -601,5 +601,5 @@ u32 acpi_os_get_thread_id (void) { - return (ULONG)PsGetCurrentThreadId(); + return (ULONG)PsGetCurrentThreadId() + 1; } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/tables/tbget.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/tables/tbget.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/tables/tbget.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -503,7 +503,7 @@ REPORT_ERROR (("Invalid signature where RSDP indicates %s should be located\n", table_signature)); - return (status); + return (AE_NO_ACPI_TABLES); } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/bus/acpi/utils/cmglobal.c --- branches/cache_manager_rewrite/reactos/drivers/bus/acpi/utils/cmglobal.c 2005-03-22 20:16:41 UTC (rev 14271) +++ branches/cache_manager_rewrite/reactos/drivers/bus/acpi/utils/cmglobal.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -389,6 +389,7 @@ acpi_gbl_acpi_mutex_info[i].mutex = NULL; acpi_gbl_acpi_mutex_info[i].locked = FALSE; acpi_gbl_acpi_mutex_info[i].use_count = 0; + acpi_gbl_acpi_mutex_info[i].owner_id = 0; } /* Global notify handlers */ _____ Copied: branches/cache_manager_rewrite/reactos/drivers/dd/serial/circularbuffer. c (from rev 14180, trunk/reactos/drivers/dd/serial/circularbuffer.c) _____ Copied: branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c (from rev 14080, trunk/reactos/drivers/dd/serial/cleanup.c) --- trunk/reactos/drivers/dd/serial/cleanup.c 2005-03-14 22:38:12 UTC (rev 14080) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -0,0 +1,24 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/cleanup.c + * PURPOSE: Serial IRP_MJ_CLEANUP operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Serial: IRP_MJ_CLEANUP\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} Property changes on: branches/cache_manager_rewrite/reactos/drivers/dd/serial/cleanup.c ___________________________________________________________________ Name: svn:eol-style + native _____ Copied: branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c (from rev 14080, trunk/reactos/drivers/dd/serial/close.c) --- trunk/reactos/drivers/dd/serial/close.c 2005-03-14 22:38:12 UTC (rev 14080) +++ branches/cache_manager_rewrite/reactos/drivers/dd/serial/close.c 2005-03-22 20:15:04 UTC (rev 14272) @@ -0,0 +1,29 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/close.c + * PURPOSE: Serial IRP_MJ_CLOSE operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG [truncated at 1000 lines; 142972 more skipped]

1 0

[hpoussin] 14271: Christoph von Wittich <Christoph@ApiViewer.de>
by hpoussin＠svn.reactos.com 22 Mar '05

22 Mar '05

Christoph von Wittich <Christoph(a)ApiViewer.de> - Extract hard-coded english sentences from settings.c and put them into resources - Add corresponding german translations - Correct some control locations in german and english resource files - Show only resolutions >= 640x480 Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/en.rc Modified: trunk/reactos/lib/cpl/desk/resource.h Modified: trunk/reactos/lib/cpl/desk/settings.c _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-03-22 19:32:17 UTC (rev 14270) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-03-22 20:16:41 UTC (rev 14271) @@ -1,4 +1,4 @@ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -9,13 +9,13 @@ 150,105,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,139,173,71 - LTEXT "Wõhle ein Bild um es als Desktop Hintergrund zu nutzen:", + WS_BORDER | WS_TABSTOP,7,139,170,71 + LTEXT "Hintergrundbild:", IDC_STATIC,8,127,180,8 - PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,187,175,50,14 - PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,187,195,50,14 - LTEXT "Ausrichtung:",IDC_STATIC,187,138,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,181,175,60,14 + PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,181,195,60,14 + LTEXT "Ausrichtung:",IDC_STATIC,181,138,45,8 + COMBOBOX IDC_PLACEMENT_COMBO,181,148,60,90,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -42,8 +42,20 @@ CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 110,112,8 + LTEXT "&Anzeige:",1820,3,140,30,8 + LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "Bi&ldschirmaufl÷sung",1818,3,160,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 32,170,60,17 + LTEXT "Niedrig",1815,9,170,25,8,NOT WS_GROUP + LTEXT "Hoch",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Farbqualitõt",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,188,103,9 + PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,205,56,14 END STRINGTABLE @@ -56,3 +68,13 @@ IDS_STRETCH "Gestreckt" IDS_TILE "Nebeneinander" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 Farben" + IDS_COLOR_8BIT "256 Farben" + IDS_COLOR_16BIT "High Color (16 Bit)" + IDS_COLOR_32BIT "True Color (24 Bit)" + IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_PIXEL "%lux%lu Pixel" +END _____ Modified: trunk/reactos/lib/cpl/desk/en.rc --- trunk/reactos/lib/cpl/desk/en.rc 2005-03-22 19:32:17 UTC (rev 14270) +++ trunk/reactos/lib/cpl/desk/en.rc 2005-03-22 20:16:41 UTC (rev 14271) @@ -1,4 +1,4 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION @@ -49,7 +49,7 @@ 30,170,58,17 LTEXT "Less",1815,9,170,15,8,NOT WS_GROUP LTEXT "More",1816,93,170,21,8,NOT WS_GROUP - LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Colors",1817,125,160,115,43 COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP @@ -69,3 +69,12 @@ IDS_TILE "Tile" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 Colors" + IDS_COLOR_8BIT "256 Colors" + IDS_COLOR_16BIT "High Color (16 Bit)" + IDS_COLOR_32BIT "True Color (24 Bit)" + IDS_COLOR_32BIT "True Color (32 Bit)" + IDS_PIXEL "%lux%lu Pixel" +END _____ Modified: trunk/reactos/lib/cpl/desk/resource.h --- trunk/reactos/lib/cpl/desk/resource.h 2005-03-22 19:32:17 UTC (rev 14270) +++ trunk/reactos/lib/cpl/desk/resource.h 2005-03-22 20:16:41 UTC (rev 14271) @@ -42,5 +42,14 @@ #define IDC_SETTINGS_RESOLUTION_TEXT 204 #define IDC_SETTINGS_ADVANCED 205 +/* Settings Page */ + +#define IDS_PIXEL 2301 + +#define IDS_COLOR_4BIT 2904 +#define IDS_COLOR_8BIT 2908 +#define IDS_COLOR_16BIT 2916 +#define IDS_COLOR_32BIT 2932 + #endif /* __CPL_DESK_RESOURCE_H__ */ _____ Modified: trunk/reactos/lib/cpl/desk/settings.c --- trunk/reactos/lib/cpl/desk/settings.c 2005-03-22 19:32:17 UTC (rev 14270) +++ trunk/reactos/lib/cpl/desk/settings.c 2005-03-22 20:16:41 UTC (rev 14271) @@ -13,8 +13,10 @@ #include <commctrl.h> #include <stdio.h> #include <tchar.h> +#include <cpl.h> #include "resource.h" +#include "desk.h" /* As slider control can't contain user data, we have to keep an * array of RESOLUTION_INFO to have our own associated data. @@ -54,9 +56,11 @@ UpdateDisplay(IN HWND hwndDlg) { TCHAR Buffer[64]; + TCHAR Pixel[64]; DWORD index; - _stprintf(Buffer, TEXT("%lux%lu"), CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight); + LoadString(hApplet, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); + _stprintf(Buffer, Pixel, CurrentDisplayDevice->CurrentSettings->dmPelsWidth, CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); for (index = 0; index < CurrentDisplayDevice->ResolutionsCount; index++) @@ -66,8 +70,8 @@ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_SETPOS, TRUE, index); break; } - _stprintf(Buffer, TEXT("%d bits"), CurrentDisplayDevice->CurrentSettings->dmBitsPerPel); - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); + if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); } static PSETTINGS_ENTRY @@ -94,8 +98,16 @@ /* List all settings */ devmode.dmSize = (WORD)sizeof(DEVMODE); devmode.dmDriverExtra = 0; - while (EnumDisplaySettingsEx(DeviceName, NbSettings, &devmode, dwFlags)) + while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { + + if (devmode.dmPelsWidth < 640 || + devmode.dmPelsHeight < 480) + { + iMode++; + continue; + } + Current = HeapAlloc(GetProcessHeap(), 0, sizeof(SETTINGS_ENTRY)); if (Current != NULL) { @@ -225,12 +237,14 @@ for (Current = pDeviceEntry->Settings; Current != NULL; Current = Current->Flink) { TCHAR Buffer[64]; - _stprintf(Buffer, TEXT("%d bits"), Current->dmBitsPerPel); - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); - if (index == CB_ERR) + if (LoadString(hApplet, (2900 + Current->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) { - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SETITEMDATA, index, Current->dmBitsPerPel); + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + if (index == CB_ERR) + { + index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SETITEMDATA, index, Current->dmBitsPerPel); + } } }

1 0

[gvg] 14270: Forgotten file in r13928
by gvg＠svn.reactos.com 22 Mar '05

22 Mar '05

Forgotten file in r13928 Added: trunk/reactos/lib/cpl/sysdm/dk.rc _____ Added: trunk/reactos/lib/cpl/sysdm/dk.rc --- trunk/reactos/lib/cpl/sysdm/dk.rc 2005-03-22 17:46:44 UTC (rev 14269) +++ trunk/reactos/lib/cpl/sysdm/dk.rc 2005-03-22 19:32:17 UTC (rev 14270) @@ -0,0 +1,137 @@ +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generelt" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Operativsystem:",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_CO LUMN-PROPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3), PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Version: " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Computer:",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-P ROPSHEETPADDING,8 + LTEXT "Processor Forhandler:",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LA BELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Processor Navn:",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHE ETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Processor Hastighed:",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Hukommelse:",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TAB STOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Netvµrks Identifikation" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Reactos bruger f°lgende informationer til at identificere din computer pÕ netvµrket.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Dit Fulde Computer Navn:",-1,PROPSHEETPADDING,LABELLINE(4)-4,PROPSHEETWIDTH-(6*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(4)-4 + LTEXT "",IDC_COMPUTERNAME,120,LABELLINE(4)-5,PROPSHEETWIDTH-(6*PROPSHEETPADDIN G)-ICONSIZE,LABELLINE(4)-5 + LTEXT "Arbejdsgruppe:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,PRO PSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "",IDC_WORKGROUPDOMAIN_NAME,120,LABELLINE(6)-6,PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(6)-6 + LTEXT "For at bruge Netvµrks Identfications Guiden til at melde in et et domµne eller oprette en lokal bruger, Klik pÕ Netvµrks ID.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPADD ING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Netvµrks ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 + LTEXT "For at omd°be denne computer eller for at melde ind i et Domµne, Klik pÕ Egenskaber.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PROP SHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Egenskaber...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE(1 )+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Hardware Guide",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDI NG),LABELLINE(6)+PROPSHEETPADDING + LTEXT "Hardware Guiden hjµlper dig med at Installer, Afinstaller, Reparerer, Afmontere, Fjerne, og konfigurer din hardware.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Hardware Guide...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABEL LINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "EnhedshÕntering",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*P ROPSHEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "EnhedshÕntering viser alle dine hardware enheder installeret pÕ din computer. Brug EnhedshÕntering til at skifte indstillinger for alle Hardware Enheder.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&EnhedshÕntering...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PRO PSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Hardware Profiler",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Hardware Profiler Giver dig en mulighed for at sµtte og gemme forskellinge hardware indstillinger.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEE TWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Hard&ware Profiler...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),L ABELLINE(20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Bruger Profiler" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Bruger Profiler indeholde skrivebords indstillinger og andre informationer relateret til dit login. En Anden bruger profil bliver oprette pÕ alle computere du logger pÕ, eller du kan vµlge en Roaming profil some er den samme pÕ alle computer du logger pÕ.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-(6*PRO PSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Bruger Profiler gemt pÕ denne computer:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHEETP ADDING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE + + PUSHBUTTON "&Slet",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELLI NE(1)+2 + PUSHBUTTON "Skift &Type...",IDC_USERPROFILE_CHANGE,95,LABELLINE(20),60,LABELLINE(1)+2 + PUSHBUTTON "&Kopiere Til...",IDC_USERPROFILE_COPY,180,LABELLINE(20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avanceret" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Hukommelses Indstillinger",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSH EETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Hukommelses indstillingerne styrer programmers brug af hukommelse, hvilket pÕvirker hastigheden af din computer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Hukommelses indstillinger...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELL INE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Milj° Variabler",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Milj° Variabler fortµller din computer hvor den kan finde forskellige typer af informationer.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHE ETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(11) + PUSHBUTTON "&Milj° Variabler...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE( 12)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&Opstart og Gendannelse",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Opstart og Gendannelse fortµller din computer hvordan den skal starte og hvad den skal g°re hvis en kritisk fejl opstÕr som fÕr din computer til at stoppe.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Opstart og Gendannelse...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLIN E(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Milj° Variabler" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Brugere Variabler",-1,7,12,238,100 + LTEXT "&Variabler:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_S HOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS _TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Ny...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Redigere...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Slet",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "System Variabler",-1,7,116,238,100 + LTEXT "V&ariabler:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS _SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL| WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "N&y...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "R&edigere...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "S&let",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Fortryd",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Redigere Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Navn:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "&Indhold:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Fortryd",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "System Indstillinger" + IDS_CPLSYSTEMDESCRIPTION "Se mere information omkring din computer, og skift diverse system og hardware indstillinger." +END Property changes on: trunk/reactos/lib/cpl/sysdm/dk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[weiden] 14269: forgot this file
by weiden＠svn.reactos.com 22 Mar '05

22 Mar '05

forgot this file Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-03-22 17:32:15 UTC (rev 14268) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-03-22 17:46:44 UTC (rev 14269) @@ -667,7 +667,6 @@ InitializeListHead(&Process->ThreadListHead); ExReleaseFastMutex(&PspActiveProcessMutex); - ExInitializeFastMutex(&Process->TebLock); Process->Pcb.State = PROCESS_STATE_ACTIVE; /*

1 0

[weiden] 14268: fixed a few race conditions during thread/process termination leading to dead-locks
by weiden＠svn.reactos.com 22 Mar '05

22 Mar '05

fixed a few race conditions during thread/process termination leading to dead-locks Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ps/create.c Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-22 17:17:02 UTC (rev 14267) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-03-22 17:32:15 UTC (rev 14268) @@ -428,7 +428,6 @@ */ MADDRESS_SPACE AddressSpace; LIST_ENTRY ProcessListEntry; - FAST_MUTEX TebLock; PVOID TebBlock; PVOID TebLastAllocated; }; _____ Modified: trunk/reactos/ntoskrnl/ps/create.c --- trunk/reactos/ntoskrnl/ps/create.c 2005-03-22 17:17:02 UTC (rev 14267) +++ trunk/reactos/ntoskrnl/ps/create.c 2005-03-22 17:32:15 UTC (rev 14268) @@ -166,7 +166,7 @@ else { Process = Thread->ThreadsProcess; - ExAcquireFastMutex(&Process->TebLock); + PsLockProcess(Process, FALSE); if (NULL == Process->TebBlock || Process->TebBlock == Process->TebLastAllocated) { @@ -180,7 +180,7 @@ PAGE_READWRITE); if (! NT_SUCCESS(Status)) { - ExReleaseFastMutex(&Process->TebLock); + PsUnlockProcess(Process); DPRINT1("Failed to reserve virtual memory for TEB\n"); return Status; } @@ -199,7 +199,7 @@ return Status; } Process->TebLastAllocated = TebBase; - ExReleaseFastMutex(&Process->TebLock); + PsUnlockProcess(Process); } DPRINT ("TebBase %p TebSize %lu\n", TebBase, TebSize); _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 17:17:02 UTC (rev 14267) +++ trunk/reactos/ntoskrnl/ps/kill.c 2005-03-22 17:32:15 UTC (rev 14268) @@ -101,9 +101,9 @@ /* Make sure it didn't already terminate */ if (!Thread->HasTerminated) { - + Thread->HasTerminated = TRUE; - + /* Terminate it by APC */ PspTerminateThreadByPointer(Thread, ExitStatus); } @@ -143,7 +143,7 @@ PETHREAD Thread = (PETHREAD)ObjectBody; PEPROCESS Process = Thread->ThreadsProcess; - DPRINT("PiDeleteThread(ObjectBody %x)\n",ObjectBody); + DPRINT("PiDeleteThread(ObjectBody 0x%x, process 0x%x)\n",ObjectBody, Thread->ThreadsProcess); /* Deassociate the Process */ Thread->ThreadsProcess = NULL; @@ -179,12 +179,15 @@ PVOID TebBlock; PTERMINATION_PORT TerminationPort; - DPRINT("PsTerminateCurrentThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); + DPRINT("PspExitThread(ExitStatus %x), Current: 0x%x\n", ExitStatus, PsGetCurrentThread()); /* Get the Current Thread and Process */ CurrentThread = PsGetCurrentThread(); - CurrentThread->HasTerminated = TRUE; CurrentProcess = CurrentThread->ThreadsProcess; + + /* Set the Exit Status and Exit Time */ + CurrentThread->ExitStatus = ExitStatus; + KeQuerySystemTime(&CurrentThread->ExitTime); /* Can't terminate a thread if it attached another process */ if (KeIsAttachedProcess()) { @@ -198,16 +201,15 @@ /* Lower to Passive Level */ KeLowerIrql(PASSIVE_LEVEL); + /* Lock the Process before we modify its thread entries */ + PsLockProcess(CurrentProcess, FALSE); + + /* wake up the thread so we don't deadlock on PsLockProcess */ + KeForceResumeThread(&CurrentThread->Tcb); + /* Run Thread Notify Routines before we desintegrate the thread */ PspRunCreateThreadNotifyRoutines(CurrentThread, FALSE); - - /* Set the Exit Status and Exit Time */ - CurrentThread->ExitStatus = ExitStatus; - KeQuerySystemTime(&CurrentThread->ExitTime); - /* Lock the Process before we modify its thread entries */ - PsLockProcess(CurrentProcess, FALSE); - /* Remove the thread from the thread list of its process */ RemoveEntryList(&CurrentThread->ThreadListEntry); Last = IsListEmpty(&CurrentProcess->ThreadListHead); @@ -250,36 +252,31 @@ PsTerminateWin32Thread(CurrentThread); if (Last) PsTerminateWin32Process(CurrentProcess); - /* Cancel I/O for the thread. */ - IoCancelThreadIo(CurrentThread); - /* Rundown Registry Notifications. TODO (refers to NtChangeNotify, not Cm callbacks) */ //CmNotifyRunDown(CurrentThread); - + /* Free the TEB */ if(CurrentThread->Tcb.Teb) { - + DPRINT("Decommit teb at %p\n", CurrentThread->Tcb.Teb); - ExAcquireFastMutex(&CurrentProcess->TebLock); TebBlock = MM_ROUND_DOWN(CurrentThread->Tcb.Teb, MM_VIRTMEM_GRANULARITY); - + ZwFreeVirtualMemory(NtCurrentProcess(), (PVOID *)&CurrentThread->Tcb.Teb, &Length, MEM_DECOMMIT); - + DPRINT("teb %p, TebBlock %p\n", CurrentThread->Tcb.Teb, TebBlock); - + if (TebBlock != CurrentProcess->TebBlock || CurrentProcess->TebBlock == CurrentProcess->TebLastAllocated) { - + MmLockAddressSpace(&CurrentProcess->AddressSpace); MmReleaseMemoryAreaIfDecommitted(CurrentProcess, &CurrentProcess->AddressSpace, TebBlock); MmUnlockAddressSpace(&CurrentProcess->AddressSpace); } - + CurrentThread->Tcb.Teb = NULL; - ExReleaseFastMutex(&CurrentProcess->TebLock); } /* The last Thread shuts down the Process */ @@ -288,6 +285,9 @@ /* Unlock the Process */ PsUnlockProcess(CurrentProcess); + /* Cancel I/O for the thread. */ + IoCancelThreadIo(CurrentThread); + /* Rundown Timers */ ExTimerRundown(); KeCancelTimer(&CurrentThread->Tcb.Timer); @@ -318,7 +318,7 @@ { NTSTATUS ExitStatus = (NTSTATUS)Apc->NormalContext; - DPRINT("PsExitSpecialApc called: 0x%x\n", PsGetCurrentThread()); + DPRINT("PsExitSpecialApc called: 0x%x (proc: 0x%x)\n", PsGetCurrentThread(), PsGetCurrentProcess()); /* Free the APC */ ExFreePool(Apc); @@ -396,7 +396,7 @@ STDCALL PspExitProcess(PEPROCESS Process) { - DPRINT("PspExitProcess\n"); + DPRINT("PspExitProcess 0x%x\n", Process); PspRunCreateProcessNotifyRoutines(Process, FALSE); @@ -421,25 +421,31 @@ { NTSTATUS Status; PEPROCESS Process; + PETHREAD CurrentThread; + BOOLEAN KillByHandle; PAGED_CODE(); DPRINT("NtTerminateProcess(ProcessHandle %x, ExitStatus %x)\n", ProcessHandle, ExitStatus); + KillByHandle = (ProcessHandle != NULL); + /* Get the Process Object */ - Status = ObReferenceObjectByHandle(ProcessHandle, + Status = ObReferenceObjectByHandle((KillByHandle ? ProcessHandle : NtCurrentProcess()), PROCESS_TERMINATE, PsProcessType, KeGetPreviousMode(), (PVOID*)&Process, NULL); if (!NT_SUCCESS(Status)) { - + DPRINT1("Invalid handle to Process\n"); return(Status); } + CurrentThread = PsGetCurrentThread(); + PsLockProcess(Process, FALSE); if(Process->ExitTime.QuadPart != 0) @@ -450,36 +456,43 @@ /* Terminate all the Process's Threads */ PspTerminateProcessThreads(Process, ExitStatus); - - /* Only master thread remains... kill it off */ - if (PsGetCurrentThread()->ThreadsProcess == Process) { - + + /* only kill the calling thread if it either passed a process handle or + NtCurrentProcess() */ + if (KillByHandle) { + /* set the exit time as we're about to release the process lock before we kill ourselves to prevent threads outside of our process trying to kill us */ KeQuerySystemTime(&Process->ExitTime); - - PsUnlockProcess(Process); - - /* we can safely dereference the process because the current thread - holds a reference to it until it gets reaped */ - ObDereferenceObject(Process); - - /* now the other threads get a chance to terminate, we don't wait but - just kill ourselves right now. The process will be run down when the - last thread terminates */ - PspExitThread(ExitStatus); - - /* we should never reach this point! */ - KEBUGCHECK(0); + /* Only master thread remains... kill it off */ + if (CurrentThread->ThreadsProcess == Process) { + + /* mark our thread as terminating so attempts to terminate it, when + unlocking the process, fail */ + CurrentThread->HasTerminated = TRUE; + + PsUnlockProcess(Process); + + /* we can safely dereference the process because the current thread + holds a reference to it until it gets reaped */ + ObDereferenceObject(Process); + + /* now the other threads get a chance to terminate, we don't wait but + just kill ourselves right now. The process will be run down when the + last thread terminates */ + + PspExitThread(ExitStatus); + + /* we should never reach this point! */ + KEBUGCHECK(0); + } } - else - { - /* unlock and dereference the process so the threads can kill themselves */ - PsUnlockProcess(Process); - ObDereferenceObject(Process); - } + + /* unlock and dereference the process so the threads can kill themselves */ + PsUnlockProcess(Process); + ObDereferenceObject(Process); return(STATUS_SUCCESS); } @@ -501,7 +514,7 @@ KeGetPreviousMode(), (PVOID*)&Thread, NULL); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("Could not reference thread object\n"); return(Status); @@ -518,15 +531,27 @@ /* Check to see if we're running in the same thread */ if (Thread != PsGetCurrentThread()) { - /* This isn't our thread, check if it's terminated already */ + /* we need to lock the process to make sure it's not already terminating */ + PsLockProcess(Thread->ThreadsProcess, FALSE); + + /* This isn't our thread, terminate it if not already done */ if (!Thread->HasTerminated) { + Thread->HasTerminated = TRUE; + /* Terminate it */ PspTerminateThreadByPointer(Thread, ExitStatus); - } + } + PsUnlockProcess(Thread->ThreadsProcess); + + /* Dereference the Thread and return */ + ObDereferenceObject(Thread); + } else { + Thread->HasTerminated = TRUE; + /* it's safe to dereference thread, there's at least the keep-alive reference which will be removed by the thread reaper causing the thread to be finally destroyed */ @@ -539,8 +564,6 @@ KEBUGCHECK(0); } - /* Dereference the Thread and return */ - ObDereferenceObject(Thread); return(STATUS_SUCCESS); }

1 0

[royce] 14266: forgot this file
by royce＠svn.reactos.com 22 Mar '05

22 Mar '05

forgot this file Added: branches/xmlbuildsystem/reactos/lib/lib.mak _____ Added: branches/xmlbuildsystem/reactos/lib/lib.mak --- branches/xmlbuildsystem/reactos/lib/lib.mak 2005-03-22 07:25:53 UTC (rev 14265) +++ branches/xmlbuildsystem/reactos/lib/lib.mak 2005-03-22 07:29:02 UTC (rev 14266) @@ -0,0 +1,4 @@ +LIB_BASE = lib +LIB_BASE_ = $(LIB_BASE)$(SEP) + +include $(LIB_BASE_)zlib/zlib.mak

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs