Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29244: - Fix multiple bugs in RtlWalkFrameChain and secure it against any possibility of a bugcheck while walking the stack. - Fix bugs in RtlUnwind and RtlExceptionDispatch which assumed the DPC stack size was 4KB instead of 12KB. - Fix multiple bugs in RtlpGetStackLimits and seure it against bugchecks. Properly detect DPC or invalid stacks. - PsConvertToGuiThread should acquire a guarded region, not a critical section, to stop all APCs. - Fix bug in bugzilla reporting which was maki
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 17:07:43 2007 New Revision: 29244 URL: http://svn.reactos.org/svn/reactos?rev=29244&view=rev Log: - Fix multiple bugs in RtlWalkFrameChain and secure it against any possibility of a bugcheck while walking the stack. - Fix bugs in RtlUnwind and RtlExceptionDispatch which assumed the DPC stack size was 4KB instead of 12KB. - Fix multiple bugs in RtlpGetStackLimits and seure it against bugchecks. Properly detect DPC or invalid stacks. - PsConvertToGuiThread should acquire a guarded region, not a critical section, to stop all APCs. - Fix bug in bugzilla reporting which was making things crash. - Unlock address space before raising to HIGH_LEVEL in KeBugCheck. - Display blue screen at APC_LEVEL, to avoid the assertion in procobj.c when trying to attach to csrss. This should fix the recursive bugchecking when the GUI is up, and also take down the GUI properly. The fix is a hack. - Fix bogus implementation of IoGetStackLimits and make it work properly. - Make MmCreateKernelStack return the base of the stack, not the limit, and fix all callers appropriately. - Remove svn:needs-lock properties of various files, whose contents either changes too often or whose contents is definately clean. Bugreports and information - by Alex. Modified: trunk/reactos/lib/rtl/exception.c trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ke/bug.c (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/abios.c (props changed) trunk/reactos/ntoskrnl/ke/i386/exp.c (props changed) trunk/reactos/ntoskrnl/ke/i386/kiinit.c (contents, props changed) trunk/reactos/ntoskrnl/ke/i386/ldt.c (props changed) trunk/reactos/ntoskrnl/ke/i386/thrdini.c (props changed) trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/ntoskrnl/rtl/libsupp.c (contents, props changed) trunk/reactos/ntoskrnl/rtl/misc.c (props changed) trunk/reactos/ntoskrnl/rtl/strtok.c (props changed) Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=29… ============================================================================== --- trunk/reactos/lib/rtl/exception.c (original) +++ trunk/reactos/lib/rtl/exception.c Thu Sep 27 17:07:43 2007 @@ -122,12 +122,11 @@ IN ULONG Count, IN ULONG Flags) { - PULONG Stack, NewStack; + ULONG_PTR Stack, NewStack, StackBegin, StackEnd; ULONG Eip; - ULONG_PTR StackBegin, StackEnd; BOOLEAN Result, StopSearch = FALSE; ULONG i = 0; - + /* Get current EBP */ #if defined(_M_IX86) #if defined __GNUC__ @@ -136,16 +135,16 @@ __asm mov Stack, ebp #endif #elif defined(_M_MIPS) - __asm__("move $sp, %0" : "=r" (Stack) : ); + __asm__("move $sp, %0" : "=r" (Stack) : ); #elif defined(_M_PPC) __asm__("mr %0,1" : "=r" (Stack) : ); #else #error Unknown architecture #endif - + /* Set it as the stack begin limit as well */ StackBegin = (ULONG_PTR)Stack; - + /* Check if we're called for non-logging mode */ if (!Flags) { @@ -155,52 +154,65 @@ &StackEnd); if (!Result) return 0; } - - /* Loop the frames */ - for (i = 0; i < Count; i++) - { - /* Check if we're past the stack */ - if ((ULONG_PTR)Stack >= StackEnd) break; - - /* Check if this is the first entry */ -#if 0 - if (!i) + + /* Use a SEH block for maximum protection */ + _SEH_TRY + { + /* Loop the frames */ + for (i = 0; i < Count; i++) { - if ((ULONG_PTR)Stack != StackBegin) break; + /* + * Leave if we're past the stack, + * if we're before the stack, + * or if we've reached ourselves. + */ + if ((Stack >= StackEnd) || + (!i ? (Stack < StackBegin) : (Stack <= StackBegin)) || + ((StackEnd - Stack) < (2 * sizeof(ULONG_PTR)))) + { + /* We're done or hit a bad address */ + break; + } + + /* Get new stack and EIP */ + NewStack = *(PULONG_PTR)Stack; + Eip = *(PULONG_PTR)(Stack + sizeof(ULONG_PTR)); + + /* Check if the new pointer is above the oldone and past the end */ + if (!((Stack < NewStack) && (NewStack < StackEnd))) + { + /* Stop searching after this entry */ + StopSearch = TRUE; + } + + /* Also make sure that the EIP isn't a stack address */ + if ((StackBegin < Eip) && (Eip < StackEnd)) break; + + /* Check if we reached a user-mode address */ + if (!(Flags) && !(Eip & 0x80000000)) break; + + /* Save this frame */ + Callers[i] = (PVOID)Eip; + + /* Check if we should continue */ + if (StopSearch) + { + /* Return the next index */ + i++; + break; + } + + /* Move to the next stack */ + Stack = NewStack; } - else - { - if ((ULONG_PTR)Stack == StackBegin) break; - } -#endif - - /* Make sure there's enough frames */ - if ((StackEnd - (ULONG_PTR)Stack) < (2 * sizeof(ULONG_PTR))) break; - - /* Get new stack and EIP */ - NewStack = (PULONG)Stack[0]; - Eip = Stack[1]; - - /* Check if the new pointer is above the oldone and past the end */ - if (!((Stack < NewStack) && ((ULONG_PTR)NewStack < StackEnd))) - { - /* Stop searching after this entry */ - StopSearch = TRUE; - } - - /* Also make sure that the EIP isn't a stack address */ - if ((StackBegin < Eip) && (Eip < StackEnd)) break; - - /* Save this frame */ - Callers[i] = (PVOID)Eip; - - /* Check if we should continue */ - if (StopSearch) break; - - /* Move to the next stack */ - Stack = NewStack; - } - + } + _SEH_HANDLE + { + /* No index */ + i = 0; + } + _SEH_END; + /* Return frames parsed */ return i; } Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c Thu Sep 27 17:07:43 2007 @@ -12,6 +12,11 @@ #define NDEBUG #include <internal/debug.h> +VOID +NTAPI +RtlpGetStackLimits(PULONG_PTR StackBase, + PULONG_PTR StackLimit); + /* DATA **********************************************************************/ KSPIN_LOCK CancelSpinLock; @@ -48,10 +53,33 @@ IoGetStackLimits(OUT PULONG LowLimit, OUT PULONG HighLimit) { - /* Return the limits from the TEB... this is wrong! */ - DPRINT1("FIXME: IoGetStackLimits returning B*LLSHIT!\n"); - *LowLimit = (ULONG)NtCurrentTeb()->Tib.StackLimit; - *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase; + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG_PTR DpcStack = (ULONG_PTR)(Prcb->DpcStack); + volatile ULONG_PTR StackAddress; + + /* Save our stack address so we always know it's valid */ + StackAddress = (ULONG_PTR)(&StackAddress); + + /* Get stack values */ + RtlpGetStackLimits(LowLimit, HighLimit); + + /* Check if we're outside the stack */ + if ((StackAddress < *LowLimit) || (StackAddress > *HighLimit)) + { + /* Check if we may be in a DPC */ + if (KeGetCurrentIrql() >= DISPATCH_LEVEL) + { + /* Check if we really are in a DPC */ + if ((Prcb->DpcRoutineActive) && + (StackAddress <= DpcStack) && + (StackAddress >= DpcStack - KERNEL_STACK_SIZE)) + { + /* Use the DPC stack limits */ + *HighLimit = DpcStack; + *LowLimit = DpcStack - KERNEL_STACK_SIZE; + } + } + } } /* Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2924… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Sep 27 17:07:43 2007 @@ -222,9 +222,7 @@ "BIOS Version: %wZ\n" "Video BIOS Date: %wZ\n" "Video BIOS Version: %wZ\n" - "Memory: %d\n" - "NT Build Number: %lx\n" - "NT Build Lab: %s\n", + "Memory: %d\n", KeProcessorArchitecture, KeFeatureBits, KiFastSystemCallDisable, @@ -251,9 +249,7 @@ &KeRosBiosVersion, &KeRosVideoBiosDate, &KeRosVideoBiosVersion, - MmStats.NrTotalPages * PAGE_SIZE, - NtBuildNumber, - NtBuildLab); + MmStats.NrTotalPages * PAGE_SIZE); #endif } @@ -640,7 +636,6 @@ PVOID DriverBase; PLDR_DATA_TABLE_ENTRY LdrEntry; PULONG_PTR HardErrorParameters; - KIRQL OldIrql; #ifdef CONFIG_SMP LONG i = 0; #endif @@ -976,15 +971,15 @@ } } - /* Raise IRQL to HIGH_LEVEL */ - _disable(); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - /* ROS HACK: Unlock the Kernel Address Space if we own it */ if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); } + + /* Raise IRQL to HIGH_LEVEL */ + _disable(); + KfRaiseIrql(HIGH_LEVEL); /* Avoid recursion */ if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) @@ -1006,11 +1001,13 @@ #endif /* Display the BSOD */ + KfLowerIrql(APC_LEVEL); // This is a nastier hack than any ever before KiDisplayBlueScreen(MessageId, IsHardError, HardErrCaption, HardErrMessage, AnsiName); + KfRaiseIrql(HIGH_LEVEL); /* Check if the debugger is disabled but we can enable it */ if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) Propchange: trunk/reactos/ntoskrnl/ke/bug.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/abios.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/exp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Thu Sep 27 17:07:43 2007 @@ -582,7 +582,7 @@ /* Allocate the DPC Stack */ DpcStack = MmCreateKernelStack(FALSE, 0); if (!DpcStack) KeBugCheckEx(NO_PAGES_AVAILABLE, 1, 0, 0, 0); - Prcb->DpcStack = (PVOID)((ULONG_PTR)DpcStack + KERNEL_STACK_SIZE); + Prcb->DpcStack = DpcStack; /* Allocate the IOPM save area. */ Ki386IopmSaveArea = ExAllocatePoolWithTag(PagedPool, Propchange: trunk/reactos/ntoskrnl/ke/i386/kiinit.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/ldt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/ke/i386/thrdini.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Thu Sep 27 17:07:43 2007 @@ -797,8 +797,7 @@ if (!KernelStack) { /* We don't, allocate one */ - KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE, 0) + - KERNEL_STACK_SIZE); + KernelStack = MmCreateKernelStack(FALSE, 0); if (!KernelStack) return STATUS_INSUFFICIENT_RESOURCES; /* Remember for later */ @@ -806,8 +805,8 @@ } /* Set the Thread Stacks */ - Thread->InitialStack = (PCHAR)KernelStack; - Thread->StackBase = (PCHAR)KernelStack; + Thread->InitialStack = KernelStack; + Thread->StackBase = KernelStack; Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c Thu Sep 27 17:07:43 2007 @@ -242,8 +242,9 @@ KEBUGCHECK(0); } - /* Return the stack */ - return KernelStack; + /* Return the stack base */ + return (PVOID)((ULONG_PTR)KernelStack + + (GuiStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE)); } /* Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu Sep 27 17:07:43 2007 @@ -52,8 +52,7 @@ if (!Thread->Tcb.LargeStack) { /* We don't create one */ - NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0) + - KERNEL_LARGE_STACK_SIZE; + NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0); if (!NewStack) { /* Panic in user-mode */ @@ -61,15 +60,15 @@ return STATUS_NO_MEMORY; } - /* We're about to switch stacks. Enter a critical region */ - KeEnterCriticalRegion(); + /* We're about to switch stacks. Enter a guarded region */ + KeEnterGuardedRegion(); /* Switch stacks */ OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_STACK_SIZE)); - /* Leave the critical region */ - KeLeaveCriticalRegion(); + /* Leave the guarded region */ + KeLeaveGuardedRegion(); /* Delete the old stack */ MmDeleteKernelStack(OldStack, FALSE); Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Sep 27 17:07:43 2007 @@ -197,11 +197,11 @@ /* Check if we are in a DPC and the stack matches */ if ((Prcb->DpcRoutineActive) && (RegistrationFrameEnd <= DpcStack) && - ((ULONG_PTR)RegistrationFrame >= DpcStack - 4096)) + ((ULONG_PTR)RegistrationFrame >= DpcStack - KERNEL_STACK_SIZE)) { /* Update the limits to the DPC Stack's */ *StackHigh = DpcStack; - *StackLow = DpcStack - 4096; + *StackLow = DpcStack - KERNEL_STACK_SIZE; return TRUE; } } @@ -218,18 +218,37 @@ { PKTHREAD Thread = KeGetCurrentThread(); - /* FIXME: Super native implementation */ - + /* Don't even try at ISR level or later */ + if (KeGetCurrentIrql() > DISPATCH_LEVEL) return FALSE; + /* Start with defaults */ *StackBegin = Thread->StackLimit; *StackEnd = (ULONG_PTR)Thread->StackBase; - - /* Check if we seem to be on the DPC stack */ - if ((*StackBegin > Ebp) || (Ebp > *StackEnd)) + + /* Check if EBP is inside the stack */ + if ((*StackBegin <= Ebp) && (Ebp <= *StackEnd)) { - /* FIXME: TODO */ - //ASSERT(FALSE); - DPRINT1("Stacks: %p %p %p\n", Ebp, *StackBegin, *StackEnd); + /* Then make the stack start at EBP */ + *StackBegin = Ebp; + } + else + { + /* Now we're going to assume we're on the DPC stack */ + *StackEnd = (ULONG_PTR)(KeGetPcr()->Prcb->DpcStack); + *StackBegin = *StackEnd - KERNEL_STACK_SIZE; + + /* Check if we seem to be on the DPC stack */ + if ((*StackEnd) && (*StackBegin < Ebp) && (Ebp <= *StackEnd)) + { + /* We're on the DPC stack */ + *StackBegin = Ebp; + } + else + { + /* We're somewhere else entirely... use EBP for safety */ + *StackBegin = Ebp; + *StackEnd = (ULONG_PTR)PAGE_ALIGN(*StackBegin); + } } /* Return success */ Propchange: trunk/reactos/ntoskrnl/rtl/libsupp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/rtl/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/rtl/strtok.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 29243: - Slightly cleanup the code. - Enable allocation of the adapter channel in case of Start I/O.
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 16:34:53 2007 New Revision: 29243 URL: http://svn.reactos.org/svn/reactos?rev=29243&view=rev Log: - Slightly cleanup the code. - Enable allocation of the adapter channel in case of Start I/O. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Thu Sep 27 16:34:53 2007 @@ -137,6 +137,13 @@ ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context); +IO_ALLOCATION_ACTION +STDCALL +ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context); + static NTSTATUS SpiBuildDeviceMap (PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, PUNICODE_STRING RegistryPath); @@ -336,7 +343,6 @@ SCSI_PORT_DEVICE_EXTENSION, MiniPortDeviceExtension); - /* Initialize our pointers */ NextMa = DeviceExtension->MappedAddressList; LastMa = NextMa; @@ -384,22 +390,44 @@ IN PVOID Buffer, IN ULONG Length) { - if (Length) - { - /* If Length is non-zero, just forward the call to - HalGetBusData() function */ - return HalGetBusData(BusDataType, - SystemIoBusNumber, - SlotNumber, - Buffer, - Length); - } - - /* We have a more complex case here */ - UNIMPLEMENTED; - return 0; + DPRINT("ScsiPortGetBusData()\n"); + + if (Length) + { + /* If Length is non-zero, just forward the call to + HalGetBusData() function */ + return HalGetBusData(BusDataType, + SystemIoBusNumber, + SlotNumber, + Buffer, + Length); + } + + /* We have a more complex case here */ + UNIMPLEMENTED; + return 0; } +/* + * @implemented + */ +ULONG STDCALL +ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, + IN ULONG BusDataType, + IN ULONG SystemIoBusNumber, + IN ULONG SlotNumber, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + DPRINT("ScsiPortSetBusDataByOffset()\n"); + return HalSetBusDataByOffset(BusDataType, + SystemIoBusNumber, + SlotNumber, + Buffer, + Offset, + Length); +} /* * @implemented @@ -461,7 +489,7 @@ } /* - * @implemented + * @unimplemented */ PVOID STDCALL ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, @@ -504,7 +532,7 @@ /* - * @unimplemented + * @implemented */ SCSI_PHYSICAL_ADDRESS STDCALL ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, @@ -1654,13 +1682,11 @@ } else { -#if 0 HalFreeCommonBuffer(DeviceExtension->AdapterObject, DeviceExtension->CommonBufferLength, - DeviceExtension->PhysicalCommonBuffer, + DeviceExtension->PhysicalAddress, DeviceExtension->SrbExtensionBuffer, FALSE); -#endif } } @@ -1684,8 +1710,6 @@ DPRINT("Deleting device %p\n", DeviceExtension->DeviceObject); IoDeleteDevice(DeviceExtension->DeviceObject); } - - /* * @unimplemented @@ -1699,7 +1723,6 @@ DPRINT1("ScsiPortIoMapTransfer()\n"); UNIMPLEMENTED; } - /* * @unimplemented @@ -1725,7 +1748,6 @@ DPRINT("ScsiPortLogError() done\n"); } - /* * @implemented */ @@ -1875,29 +1897,6 @@ /* Request a DPC after we're done with the interrupt */ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NOTIFICATION_NEEDED; } - - -/* - * @implemented - */ -ULONG STDCALL -ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, - IN ULONG BusDataType, - IN ULONG SystemIoBusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) -{ - DPRINT("ScsiPortSetBusDataByOffset()\n"); - return(HalSetBusDataByOffset(BusDataType, - SystemIoBusNumber, - SlotNumber, - Buffer, - Offset, - Length)); -} - /* * @implemented @@ -2869,22 +2868,16 @@ DeviceExtension->AdapterObject != NULL && !DeviceExtension->MapRegisters) { -#if 0 IoAllocateAdapterChannel( DeviceExtension->AdapterObject, DeviceObject, DeviceExtension->PortCapabilities.MaximumPhysicalPages, - ScsiPortAllocationRoutine, + ScsiPortAllocateAdapterChannel, LunExtension ); return; -#else - /* TODO: DMA is not implemented yet */ - ASSERT(FALSE); -#endif - } - + } KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); @@ -4081,7 +4074,6 @@ } } - /* Flush adapter if needed */ if (SrbInfo->BaseOfMapRegister) { @@ -4416,8 +4408,6 @@ IoFreeIrp(Irp); return STATUS_MORE_PROCESSING_REQUIRED; } - - static BOOLEAN STDCALL ScsiPortIsr(IN PKINTERRUPT Interrupt, @@ -5484,6 +5474,7 @@ IN PVOID SystemArgument2) { DPRINT1("Miniport timer DPC\n"); + ASSERT(FALSE); } static NTSTATUS @@ -5616,7 +5607,6 @@ } } - /* Look at device params */ Key = NULL; if (InternalConfigInfo->Parameter) @@ -5742,7 +5732,6 @@ UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; NTSTATUS Status = STATUS_SUCCESS; - KeyValueInformation = (PKEY_VALUE_FULL_INFORMATION) Buffer; @@ -6064,7 +6053,6 @@ } } - NTSTATUS STDCALL SpQueryDeviceCallout(IN PVOID Context, @@ -6086,7 +6074,31 @@ return STATUS_SUCCESS; } - +IO_ALLOCATION_ACTION +STDCALL +ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID MapRegisterBase, + IN PVOID Context) +{ + KIRQL Irql; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + + /* Guard access with the spinlock */ + KeAcquireSpinLock(&DeviceExtension->SpinLock, &Irql); + + /* Save MapRegisterBase we've got here */ + DeviceExtension->MapRegisterBase = MapRegisterBase; + + /* Start pending request */ + KeSynchronizeExecution(DeviceExtension->Interrupt, + ScsiPortStartPacket, DeviceObject); + + /* Release spinlock we took */ + KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); + + return KeepObject; +} static NTSTATUS

1 0

[dreimer] 29242: Bug 2697: Ukrainian translation update German Translations by me.
by dreimer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: dreimer Date: Thu Sep 27 14:17:05 2007 New Revision: 29242 URL: http://svn.reactos.org/svn/reactos?rev=29242&view=rev Log: Bug 2697: Ukrainian translation update German Translations by me. Added: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/access/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: Accessibility Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/access/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Accessibility Control Panel Applet + * TRANSLATOR: Rostislav Zabolotny + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -60,19 +60,19 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Êîíô³ãóðàö³ÿ êíîïîê", -1, 5, 5, 230, 70 - CHECKBOX "&Ïîì³íÿòè ïðèçíà÷åííÿ êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 + CHECKBOX "Î&áì³íÿòè ïðèçíà÷åííÿ êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü, ùîá ïðèçíà÷èòè ïðàâó êíîïêó äëÿ âèêîíàííÿ òàêèõ îñíîâíèõ ôóíêö³é, ÿê âèá³ð ³ ïåðåòÿãóâàííÿ", -1, 10, 30, 150, 30 GROUPBOX "Øâèäê³ñòü ïîäâ³éíîãî êëàöàííÿ", -1, 5, 75, 230, 70 - LTEXT "Çðîá³òü ïîäâ³éíå êëàöàííÿ ïî ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 150, 30 + LTEXT "Äâ³÷³ êëàöí³òü ïî ö³é ïàïö³. ßêùî ïàïêà íå â³äêðèâàºòüñÿ àáî íå çàêðèâàºòüñÿ, âèáåð³òü íèæ÷ó øâèäê³ñòü.", -1, 10, 85, 150, 30 LTEXT "&Øâèäê³ñòü: Íèæ÷å", -1, 10, 120, 90, 8 LTEXT "Âèùå", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE - GROUPBOX "Çàë³ïàí³ÿ", -1, 5, 150, 230, 70 - CHECKBOX "&Â³âìêíóòè Çàë³ïàí³ÿ", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 + GROUPBOX "Çàëèïàííÿ êíîïêè ìèø³", -1, 5, 150, 230, 70 + CHECKBOX "&Óâ³ìêíóòè çàëèïàííÿ", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 PUSHBUTTON "&Ïàðàìåòðè...", IDC_BUTTON_CLICK_LOCK, 170, 160, 50, 10 - LTEXT "Äîçâîëÿº âèêîíóâàòè âèä³ëåííÿ ³ ïåðåòÿãóâàííÿ áåç óòðèìóâàííÿ êíîïêè ìèø³ íàòèñíóòîþ. Äëÿ ââ³ìêíåííÿ íåíàäîâãî çàòðèìàéòå êíîïêó â íàòèñíóòîìó ïîëîæåíí³. Äëÿ âèâ³ëüíåííÿ çíîâó êëàöí³òü.", -1, 10, 180, 190, 30 + LTEXT "Äîçâîëÿº âèêîíóâàòè âèä³ëåííÿ é ïåðåòÿãóâàííÿ, íå óòðèìóþ÷è êíîïêó ìèø³ íàòèñíóòîþ. Ùîá óâ³ìêíóòè öåé ðåæèì, íåíàäîâãî íàòèñí³òü êíîïêó ìèø³. Ùîá âèìêíóòè öåé ðåæèì, íàòèñí³òü êíîïêó ìèø³ ùå ðàç.", -1, 10, 180, 190, 30 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -87,7 +87,7 @@ CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "&Ââ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 + CHECKBOX "Óâ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Îãëÿä", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 END Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -131,13 +131,13 @@ IDS_CANNOT_CREATE_PROPSHEET "Íåìîæëèâî ñòâîðèòè â³êíî âëàñòèâîñòåé" IDS_OUT_OF_MEMORY "Íåäîñòàòíüî ïàì'ÿò³" IDS_CANNOT_SAVE_CHANGES "Íåìîæëèâî çáåðåãòè âíåñåí³ çì³íè" - IDS_STATUS_NON_OPERATIONAL "Non-operational" - IDS_STATUS_UNREACHABLE "No WAN adapter found" - IDS_STATUS_DISCONNECTED "Disconnected" - IDS_STATUS_CONNECTING "Connecting" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" - IDS_SPEED_MBPS "%d Mbps" - IDS_DURATION_DAY "%d day %s" - IDS_DURATION_DAYS "%d days %s" + IDS_STATUS_NON_OPERATIONAL "Íå ïðàöþº" + IDS_STATUS_UNREACHABLE "Íå çíàéäåíèé àäàïòåð WAN" + IDS_STATUS_DISCONNECTED "Â³äêëþ÷åíî" + IDS_STATUS_CONNECTING "Ï³äêëþ÷åííÿ" + IDS_STATUS_CONNECTED "Ï³äêëþ÷åíî" + IDS_STATUS_OPERATIONAL "Ï³äêëþ÷åíî" + IDS_SPEED_MBPS "%d Ìá³ò/ñ" + IDS_DURATION_DAY "%d äåíü %s" + IDS_DURATION_DAYS "%d äí³â %s" END Added: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,47 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adapter" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Adaptertyp", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + PUSHBUTTON "&Einstellungen", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 + LTEXT "Chiptyp:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "DAC Typ:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Speichergröße:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Zeichenfolge:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "BIOS Informationen:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "Alle Modi auf&listen...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Alle Modi auflisten" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Alle gültigen Modi auflisten", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d von %d, %s, %s" + IDS_DEFREFRESHRATE "Standard" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Farben" + IDS_8BPP "256 Farben" + IDS_15BPP "High Color (15 bit)" + IDS_16BPP "High Color (16 bit)" + IDS_24BPP "True Color (24 bit)" + IDS_32BPP "True Color (32 bit)" +END Added: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,56 @@ +/* + * PROJECT: ReactOS Advanced display adapter properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shellext/deskadp/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for deskadp.dll + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Àäàïòåð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï àäàïòåðà", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Â³äîìîñò³ ïðî àäàïòåð", -1, 7, 56, 237, 75 + LTEXT "Òèï ì³êðîñõåì:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Òèï ÖÀÏ:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Îá'ºì ïàì'ÿò³:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Ðÿäîê êîíòðîëåðà:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "Â³äîìîñò³ ïðî BIOS:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&Ñïèñîê óñ³õ ðåæèì³â...", IDC_LISTALLMODES, 7, 139, 75, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Ñïèñîê óñ³õ ðåæèì³â" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "Ñïèñîê ïðèïóñòèìèõ ðåæèì³â", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d íà %d, %s, %s" + IDS_DEFREFRESHRATE "÷àñòîòà çà çàìîâ÷óâàííÿì" + IDES_REFRESHRATEFMT "%d Ãö" + IDS_4BPP "16 êîëüîð³â" + IDS_8BPP "256 êîëüîð³â" + IDS_15BPP "High Color (15 á³ò)" + IDS_16BPP "High Color (16 á³ò)" + IDS_24BPP "True Color (24 á³òà)" + IDS_32BPP "True Color (32 á³òà)" +END + Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Thu Sep 27 14:17:05 2007 @@ -3,5 +3,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/de-DE.rc" #include "lang/en-US.rc" - +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,12 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Monitortyp", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&Einstellungen", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Added: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Thu Sep 27 14:17:05 2007 @@ -1,0 +1,20 @@ +/* + * PROJECT: ReactOS Advanced display monitor properties + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shellext/deskmon/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for deskmon.dll + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ìîí³òîð" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Òèï ìîí³òîðà", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Â&ëàñòèâîñò³", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Modified: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Thu Sep 27 14:17:05 2007 @@ -3,5 +3,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/de-DE.rc" #include "lang/en-US.rc" - +#include "lang/uk-UA.rc"

1 0

[fireball] 29241: - Handle NextLuRequest and ResetDetected in ScsiPortNotification() API - Add UNIMPLEMENTED into ScsiPortGetBusData() when it's called with Length = 0. Does not happen so far, when tested with BusLogic.sys in our tree.
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 14:04:56 2007 New Revision: 29241 URL: http://svn.reactos.org/svn/reactos?rev=29241&view=rev Log: - Handle NextLuRequest and ResetDetected in ScsiPortNotification() API - Add UNIMPLEMENTED into ScsiPortGetBusData() when it's called with Length = 0. Does not happen so far, when tested with BusLogic.sys in our tree. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Thu Sep 27 14:04:56 2007 @@ -384,11 +384,20 @@ IN PVOID Buffer, IN ULONG Length) { - return(HalGetBusData(BusDataType, - SystemIoBusNumber, - SlotNumber, - Buffer, - Length)); + if (Length) + { + /* If Length is non-zero, just forward the call to + HalGetBusData() function */ + return HalGetBusData(BusDataType, + SystemIoBusNumber, + SlotNumber, + Buffer, + Length); + } + + /* We have a more complex case here */ + UNIMPLEMENTED; + return 0; } @@ -1812,40 +1821,56 @@ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; break; - case NextLuRequest: - { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - - PathId = (UCHAR) va_arg (ap, int); - TargetId = (UCHAR) va_arg (ap, int); - Lun = (UCHAR) va_arg (ap, int); - - DPRINT1 ("Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", - PathId, TargetId, Lun); - /* FIXME: Implement it! */ - ASSERT(FALSE); - -// DeviceExtension->IrpFlags |= IRP_FLAG_NEXT; -// DeviceExtension->IrpFlags |= IRP_FLAG_NEXT_LU; - - /* Hack! */ -// DeviceExtension->IrpFlags |= IRP_FLAG_NEXT; - } - break; + case NextLuRequest: + { + UCHAR PathId; + UCHAR TargetId; + UCHAR Lun; + PSCSI_PORT_LUN_EXTENSION LunExtension; + + PathId = (UCHAR) va_arg (ap, int); + TargetId = (UCHAR) va_arg (ap, int); + Lun = (UCHAR) va_arg (ap, int); + + DPRINT("Notify: NextLuRequest(PathId %u TargetId %u Lun %u)\n", + PathId, TargetId, Lun); + + /* Mark it in the flags field */ + DeviceExtension->InterruptData.Flags |= SCSI_PORT_NEXT_REQUEST_READY; + + /* Get the LUN extension */ + LunExtension = SpiGetLunExtension(DeviceExtension, + PathId, + TargetId, + Lun); + + /* This request should not be processed if */ + if ((LunExtension && LunExtension->ReadyLun) || + (LunExtension && LunExtension->SrbInfo.Srb)) + { + /* Nothing to do here */ + break; + } + + /* Add this LUN to the list */ + LunExtension->ReadyLun = DeviceExtension->InterruptData.ReadyLun; + DeviceExtension->InterruptData.ReadyLun = LunExtension; + } + break; case ResetDetected: - DPRINT1("Notify: ResetDetected\n"); - /* FIXME: ??? */ - break; + DPRINT("Notify: ResetDetected\n"); + /* Add RESET flags */ + DeviceExtension->InterruptData.Flags |= + SCSI_PORT_RESET | SCSI_PORT_RESET_REPORTED; + break; default: DPRINT1 ("Unsupported notification %lu\n", NotificationType); break; } - va_end(ap); + va_end(ap); /* Request a DPC after we're done with the interrupt */ DeviceExtension->InterruptData.Flags |= SCSI_PORT_NOTIFICATION_NEEDED;

1 0

[fireball] 29240: Samuel Erdtman <samuel@erdtman.se> - Implement 'replace' command in cmd. - TODO: Update all translations with the new text strings for replace command.
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 12:35:08 2007 New Revision: 29240 URL: http://svn.reactos.org/svn/reactos?rev=29240&view=rev Log: Samuel Erdtman <samuel(a)erdtman.se> - Implement 'replace' command in cmd. - TODO: Update all translations with the new text strings for replace command. Added: trunk/reactos/base/shell/cmd/replace.c (with props) Modified: trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/config.h trunk/reactos/base/shell/cmd/files.txt trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/resource.h Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h (original) +++ trunk/reactos/base/shell/cmd/cmd.h Thu Sep 27 12:35:08 2007 @@ -347,6 +347,8 @@ /* Prototypes for REN.C */ INT cmd_rename (LPTSTR, LPTSTR); +/* Prototypes for REN.C */ +INT cmd_replace (LPTSTR, LPTSTR); /* Prototypes for SCREEN.C */ INT CommandScreen (LPTSTR, LPTSTR); Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Thu Sep 27 12:35:08 2007 @@ -52,6 +52,7 @@ <file>prompt.c</file> <file>redir.c</file> <file>ren.c</file> + <file>replace.c</file> <file>screen.c</file> <file>set.c</file> <file>shift.c</file> @@ -82,4 +83,4 @@ <file>cmd.rc</file> <file>main.c</file> </module> -</group> +</group> Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdtable.c (original) +++ trunk/reactos/base/shell/cmd/cmdtable.c Thu Sep 27 12:35:08 2007 @@ -174,6 +174,10 @@ #ifdef INCLUDE_CMD_RENAME {_T("ren"), 0, cmd_rename}, {_T("rename"), 0, cmd_rename}, +#endif + +#ifdef INCLUDE_CMD_REPLACE + {_T("replace"), 0, cmd_replace}, #endif #ifdef INCLUDE_CMD_RMDIR Modified: trunk/reactos/base/shell/cmd/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/config.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/config.h (original) +++ trunk/reactos/base/shell/cmd/config.h Thu Sep 27 12:35:08 2007 @@ -79,6 +79,7 @@ #define INCLUDE_CMD_PROMPT #define INCLUDE_CMD_RMDIR #define INCLUDE_CMD_RENAME +#define INCLUDE_CMD_REPLACE #define INCLUDE_CMD_SCREEN #define INCLUDE_CMD_SET #define INCLUDE_CMD_START Modified: trunk/reactos/base/shell/cmd/files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/files.txt?r… ============================================================================== --- trunk/reactos/base/shell/cmd/files.txt (original) +++ trunk/reactos/base/shell/cmd/files.txt Thu Sep 27 12:35:08 2007 @@ -47,6 +47,7 @@ prompt.c Prompt handling functions redir.c Redirection and piping parsing functions ren.c Implements rename command +replace.c Implements replace command set.c Implements set command shift.c Implements shift command time.c Implements time command Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc Thu Sep 27 12:35:08 2007 @@ -389,6 +389,46 @@ STRING_REN_HELP2, " %lu file renamed\n" STRING_REN_HELP3, " %lu files renamed\n" + +STRING_REPLACE_HELP1, "Replaces files.\n\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\ +REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [drive1:][path1]filename Specifies the source file or files.\n\ + [drive2:][path2] Specifies the directory where files are to be\n\ + replaced.\n\ + /A Adds new files to destination directory. Cannot\n\ + use with /S or /U switches.\n\ + /P Prompts for confirmation before replacing a file or\n\ + adding a source file.\n\ + /R Replaces read-only files as well as unprotected\n\ + files.\n\ + /S Replaces files in all subdirectories of the\n\ + destination directory. Cannot use with the /A\n\ + switch.\n\ + /W Waits for you to insert a disk before beginning.\n\ + /U Replaces (updates) only files that are older than\n\ + source files. Cannot use with the /A switch.\n" + +STRING_REPLACE_HELP2, "Source path required\n" + +STRING_REPLACE_HELP3, "No files replaced\n" + +STRING_REPLACE_HELP4, "%lu file(s) replaced\n" + +STRING_REPLACE_HELP5, "Replacing %s\n" + +STRING_REPLACE_HELP6, "Replace %s\n" + +STRING_REPLACE_HELP7, "No files added\n" + +STRING_REPLACE_HELP8, "%lu file(s) added\n" + +STRING_REPLACE_HELP9, "Add %s (Y/N) " + +STRING_REPLACE_HELP10, "Replace %s (Y/N) " + +STRING_REPLACE_HELP11, "Adding %s\n" + STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" @@ -548,6 +588,7 @@ REM Records comments (remarks) in batch files.\n\ REN Renames a file or files.\n\ RENAME Renames a file or files.\n\ +REPLACE Replaces files.\n\ RMDIR Removes a directory.\n\ SCREEN Move cursor and optionally print text.\n\ SET Displays, sets, or removes ReactOS environment variables.\n\ @@ -636,6 +677,14 @@ STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" +STRING_REPLACE_ERROR1, "Invalid switch - %s\n" +STRING_REPLACE_ERROR2, "Path not found - %s\n" +STRING_REPLACE_ERROR3, "The filename, directory name, or volume label syntax is incorrect.\n" +STRING_REPLACE_ERROR4, "Invalid parameter combination\n" +STRING_REPLACE_ERROR5, "Access denied - %s\n" +STRING_REPLACE_ERROR6, "No files found - %s\n" +STRING_REPLACE_ERROR7, "Extended Error 32\n" + STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" Added: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/replace.c (added) +++ trunk/reactos/base/shell/cmd/replace.c Thu Sep 27 12:35:08 2007 @@ -1,0 +1,576 @@ +/* + * PROJECT: ReactOS Command shell + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/shell/cmd/replace.c + * PURPOSE: Implements 'replace' cmd command + * PROGRAMMERS: Samuel Erdtman (samuel(a)erdtman.se) + */ + +/* INCLUDES ******************************************************************/ + +#include <precomp.h> + +#ifdef INCLUDE_CMD_REPLACE + +/* GLOBALS *******************************************************************/ + +enum +{ + REPLACE_ADD = 0x001, /* /A */ + REPLACE_CONFIRM = 0x002, /* /P */ + REPLACE_READ_ONLY = 0x004, /* /R */ + REPLACE_SUBDIR = 0x008, /* /S */ + REPLACE_DISK = 0x010, /* /W */ + REPLACE_UPDATE = 0x020, /* /U */ +}; + +/* FUNCTIONS *****************************************************************/ + +/*just makes a print out if there is a problem with the switches*/ +void invalid_switch(LPTSTR is) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + + LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg,is); + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); +} + +/*retrives the pathe dependen om the input file name*/ +void getPath(TCHAR* out, LPTSTR in) +{ + if(_tcslen(in) == 2 && in[1] == _T(':')) + GetRootPath(in,out,MAX_PATH); + else + GetFullPathName (in, MAX_PATH, out, NULL); +} + + +/*makes the replace*/ +INT replace(TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], DWORD dwFlags, BOOL *doMore) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR d[MAX_PATH]; + TCHAR s[MAX_PATH]; + HANDLE hFileSrc, hFileDest; + DWORD dwAttrib, dwRead, dwWritten; + LPBYTE buffer; + BOOL bEof = FALSE; + FILETIME srcCreationTime, destCreationTime, srcLastAccessTime, destLastAccessTime; + FILETIME srcLastWriteTime, destLastWriteTime; + GetPathCase(source, s); + GetPathCase(dest, d); + s[0] = _totupper(s[0]); + d[0] = _totupper(d[0]); +// ConOutPrintf(_T("old-src: %s\n"), s); +// ConOutPrintf(_T("old-dest: %s\n"), d); +// ConOutPrintf(_T("src: %s\n"), source); +// ConOutPrintf(_T("dest: %s\n"), dest); + + /* Open up the sourcefile */ + hFileSrc = CreateFile (source, GENERIC_READ, FILE_SHARE_READ,NULL, OPEN_EXISTING, 0, NULL); + if (hFileSrc == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, source); + return 0; + } + + /* Get the time from source file to be used in the comparison with + dest time if update switch is set */ + GetFileTime (hFileSrc, &srcCreationTime, &srcLastAccessTime, &srcLastWriteTime); + + /* Retrieve the source attributes so that they later on can be + inserted in to the destination */ + dwAttrib = GetFileAttributes (source); + + if(IsExistingFile (dest)) + { + /* Resets the attributes to avoid probles with read only files, + checks for read only has been made earlier */ + SetFileAttributes(dest,FILE_ATTRIBUTE_NORMAL); + /* Is the update flas set? The time has to be controled so that + only older files are replaced */ + if(dwFlags & REPLACE_UPDATE) + { + /* Read destination time */ + hFileDest = CreateFile(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, + 0, NULL); + + if (hFileSrc == INVALID_HANDLE_VALUE) + { + LoadString(CMD_ModuleHandle, STRING_COPY_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, dest); + return 0; + } + + /* Compare time */ + GetFileTime (hFileDest, &destCreationTime, &destLastAccessTime, &destLastWriteTime); + if(!((srcLastWriteTime.dwHighDateTime > destLastWriteTime.dwHighDateTime) || + ( srcLastWriteTime.dwHighDateTime == destLastWriteTime.dwHighDateTime && + srcLastWriteTime.dwLowDateTime > destLastWriteTime.dwLowDateTime))) + { + CloseHandle (hFileSrc); + CloseHandle (hFileDest); + return 0; + } + CloseHandle (hFileDest); + } + /* Delete the old file */ + DeleteFile (dest); + } + + /* Check confirm flag, and take appropriate action */ + if(dwFlags & REPLACE_CONFIRM) + { + /* Output depending on add flag */ + if(dwFlags & REPLACE_ADD) + LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP9, szMsg, RC_STRING_MAX_SIZE); + else + LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP10, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, dest); + if( !FilePromptYNA (_T(""))) + return 0; + } + + /* Output depending on add flag */ + if(dwFlags & REPLACE_ADD) + LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP11, szMsg, RC_STRING_MAX_SIZE); + else + LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP5, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg,dest); + + /* Make sure source and destination is not the same */ + if(!_tcscmp(s, d)) + { + ConOutResPaging(TRUE, STRING_REPLACE_ERROR7); + CloseHandle (hFileSrc); + *doMore = FALSE; + return 0; + } + + /* Open destination file to write to */ + hFileDest = CreateFile (dest, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (hFileDest == INVALID_HANDLE_VALUE) + { + CloseHandle (hFileSrc); + ConOutResPaging(TRUE, STRING_REPLACE_ERROR7); + *doMore = FALSE; + return 0; + } + + /* Get buffer for the copy process */ + buffer = (LPBYTE)VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE); + if (buffer == NULL) + { + CloseHandle (hFileDest); + CloseHandle (hFileSrc); + ConOutResPaging(TRUE, STRING_ERROR_OUT_OF_MEMORY); + return 0; + } + + /* Put attribute and time to the new destination file */ + SetFileAttributes (dest, dwAttrib); + SetFileTime (hFileDest, &srcCreationTime, &srcLastAccessTime, &srcLastWriteTime); + do + { + /* Read data from source */ + ReadFile (hFileSrc, buffer, BUFF_SIZE, &dwRead, NULL); + + /* Done? */ + if (dwRead == 0) + break; + + /* Write to destination file */ + WriteFile (hFileDest, buffer, dwRead, &dwWritten, NULL); + + /* Done! or ctrl break! */ + if (dwWritten != dwRead || CheckCtrlBreak(BREAK_INPUT)) + { + ConOutResPuts(STRING_COPY_ERROR3); + cmd_free (buffer); + CloseHandle (hFileDest); + CloseHandle (hFileSrc); + nErrorLevel = 1; + return 0; + } + } + while (!bEof); + + /* Return memory and close files */ + VirtualFree (buffer, 0, MEM_RELEASE); + CloseHandle (hFileDest); + CloseHandle (hFileSrc); + + /* Return one file replaced */ + return 1; +} + + +/* Function to iterate over source files and call replace for each of them */ +INT recReplace(DWORD dwFlags, TCHAR szSrcPath[MAX_PATH], TCHAR szDestPath[MAX_PATH], BOOL *doMore) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE], tmpDestPath[MAX_PATH], tmpSrcPath[MAX_PATH]; + INT filesReplaced=0, i; + DWORD dwAttrib = 0; + HANDLE hFile; + WIN32_FIND_DATA findBuffer; + + /* Get file handel to the sourcefile(s) */ + hFile = FindFirstFile (szSrcPath, &findBuffer); + + /* Strip the paths back to the folder they are in, so that the diffrent + filenames can be added if more than one */ + for(i = (_tcslen(szSrcPath) - 1); i > -1; i--) + if(szSrcPath[i] != _T('\\')) + szSrcPath[i] = _T('\0'); + else + break; + + /* Go through all the soursfiles and copy/replace them */ + do + { + if(CheckCtrlBreak(BREAK_INPUT)) + { + return filesReplaced; + } + + /* Problem with file handler */ + if(hFile == INVALID_HANDLE_VALUE) + return filesReplaced; + + /* We do not want to replace any .. . ocr directory */ + if(!_tcscmp (findBuffer.cFileName, _T(".")) || + !_tcscmp (findBuffer.cFileName, _T(".."))|| + findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + continue; + + /* Add filename to destpath */ + _tcscpy(tmpDestPath,szDestPath); + _tcscat (tmpDestPath, findBuffer.cFileName); + + dwAttrib = GetFileAttributes(tmpDestPath); + /* Check add flag */ + if(dwFlags & REPLACE_ADD) + { + if(IsExistingFile(tmpDestPath)) + continue; + else + dwAttrib = 0; + } + else + { + if(!IsExistingFile(tmpDestPath)) + continue; + } + + /* Check if file is read only, if so check if that should be ignored */ + if(dwAttrib & FILE_ATTRIBUTE_READONLY) + { + if(!(dwFlags & REPLACE_READ_ONLY)) + { + LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR5, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, tmpDestPath); + *doMore = FALSE; + break; + } + } + + /* Add filename to sourcepath, insted of wildcards */ + _tcscpy(tmpSrcPath,szSrcPath); + _tcscat (tmpSrcPath, findBuffer.cFileName); + + /* Make the replace */ + if(replace(tmpSrcPath,tmpDestPath, dwFlags, doMore)) + { + filesReplaced++; + } + else if (!*doMore) + { + /* The file to be replaced was the same as the source */ + filesReplaced = -1; + break; + } + + /* Take next sourcefile if any */ + }while(FindNextFile (hFile, &findBuffer)); + + return filesReplaced; +} + +/* If /s switch is specifyed all subdirs has to be considered */ +INT recFindSubDirs(DWORD dwFlags, + TCHAR szSrcPath[MAX_PATH], + TCHAR szDestPath[MAX_PATH], + BOOL *doMore) +{ + HANDLE hFile; + WIN32_FIND_DATA findBuffer; + TCHAR tmpDestPath[MAX_PATH], tmpSrcPath[MAX_PATH]; + INT filesReplaced = 0, i; + + /* Add a wildcard to dest end so the it will be easy to itterate + over all the files and directorys in the dest directory */ + _tcscat(szDestPath, _T("*")); + + /* Get the first file in the directory */ + hFile = FindFirstFile (szDestPath, &findBuffer); + + /* Remove the star added earlyer to dest path */ + for(i = (_tcslen(szDestPath) - 1); i > -1; i--) + if(szDestPath[i] != _T('\\')) + szDestPath[i] = _T('\0'); + else + break; + + /* Iterate over all filed directories in the dest dir */ + do + { + /* Save the source path so that it will not be wrecked */ + _tcscpy(tmpSrcPath,szSrcPath); + /* Check for reading problems */ + if(hFile == INVALID_HANDLE_VALUE) + { + ConOutFormatMessage (GetLastError(), tmpSrcPath); + return filesReplaced; + } + + /* Check if the we should enter the dir or if it is a file + or . or .. if so thake the next object to process */ + if(!_tcscmp (findBuffer.cFileName, _T(".")) || + !_tcscmp (findBuffer.cFileName, _T(".."))|| + IsExistingFile(findBuffer.cFileName)) + continue; + /* Add the destpath and the new dir path to tempDestPath */ + _tcscpy(tmpDestPath,szDestPath); + _tcscat (tmpDestPath, findBuffer.cFileName); + /* Make sure that we have a directory */ + if(IsExistingDirectory(tmpDestPath)) + { + /* Add a \ to the end or the path */ + if(szDestPath[_tcslen(tmpDestPath) - 1] != _T('\\')) + _tcscat(tmpDestPath, _T("\\")); + /* Call the function to replace files in the new directory */ + filesReplaced += recReplace(dwFlags, tmpSrcPath, tmpDestPath, doMore); + /* If there were problems break e.g. read-only file */ + if(!*doMore) + break; + _tcscpy(tmpSrcPath,szSrcPath); + /* Controle the next level of subdirs */ + filesReplaced += recFindSubDirs(dwFlags,tmpSrcPath,tmpDestPath, doMore); + if(!*doMore) + break; + } + /* Get the next handle */ + } while(FindNextFile (hFile, &findBuffer)); + + return filesReplaced; +} + +INT cmd_replace (LPTSTR cmd, LPTSTR param) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LPTSTR *arg; + INT argc, i,filesReplaced = 0, nFiles, srcIndex = -1, destIndex = -1; + DWORD dwFlags = 0; + TCHAR szDestPath[MAX_PATH], szSrcPath[MAX_PATH], tmpSrcPath[MAX_PATH]; + BOOL doMore = TRUE; + + /* Help wanted? */ + if (!_tcsncmp (param, _T("/?"), 2)) + { + ConOutResPaging(TRUE,STRING_REPLACE_HELP1); + return 0; + } + + /* Divide the argument in to an array of c-strings */ + arg = split (param, &argc, FALSE); + nFiles = argc; + + /* Read options */ + for (i = 0; i < argc; i++) + { + if (arg[i][0] == _T('/')) + { + if (_tcslen(arg[i]) == 2) + { + switch (_totupper(arg[i][1])) + { + case _T('A'): + dwFlags |= REPLACE_ADD; + break; + case _T('P'): + dwFlags |= REPLACE_CONFIRM; + break; + case _T('R'): + dwFlags |= REPLACE_READ_ONLY; + break; + case _T('S'): + dwFlags |= REPLACE_SUBDIR; + break; + case _T('W'): + dwFlags |= REPLACE_DISK; + break; + case _T('U'): + dwFlags |= REPLACE_UPDATE; + break; + default: + invalid_switch(arg[i]); + return 0; + } + } + else + { + invalid_switch(arg[i]); + freep(arg); + return 0; + } + nFiles--; + } + else + { + if(srcIndex == -1) + { + srcIndex = i; + } + else if(destIndex == -1) + { + destIndex = i; + } + else + { + invalid_switch(arg[i]); + freep(arg); + return 0; + } + } + } + + /* See so that at least source is there */ + if (nFiles < 1) + { + ConOutResPaging(TRUE,STRING_REPLACE_HELP2); + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); + freep(arg); + return 1; + } + /* Check so that not both update and add switch is added and subdir */ + if((dwFlags & REPLACE_UPDATE || dwFlags & REPLACE_SUBDIR) && (dwFlags & REPLACE_ADD)) + { + ConOutResPaging(TRUE,STRING_REPLACE_ERROR4); + ConOutResPaging(TRUE,STRING_REPLACE_HELP7); + freep(arg); + return 1; + } + + /* If we have a destination get the full path */ + if(destIndex != -1) + { + if(_tcslen(arg[destIndex]) == 2 && arg[destIndex][1] == ':') + GetRootPath(arg[destIndex],szDestPath,MAX_PATH); + else + { + /* Check for wildcards in destination directory */ + if (_tcschr (arg[destIndex], _T('*')) != NULL || + _tcschr (arg[destIndex], _T('?')) != NULL) + { + LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR2, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg,arg[destIndex]); + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); + freep(arg); + return 1; + } + getPath(szDestPath, arg[destIndex]); + /* Make sure that destination exists */ + if(!IsExistingDirectory(szDestPath)) + { + LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR2, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, szDestPath); + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); + freep(arg); + return 1; + } + } + } + else + { + /* Dest is current dir */ + GetCurrentDirectory(MAX_PATH,szDestPath); + } + + /* Get the full source path */ + if(!(_tcslen(arg[srcIndex]) == 2 && arg[srcIndex][1] == ':')) + getPath(szSrcPath, arg[srcIndex]); + else + _tcscpy(szSrcPath,arg[srcIndex]); + + /* Source does not have wildcards */ + if (_tcschr (arg[srcIndex], _T('*')) == NULL && + _tcschr (arg[srcIndex], _T('?')) == NULL) + { + /* Check so that source is not a directory, because that is not allowed */ + if(IsExistingDirectory(szSrcPath)) + { + LoadString(CMD_ModuleHandle, STRING_REPLACE_ERROR6, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, szSrcPath); + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); + freep(arg); + return 1; + } + /* Check if the file exists */ + if(!IsExistingFile(szSrcPath)) + { + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); + freep(arg); + return 1; + } + } + /* /w switch is set so wait for any key to be pressed */ + if(dwFlags & REPLACE_DISK) + { + msg_pause(); + cgetchar(); + } + + /* Add an extra \ to the destination path if needed */ + if(szDestPath[_tcslen(szDestPath) - 1] != _T('\\')) + _tcscat(szDestPath, _T("\\")); + + /* Save source path */ + _tcscpy(tmpSrcPath,szSrcPath); + /* Replace in dest dir */ + filesReplaced += recReplace(dwFlags, tmpSrcPath, szDestPath, &doMore); + /* If subdir switch is set replace in the subdirs to */ + if(dwFlags & REPLACE_SUBDIR && doMore) + { + filesReplaced += recFindSubDirs(dwFlags, szSrcPath, szDestPath, &doMore); + } + + /* If source == dest write no more */ + if(filesReplaced != -1) + { + /* No files replaced */ + if(filesReplaced==0) + { + /* Add switch dependent output */ + if(dwFlags & REPLACE_ADD) + ConOutResPaging(TRUE,STRING_REPLACE_HELP7); + else + ConOutResPaging(TRUE,STRING_REPLACE_HELP3); + } + /* Some files replaced */ + else + { + /* Add switch dependent output */ + if(dwFlags & REPLACE_ADD) + LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP8, szMsg, RC_STRING_MAX_SIZE); + else + LoadString(CMD_ModuleHandle, STRING_REPLACE_HELP4, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintf(szMsg, filesReplaced); + } + } + /* Return memory */ + freep(arg); + return 1; +} +#endif /* INCLUDE_CMD_REPLACE */ Propchange: trunk/reactos/base/shell/cmd/replace.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/shell/cmd/replace.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h (original) +++ trunk/reactos/base/shell/cmd/resource.h Thu Sep 27 12:35:08 2007 @@ -63,8 +63,13 @@ #define STRING_TIME_ERROR1 348 #define STRING_TYPE_ERROR1 349 #define STRING_WINDOW_ERROR1 350 - - +#define STRING_REPLACE_ERROR1 351 +#define STRING_REPLACE_ERROR2 352 +#define STRING_REPLACE_ERROR3 353 +#define STRING_REPLACE_ERROR4 354 +#define STRING_REPLACE_ERROR5 355 +#define STRING_REPLACE_ERROR6 356 +#define STRING_REPLACE_ERROR7 357 #define STRING_ATTRIB_HELP 600 #define STRING_ALIAS_HELP 601 @@ -223,6 +228,18 @@ #define STRING_MD_ERROR 725 #define STRING_MD_ERROR2 726 +#define STRING_REPLACE_HELP1 727 +#define STRING_REPLACE_HELP2 728 +#define STRING_REPLACE_HELP3 729 +#define STRING_REPLACE_HELP4 730 +#define STRING_REPLACE_HELP5 731 +#define STRING_REPLACE_HELP6 732 +#define STRING_REPLACE_HELP7 733 +#define STRING_REPLACE_HELP8 734 +#define STRING_REPLACE_HELP9 735 +#define STRING_REPLACE_HELP10 736 +#define STRING_REPLACE_HELP11 737 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800

1 0

[weiden] 29239: Fix typo (copy&paste)
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 10:28:30 2007 New Revision: 29239 URL: http://svn.reactos.org/svn/reactos?rev=29239&view=rev Log: Fix typo (copy&paste) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Sep 27 10:28:30 2007 @@ -256,7 +256,7 @@ dll\win32\wtsapi32\wtsapi32.dll 1 dll\win32\beepmidi\beepmidi.dll 1 dll\win32\shellext\deskadp\deskadp.dll 1 -dll\win32\shellext\deskadp\deskmon.dll 1 +dll\win32\shellext\deskmon\deskmon.dll 1 ; Drivers drivers\base\bootvid\bootvid.dll 1

1 0

[weiden] 29238: Display the resource page in device properties
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 09:51:08 2007 New Revision: 29238 URL: http://svn.reactos.org/svn/reactos?rev=29238&view=rev Log: Display the resource page in device properties Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c trunk/reactos/base/applications/mscutils/devmgmt/precomp.h Modified: trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/enumdevices.c Thu Sep 27 09:51:08 2007 @@ -87,7 +87,7 @@ DevicePropertiesExW(hTreeView, NULL, (LPTSTR)tvItem.lParam, - 0, + DPF_EXTENDED, FALSE); } Modified: trunk/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/precomp.h Thu Sep 27 09:51:08 2007 @@ -9,6 +9,7 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <commctrl.h> +#include <dll/devmgr/devmgr.h> #include "resource.h" #ifdef _MSC_VER @@ -53,26 +54,6 @@ /* enumdevices.c */ -// undocumented API's from devmgr -#ifdef _UNICODE -#define DevicePropertiesEx DevicePropertiesExW -INT_PTR -WINAPI -DevicePropertiesExW(IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr); -#else -#define DevicePropertiesEx DevicePropertiesExA -INT_PTR -WINAPI -DevicePropertiesExA(IN HWND hWndParent OPTIONAL, - IN LPCSTR lpMachineName OPTIONAL, - IN LPCSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr); -#endif VOID FreeDeviceStrings(HWND hTreeView); VOID OpenPropSheet(HWND hTreeView, HTREEITEM hItem);

1 0

[weiden] 29237: Let crt parse the command line parameters
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 09:49:46 2007 New Revision: 29237 URL: http://svn.reactos.org/svn/reactos?rev=29237&view=rev Log: Let crt parse the command line parameters Modified: trunk/reactos/base/applications/control/control.c Modified: trunk/reactos/base/applications/control/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/control.c (original) +++ trunk/reactos/base/applications/control/control.c Thu Sep 27 09:49:46 2007 @@ -386,46 +386,39 @@ return 0; } - -int WINAPI -_tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - LPTSTR lpCommandLine; - LPTSTR lpParam; - - hInst = hInstance; - CTL_DEBUG((_T("My Control Panel\r\n"))); - - lpCommandLine = GetCommandLine(); - - CTL_DEBUG((_T("CommandLine: %s\n"), lpCommandLine)); - - lpParam = _tcschr(lpCommandLine, _T(' ')); - if (lpParam == NULL) +int +_tmain(int argc, const TCHAR *argv[]) +{ + STARTUPINFO si; + + si.cb = sizeof(si); + GetStartupInfo(&si); + + hInst = GetModuleHandle(NULL); + + if (argc <= 1) { /* No argument on the command line */ - return RunControlPanelWindow(nCmdShow); - } - - lpParam++; - - if (_tcsicmp(lpParam, _T("desktop")) == 0) + return RunControlPanelWindow(si.wShowWindow); + } + + if (_tcsicmp(argv[1], _T("desktop")) == 0) { return RunControlPanel(_T("desk.cpl"), 0); } - else if (_tcsicmp(lpParam, _T("date/time")) == 0) + else if (_tcsicmp(argv[1], _T("date/time")) == 0) { return RunControlPanel(_T("timedate.cpl"), 0); } - else if (_tcsicmp(lpParam, _T("international")) == 0) + else if (_tcsicmp(argv[1], _T("international")) == 0) { return RunControlPanel(_T("intl.cpl"), 0); } - else if (_tcsicmp(lpParam, _T("mouse")) == 0) + else if (_tcsicmp(argv[1], _T("mouse")) == 0) { return RunControlPanel(_T("main.cpl"), 0); } - else if (_tcsicmp(lpParam, _T("keyboard")) == 0) + else if (_tcsicmp(argv[1], _T("keyboard")) == 0) { return RunControlPanel(_T("main.cpl"), 1); }

1 0

[weiden] 29236: Add an initial (incomplete, not functional) implementation of the display monitor shell extension for desk.cpl
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 09:45:03 2007 New Revision: 29236 URL: http://svn.reactos.org/svn/reactos?rev=29236&view=rev Log: Add an initial (incomplete, not functional) implementation of the display monitor shell extension for desk.cpl Added: trunk/reactos/dll/win32/shellext/deskmon/ trunk/reactos/dll/win32/shellext/deskmon/deskmon.c (with props) trunk/reactos/dll/win32/shellext/deskmon/deskmon.h (with props) trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild (with props) trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc (with props) trunk/reactos/dll/win32/shellext/deskmon/deskmon.spec (with props) trunk/reactos/dll/win32/shellext/deskmon/lang/ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (with props) trunk/reactos/dll/win32/shellext/deskmon/precomp.h (with props) trunk/reactos/dll/win32/shellext/deskmon/resource.h (with props) trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (with props) trunk/reactos/dll/win32/shellext/deskmon/shxiface.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/shellext/shellext.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=292… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Sep 27 09:45:03 2007 @@ -55,6 +55,7 @@ <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> <property name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <property name="BASEADDRESS_DESKMON" value="0x6d400000" /> <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Thu Sep 27 09:45:03 2007 @@ -237,6 +237,11 @@ HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Adapter CPL Extension" HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskadp.dll" HKCR,"CLSID\{42071712-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; deskmon.dll shell extension +HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}","",0x00000000,"Display Monitor CPL Extension" +HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","",0x00020000,"%SystemRoot%\system32\deskmon.dll" +HKCR,"CLSID\{42071713-76d4-11d1-8b24-00a0c9068ff3}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ; For comcat.dll HKCR,"CLSID\{0002E005-0000-0000-C000-000000000046}","",0x00000000,"StdComponentCategoriesMgr" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Thu Sep 27 09:45:03 2007 @@ -767,6 +767,9 @@ ; deskadp.dll shell extension HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Adapter CPL Extension","",0x00000000,"{42071712-76d4-11d1-8b24-00a0c9068ff3}" +; deskmon.dll shell extension +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Monitor CPL Extension","",0x00000000,"{42071713-76d4-11d1-8b24-00a0c9068ff3}" + ; Where to download the Mozilla ActiveX control HKLM,"SOFTWARE\ReactOS\shdocvw","MozillaUrl",0x00000000,"http://links.reactos.org/mozactivex" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Sep 27 09:45:03 2007 @@ -256,6 +256,7 @@ dll\win32\wtsapi32\wtsapi32.dll 1 dll\win32\beepmidi\beepmidi.dll 1 dll\win32\shellext\deskadp\deskadp.dll 1 +dll\win32\shellext\deskadp\deskmon.dll 1 ; Drivers drivers\base\bootvid\bootvid.dll 1 Added: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.c (added) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.c Thu Sep 27 09:45:03 2007 @@ -1,0 +1,251 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +static HINSTANCE hInstance; + +static VOID +InitMonitorDialog(PDESKMONITOR This) +{ + LPTSTR lpMonitorName; + + lpMonitorName = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_MONITORNAME)); + if (lpMonitorName != NULL) + { + SetDlgItemText(This->hwndDlg, + IDC_MONITORNAME, + lpMonitorName); + + LocalFree((HLOCAL)lpMonitorName); + } + + if (This->DeskExtInterface != NULL) + { + /* FIXME */ + } +} + +static INT_PTR CALLBACK +MonitorDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDESKMONITOR This; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + { + This = (PDESKMONITOR)GetWindowLongPtr(hwndDlg, + DWL_USER); + } + + switch (uMsg) + { + case WM_INITDIALOG: + This = (PDESKMONITOR)((LPCPROPSHEETPAGE)lParam)->lParam; + This->hwndDlg = hwndDlg; + SetWindowLongPtr(hwndDlg, + DWL_USER, + (LONG_PTR)This); + + InitMonitorDialog(This); + Ret = TRUE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_MONITORPROPERTIES: + break; + } + + break; + } + + return Ret; +} + +static VOID +IDeskMonitor_Destroy(PDESKMONITOR This) +{ + if (This->pdtobj != NULL) + { + IDataObject_Release(This->pdtobj); + This->pdtobj = NULL; + } + + if (This->DeskExtInterface != NULL) + { + LocalFree((HLOCAL)This->DeskExtInterface); + This->DeskExtInterface = NULL; + } +} + +ULONG +IDeskMonitor_AddRef(PDESKMONITOR This) +{ + ULONG ret; + + ret = InterlockedIncrement((PLONG)&This->ref); + if (ret == 1) + InterlockedIncrement(&dll_refs); + + return ret; +} + +ULONG +IDeskMonitor_Release(PDESKMONITOR This) +{ + ULONG ret; + + ret = InterlockedDecrement((PLONG)&This->ref); + if (ret == 0) + { + IDeskMonitor_Destroy(This); + InterlockedDecrement(&dll_refs); + + HeapFree(GetProcessHeap(), + 0, + This); + } + + return ret; +} + +HRESULT STDMETHODCALLTYPE +IDeskMonitor_QueryInterface(PDESKMONITOR This, + REFIID iid, + PVOID *pvObject) +{ + *pvObject = NULL; + + if (IsEqualIID(iid, + &IID_IShellPropSheetExt) || + IsEqualIID(iid, + &IID_IUnknown)) + { + *pvObject = impl_to_interface(This, IShellPropSheetExt); + } + else if (IsEqualIID(iid, + &IID_IShellExtInit)) + { + *pvObject = impl_to_interface(This, IShellExtInit); + } + else if (IsEqualIID(iid, + &IID_IClassFactory)) + { + *pvObject = impl_to_interface(This, IClassFactory); + } + else + { + DPRINT1("IDeskMonitor::QueryInterface(%p,%p): E_NOINTERFACE\n", iid, pvObject); + return E_NOINTERFACE; + } + + IDeskMonitor_AddRef(This); + return S_OK; +} + +HRESULT +IDeskMonitor_Initialize(PDESKMONITOR This, + LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, + HKEY hkeyProgID) +{ + DPRINT1("IDeskMonitor::Initialize(%p,%p,%p)\n", pidlFolder, pdtobj, hkeyProgID); + + if (pdtobj != NULL) + { + IDataObject_AddRef(pdtobj); + This->pdtobj = pdtobj; + + /* Get a copy of the desk.cpl extension interface */ + This->DeskExtInterface = QueryDeskCplExtInterface(This->pdtobj); + if (This->DeskExtInterface != NULL) + return S_OK; + } + + return S_FALSE; +} + +HRESULT +IDeskMonitor_AddPages(PDESKMONITOR This, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam) +{ + HPROPSHEETPAGE hpsp; + PROPSHEETPAGE psp; + + DPRINT1("IDeskMonitor::AddPages(%p,%p)\n", pfnAddPage, lParam); + + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hInstance; + psp.pszTemplate = MAKEINTRESOURCE(IDD_MONITOR); + psp.pfnDlgProc = MonitorDlgProc; + psp.lParam = (LPARAM)This; + + hpsp = CreatePropertySheetPage(&psp); + if (hpsp != NULL && pfnAddPage(hpsp, lParam)) + return S_OK; + + return S_FALSE; +} + +HRESULT +IDeskMonitor_ReplacePage(PDESKMONITOR This, + EXPPS uPageID, + LPFNADDPROPSHEETPAGE pfnReplacePage, + LPARAM lParam) +{ + DPRINT1("IDeskMonitor::ReplacePage(%u,%p,%p)\n", uPageID, pfnReplacePage, lParam); + return E_NOTIMPL; +} + +HRESULT +IDeskMonitor_Constructor(REFIID riid, + LPVOID *ppv) +{ + PDESKMONITOR This; + HRESULT hRet = E_OUTOFMEMORY; + + DPRINT1("IDeskMonitor::Constructor(%p,%p)\n", riid, ppv); + + This = HeapAlloc(GetProcessHeap(), + 0, + sizeof(*This)); + if (This != NULL) + { + ZeroMemory(This, + sizeof(*This)); + + IDeskMonitor_InitIface(This); + + hRet = IDeskMonitor_QueryInterface(This, + riid, + ppv); + if (!SUCCEEDED(hRet)) + IDeskMonitor_Release(This); + } + + return hRet; +} + +BOOL STDCALL +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hInstance = hinstDLL; + DisableThreadLibraryCalls(hInstance); + break; + } + + return TRUE; +} Propchange: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/deskmon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.h (added) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.h Thu Sep 27 09:45:03 2007 @@ -1,0 +1,60 @@ +#ifndef __DESKMON__H +#define __DESKMON__H + +typedef struct _DESKMONITOR +{ + const struct IShellPropSheetExtVtbl *lpIShellPropSheetExtVtbl; + const struct IShellExtInitVtbl *lpIShellExtInitVtbl; + const struct IClassFactoryVtbl *lpIClassFactoryVtbl; + DWORD ref; + + HWND hwndDlg; + PDESK_EXT_INTERFACE DeskExtInterface; + IDataObject *pdtobj; +} DESKMONITOR, *PDESKMONITOR; + +extern LONG dll_refs; + +#define impl_to_interface(impl,iface) (struct iface *)(&(impl)->lp##iface##Vtbl) +#define interface_to_impl(instance,iface) ((PDESKMONITOR)((ULONG_PTR)instance - FIELD_OFFSET(DESKMONITOR,lp##iface##Vtbl))) + +HRESULT +IDeskMonitor_Constructor(REFIID riid, + LPVOID *ppv); + +VOID +IDeskMonitor_InitIface(PDESKMONITOR This); + +HRESULT STDMETHODCALLTYPE +IDeskMonitor_QueryInterface(PDESKMONITOR This, + REFIID iid, + PVOID *pvObject); + +ULONG +IDeskMonitor_AddRef(PDESKMONITOR This); + +ULONG +IDeskMonitor_Release(PDESKMONITOR This); + +HRESULT +IDeskMonitor_Initialize(PDESKMONITOR This, + LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, + HKEY hkeyProgID); + +HRESULT +IDeskMonitor_AddPages(PDESKMONITOR This, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam); + +HRESULT +IDeskMonitor_ReplacePage(PDESKMONITOR This, + EXPPS uPageID, + LPFNADDPROPSHEETPAGE pfnReplacePage, + LPARAM lParam); + +static const GUID CLSID_IDeskMonitor = {0x42071713,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; + +ULONG __cdecl DbgPrint(PCCH Format,...); + +#endif /* __DESKMON__H */ Propchange: trunk/reactos/dll/win32/shellext/deskmon/deskmon.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild (added) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild Thu Sep 27 09:45:03 2007 @@ -1,0 +1,21 @@ +<module name="deskmon" type="win32dll" baseaddress="${BASEADDRESS_DESKMON}" installbase="system32" installname="deskmon.dll" unicode="yes"> + <importlibrary definition="deskmon.spec.def" /> + <include base="deskmon">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <library>ole32</library> + <library>uuid</library> + <library>msvcrt</library> + <file>deskmon.c</file> + <file>shxiface.c</file> + <file>deskmon.rc</file> + <file>deskmon.spec</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/reactos/dll/win32/shellext/deskmon/deskmon.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc Thu Sep 27 09:45:03 2007 @@ -1,0 +1,12 @@ +/* $Id: slayer.rc 24931 2006-11-28 19:35:42Z janderwald $ */ + +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advanced display monitor properties\0" +#define REACTOS_STR_INTERNAL_NAME "deskmon\0" +#define REACTOS_STR_ORIGINAL_FILENAME "deskmon.dll\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/dll/win32/shellext/deskmon/deskmon.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/deskmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/deskmon.spec (added) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.spec Thu Sep 27 09:45:03 2007 @@ -1,0 +1,4 @@ +# deskmon.dll exports + + 1 stdcall DllCanUnloadNow() + 2 stdcall DllGetClassObject(ptr ptr ptr) Propchange: trunk/reactos/dll/win32/shellext/deskmon/deskmon.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Thu Sep 27 09:45:03 2007 @@ -1,0 +1,12 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_MONITOR DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Monitor type", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "&Properties", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED +END + Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/precomp.h (added) +++ trunk/reactos/dll/win32/shellext/deskmon/precomp.h Thu Sep 27 09:45:03 2007 @@ -1,0 +1,13 @@ +#ifndef __PRECOMP__H +#define __PRECOMP__H + +#define COBJMACROS +#include <windows.h> +#include <tchar.h> +#include <stdio.h> +#include <shlobj.h> +#include <dll/desk/deskcplx.h> +#include "deskmon.h" +#include "resource.h" + +#endif /* __PRECOMP__H */ Propchange: trunk/reactos/dll/win32/shellext/deskmon/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/resource.h (added) +++ trunk/reactos/dll/win32/shellext/deskmon/resource.h Thu Sep 27 09:45:03 2007 @@ -1,0 +1,9 @@ +#ifndef __RESOURCE__H +#define __RESOURCE__H + +#define IDD_MONITOR 100 + +#define IDC_MONITORNAME 201 +#define IDC_MONITORPROPERTIES 202 + +#endif /* __RESOURCE__H */ Propchange: trunk/reactos/dll/win32/shellext/deskmon/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Thu Sep 27 09:45:03 2007 @@ -1,0 +1,7 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "lang/en-US.rc" + Propchange: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/deskmon/shxiface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/shxiface.c (added) +++ trunk/reactos/dll/win32/shellext/deskmon/shxiface.c Thu Sep 27 09:45:03 2007 @@ -1,0 +1,209 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +LONG dll_refs = 0; + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IShellPropSheetExt_QueryInterface(IShellPropSheetExt *iface, + REFIID iid, + PVOID *pvObject) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskMonitor_QueryInterface(This, + iid, + pvObject); +} + +static ULONG STDMETHODCALLTYPE +IDeskMonitor_IShellPropSheetExt_AddRef(IShellPropSheetExt* iface) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskMonitor_AddRef(This); +} + +static ULONG STDMETHODCALLTYPE +IDeskMonitor_IShellPropSheetExt_Release(IShellPropSheetExt* iface) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskMonitor_Release(This); +} + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IShellPropSheetExt_AddPages(IShellPropSheetExt* iface, + LPFNADDPROPSHEETPAGE pfnAddPage, + LPARAM lParam) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskMonitor_AddPages(This, + pfnAddPage, + lParam); +} + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IShellPropSheetExt_ReplacePage(IShellPropSheetExt* iface, + EXPPS uPageID, + LPFNADDPROPSHEETPAGE pfnReplacePage, + LPARAM lParam) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellPropSheetExt); + return IDeskMonitor_ReplacePage(This, + uPageID, + pfnReplacePage, + lParam); +} + +static IShellPropSheetExtVtbl efvtIShellPropSheetExt = +{ + IDeskMonitor_IShellPropSheetExt_QueryInterface, + IDeskMonitor_IShellPropSheetExt_AddRef, + IDeskMonitor_IShellPropSheetExt_Release, + IDeskMonitor_IShellPropSheetExt_AddPages, + IDeskMonitor_IShellPropSheetExt_ReplacePage +}; + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IShellExtInit_QueryInterface(IShellExtInit *iface, + REFIID iid, + PVOID *pvObject) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellExtInit); + return IDeskMonitor_QueryInterface(This, + iid, + pvObject); +} + +static ULONG STDMETHODCALLTYPE +IDeskMonitor_IShellExtInit_AddRef(IShellExtInit* iface) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellExtInit); + return IDeskMonitor_AddRef(This); +} + +static ULONG STDMETHODCALLTYPE +IDeskMonitor_IShellExtInit_Release(IShellExtInit* iface) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellExtInit); + return IDeskMonitor_Release(This); +} + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IShellExtInit_Initialize(IShellExtInit* iface, + LPCITEMIDLIST pidlFolder, + IDataObject *pdtobj, + HKEY hkeyProgID) +{ + PDESKMONITOR This = interface_to_impl(iface, IShellExtInit); + return IDeskMonitor_Initialize(This, + pidlFolder, + pdtobj, + hkeyProgID); +} + +static IShellExtInitVtbl efvtIShellExtInit = +{ + IDeskMonitor_IShellExtInit_QueryInterface, + IDeskMonitor_IShellExtInit_AddRef, + IDeskMonitor_IShellExtInit_Release, + IDeskMonitor_IShellExtInit_Initialize +}; + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IClassFactory_QueryInterface(IClassFactory *iface, + REFIID iid, + PVOID *pvObject) +{ + PDESKMONITOR This = interface_to_impl(iface, IClassFactory); + return IDeskMonitor_QueryInterface(This, + iid, + pvObject); +} + +static ULONG STDMETHODCALLTYPE +IDeskMonitor_IClassFactory_AddRef(IClassFactory* iface) +{ + PDESKMONITOR This = interface_to_impl(iface, IClassFactory); + return IDeskMonitor_AddRef(This); +} + +static ULONG STDMETHODCALLTYPE +IDeskMonitor_IClassFactory_Release(IClassFactory* iface) +{ + PDESKMONITOR This = interface_to_impl(iface, IClassFactory); + return IDeskMonitor_Release(This); +} + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IClassFactory_CreateInstance(IClassFactory *iface, + IUnknown * pUnkOuter, + REFIID riid, + PVOID *ppvObject) +{ + if (pUnkOuter != NULL && + !IsEqualIID(riid, + &IID_IUnknown)) + { + return CLASS_E_NOAGGREGATION; + } + + return IDeskMonitor_Constructor(riid, + ppvObject); +} + +static HRESULT STDMETHODCALLTYPE +IDeskMonitor_IClassFactory_LockServer(IClassFactory *iface, + BOOL fLock) +{ + if (fLock) + InterlockedIncrement(&dll_refs); + else + InterlockedDecrement(&dll_refs); + + return S_OK; +} + +static IClassFactoryVtbl efvtIClassFactory = +{ + IDeskMonitor_IClassFactory_QueryInterface, + IDeskMonitor_IClassFactory_AddRef, + IDeskMonitor_IClassFactory_Release, + IDeskMonitor_IClassFactory_CreateInstance, + IDeskMonitor_IClassFactory_LockServer, +}; + +VOID +IDeskMonitor_InitIface(PDESKMONITOR This) +{ + This->lpIShellPropSheetExtVtbl = &efvtIShellPropSheetExt; + This->lpIShellExtInitVtbl = &efvtIShellExtInit; + This->lpIClassFactoryVtbl = &efvtIClassFactory; + + IDeskMonitor_AddRef(This); +} + +HRESULT WINAPI +DllGetClassObject(REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + if (ppv == NULL) + return E_INVALIDARG; + + *ppv = NULL; + if (IsEqualCLSID(rclsid, + &CLSID_IDeskMonitor)) + { + return IDeskMonitor_Constructor(riid, + ppv); + } + + DPRINT1("DllGetClassObject: CLASS_E_CLASSNOTAVAILABLE\n"); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI +DllCanUnloadNow(VOID) +{ + return dll_refs == 0 ? S_OK : S_FALSE; +} Propchange: trunk/reactos/dll/win32/shellext/deskmon/shxiface.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shellext/shellext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/shellex… ============================================================================== --- trunk/reactos/dll/win32/shellext/shellext.rbuild (original) +++ trunk/reactos/dll/win32/shellext/shellext.rbuild Thu Sep 27 09:45:03 2007 @@ -7,4 +7,7 @@ <directory name="deskadp"> <xi:include href="deskadp/deskadp.rbuild" /> </directory> + <directory name="deskmon"> + <xi:include href="deskmon/deskmon.rbuild" /> + </directory> </group>

1 0

[weiden] 29235: Once again change back the GUID to the real one...
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 09:27:23 2007 New Revision: 29235 URL: http://svn.reactos.org/svn/reactos?rev=29235&view=rev Log: Once again change back the GUID to the real one... Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 09:27:23 2007 @@ -56,7 +56,7 @@ LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); -static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf9}}; +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; ULONG __cdecl DbgPrint(PCCH Format,...);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs