Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29254: - Add missing KERNEL_LARGE_STACK_COMMIT definition to DDK. - Fix typo in MMWSL. - Add RtlRandom to NDK. - Add MEMORY_PRIORITY values to NDK. - Add KeAcquireSpinLockRaiseToSynch to NDK. - Make MmInitializeProcessAddressSpace take two more parameters: one to specify flags, such as large page support, and another one to define the process being cloned, when fork() support will be added. - Add KeInvalidAccessAllowed to deal with page faults in the special S-List code. The assembly
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 22:07:44 2007 New Revision: 29254 URL: http://svn.reactos.org/svn/reactos?rev=29254&view=rev Log: - Add missing KERNEL_LARGE_STACK_COMMIT definition to DDK. - Fix typo in MMWSL. - Add RtlRandom to NDK. - Add MEMORY_PRIORITY values to NDK. - Add KeAcquireSpinLockRaiseToSynch to NDK. - Make MmInitializeProcessAddressSpace take two more parameters: one to specify flags, such as large page support, and another one to define the process being cloned, when fork() support will be added. - Add KeInvalidAccessAllowed to deal with page faults in the special S-List code. The assembly code currently handles simple faults, but our MmAccessFault handler needs to start verifying the fault too. - Mark LoaderReserve pages as LoaderFree, it seems they end up this way in Windows. - Use MmNumberOfPhysicalPages instead of MmStats.NrTotalPages. All NDK changes are discussed with Alex. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/procsup.c trunk/reactos/ntoskrnl/ps/process.c (contents, props changed) Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Sep 27 22:07:44 2007 @@ -231,7 +231,7 @@ #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 - +#define KERNEL_LARGE_STACK_COMMIT 12288 #define DPFLTR_ERROR_LEVEL 0 #define DPFLTR_WARNING_LEVEL 1 Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Sep 27 22:07:44 2007 @@ -133,6 +133,11 @@ IN PKLOCK_QUEUE_HANDLE LockHandle ); +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch( + IN OUT PKSPIN_LOCK SpinLock +); // // Interrupt Functions Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Thu Sep 27 22:07:44 2007 @@ -548,7 +548,7 @@ ULONG NextSlot; PMMWSLE Wsle; ULONG LastInitializedWsle; - ULONG NonDirectcout; + ULONG NonDirectCount; PMMWSLE_HASH HashTable; ULONG HashTableSize; ULONG NumberOfCommittedPageTables; Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Thu Sep 27 22:07:44 2007 @@ -97,6 +97,13 @@ #define PROCESS_PRIORITY_IDLE 3 #define PROCESS_PRIORITY_NORMAL 8 #define PROCESS_PRIORITY_NORMAL_FOREGROUND 9 + +// +// Process memory priorities +// +#define MEMORY_PRIORITY_BACKGROUND 0 +#define MEMORY_PRIORITY_UNKNOWN 1 +#define MEMORY_PRIORITY_FOREGROUND 2 // // Process Priority Separation Values (OR) Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Thu Sep 27 22:07:44 2007 @@ -2923,6 +2923,13 @@ NTSYSAPI ULONG NTAPI +RtlRandom( + IN OUT PULONG Seed +); + +NTSYSAPI +ULONG +NTAPI RtlComputeCrc32( IN USHORT PartialCrc, IN PUCHAR Buffer, Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=292… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Sep 27 22:07:44 2007 @@ -1483,7 +1483,7 @@ &MsgEntry); /* Get total RAM size */ - Size = MmStats.NrTotalPages * PAGE_SIZE / 1024 / 1024; + Size = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; /* Create the string */ StringBuffer = InitBuffer->VersionBuffer; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Sep 27 22:07:44 2007 @@ -760,6 +760,10 @@ KeZeroPages(IN PVOID Address, IN ULONG Size); +BOOLEAN +FASTCALL +KeInvalidAccessAllowed(IN PVOID TrapInformation OPTIONAL); + VOID NTAPI KeRosDumpStackFrames( Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Sep 27 22:07:44 2007 @@ -13,6 +13,7 @@ extern ULONG MmTotalPagedPoolQuota; extern ULONG MmTotalNonPagedPoolQuota; extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; +extern ULONG MmNumberOfPhysicalPages; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; @@ -614,7 +615,9 @@ NTAPI MmInitializeProcessAddressSpace( IN PEPROCESS Process, + IN PEPROCESS Clone OPTIONAL, IN PVOID Section OPTIONAL, + IN OUT PULONG Flags, IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL ); Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2925… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Thu Sep 27 22:07:44 2007 @@ -249,7 +249,7 @@ &KeRosBiosVersion, &KeRosVideoBiosDate, &KeRosVideoBiosVersion, - MmStats.NrTotalPages * PAGE_SIZE); + MmNumberOfPhysicalPages * PAGE_SIZE); #endif } @@ -971,12 +971,6 @@ } } - /* 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); Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Thu Sep 27 22:07:44 2007 @@ -427,8 +427,8 @@ { /* It's over 16MB, so that memory gets marked as reserve */ Status = KiRosConfigureArcDescriptor(PageStart, - PageEnd, - LoaderReserve); + PageEnd, + LoaderFree); } else { @@ -448,7 +448,7 @@ /* Any code in the memory hole region ends up as reserve */ Status = KiRosConfigureArcDescriptor(PageStart, PageEnd, - LoaderReserve); + LoaderFree); } /* If we failed, break out, otherwise, go to the next BIOS block */ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Thu Sep 27 22:07:44 2007 @@ -799,6 +799,45 @@ if (OldIrql < APC_LEVEL) KeLowerIrql(OldIrql); } +BOOLEAN +FASTCALL +KeInvalidAccessAllowed(IN PVOID TrapInformation OPTIONAL) +{ + ULONG Eip; + PKTRAP_FRAME TrapFrame = TrapInformation; + VOID NTAPI ExpInterlockedPopEntrySListFault(VOID); + + /* Don't do anything if we didn't get a trap frame */ + if (!TrapInformation) return FALSE; + + /* Check where we came from */ + switch (TrapFrame->SegCs) + { + /* Kernel mode */ + case KGDT_R0_CODE: + + /* Allow S-LIST Routine to fail */ + Eip = (ULONG)&ExpInterlockedPopEntrySListFault; + break; + + /* User code */ + case KGDT_R3_CODE | RPL_MASK: + + /* Allow S-LIST Routine to fail */ + //Eip = (ULONG)KeUserPopEntrySListFault; + Eip = 0; + break; + + default: + + /* Anything else gets a bugcheck */ + Eip = 0; + } + + /* Return TRUE if we want to keep the system up */ + return (TrapFrame->Eip == Eip) ? TRUE : FALSE; +} + VOID NTAPI KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c Thu Sep 27 22:07:44 2007 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/i386/ldt.c @@ -221,3 +220,4 @@ return STATUS_SUCCESS; } + Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Sep 27 22:07:44 2007 @@ -37,6 +37,8 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; + +ULONG MmNumberOfPhysicalPages; VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG KernelLength); @@ -347,6 +349,7 @@ * Free physical memory not used by the kernel */ MmStats.NrTotalPages = MmFreeLdrMemHigher/4; + MmNumberOfPhysicalPages = MmStats.NrTotalPages; if (!MmStats.NrTotalPages) { DbgPrint("Memory not detected, default to 8 MB\n"); @@ -427,13 +430,18 @@ MmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + ULONG Flags = 0; if (Phase == 0) { /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); /* Initialize the address space for the system process */ - MmInitializeProcessAddressSpace(PsGetCurrentProcess(), NULL, NULL); + MmInitializeProcessAddressSpace(PsGetCurrentProcess(), + NULL, + NULL, + &Flags, + NULL); /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); 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 22:07:44 2007 @@ -498,7 +498,9 @@ NTSTATUS NTAPI MmInitializeProcessAddressSpace(IN PEPROCESS Process, + IN PEPROCESS ProcessClone OPTIONAL, IN PVOID Section OPTIONAL, + IN OUT PULONG Flags, IN POBJECT_NAME_INFORMATION *AuditName OPTIONAL) { NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Sep 27 22:07:44 2007 @@ -555,7 +555,7 @@ /* Set default exit code */ Process->ExitStatus = STATUS_TIMEOUT; - + /* Check if this is the initial process being built */ if (Parent) { @@ -576,7 +576,7 @@ Status = MmInitializeHandBuiltProcess(Process, &DirectoryTableBase); if (!NT_SUCCESS(Status)) goto CleanupWithRef; } - + /* We now have an address space */ InterlockedOr((PLONG)&Process->Flags, PSF_HAS_ADDRESS_SPACE_BIT); @@ -596,7 +596,7 @@ /* Set default priority class */ Process->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; - + /* Check if we have a parent */ if (Parent) { @@ -628,7 +628,9 @@ { /* Initialize the address space */ Status = MmInitializeProcessAddressSpace(Process, + NULL, SectionObject, + &Flags, &Process-> SeAuditProcessCreationInfo. ImageFileName); @@ -644,13 +646,13 @@ } else { - /* This is a system process other than the boot one (MmInit1) */ + /* This is the initial system process */ Flags &= ~PS_LARGE_PAGES; Status = MmInitializeProcessAddressSpace(Process, NULL, - &Process-> - SeAuditProcessCreationInfo. - ImageFileName); + NULL, + &Flags, + NULL); if (!NT_SUCCESS(Status)) goto CleanupWithRef; /* Create a dummy image file name */ @@ -670,7 +672,7 @@ sizeof(OBJECT_NAME_INFORMATION)); } } - + /* Check if we have a section object and map the system DLL */ if (SectionObject) PspMapSystemDll(Process, NULL, FALSE); @@ -680,6 +682,7 @@ Process->UniqueProcessId = ExCreateHandle(PspCidTable, &CidEntry); if (!Process->UniqueProcessId) { + /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; goto CleanupWithRef; } @@ -701,6 +704,7 @@ /* Create PEB only for User-Mode Processes */ if (Parent) { + /* Create it */ Status = MmCreatePeb(Process); if (!NT_SUCCESS(Status)) goto CleanupWithRef; } Propchange: trunk/reactos/ntoskrnl/ps/process.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 29253: - Vendor import uniata 0.38c2. Authorship and license are listed in the header of every source code file.
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 21:58:24 2007 New Revision: 29253 URL: http://svn.reactos.org/svn/reactos?rev=29253&view=rev Log: - Vendor import uniata 0.38c2. Authorship and license are listed in the header of every source code file. Added: vendor/uniata/ vendor/uniata/0.38c2/ vendor/uniata/0.38c2/atactl/ vendor/uniata/0.38c2/atactl/Makefile (with props) vendor/uniata/0.38c2/atactl/atactl.cpp (with props) vendor/uniata/0.38c2/atactl/atactl.dep (with props) vendor/uniata/0.38c2/atactl/atactl.dsp (with props) vendor/uniata/0.38c2/atactl/atactl.dsw (with props) vendor/uniata/0.38c2/atactl/atactl.mak (with props) vendor/uniata/0.38c2/build_inf/ vendor/uniata/0.38c2/build_inf/Makefile (with props) vendor/uniata/0.38c2/build_inf/build_inf.cpp (with props) vendor/uniata/0.38c2/build_inf/build_inf.dep (with props) vendor/uniata/0.38c2/build_inf/build_inf.dsp (with props) vendor/uniata/0.38c2/build_inf/build_inf.dsw (with props) vendor/uniata/0.38c2/build_inf/build_inf.mak (with props) vendor/uniata/0.38c2/building.txt (with props) vendor/uniata/0.38c2/driver/ vendor/uniata/0.38c2/driver/Dist/ vendor/uniata/0.38c2/driver/Dist/OEMSETUP.INF (with props) vendor/uniata/0.38c2/driver/Dist/PciDumpEx.sys (with props) vendor/uniata/0.38c2/driver/Dist/TXTSETUP.OEM (with props) vendor/uniata/0.38c2/driver/Dist/atactl.exe (with props) vendor/uniata/0.38c2/driver/Dist/build_inf.exe (with props) vendor/uniata/0.38c2/driver/Dist/drv_ctl.exe (with props) vendor/uniata/0.38c2/driver/Dist/fix_dep.bat (with props) vendor/uniata/0.38c2/driver/Dist/readme_nt4.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_nt4_23c.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_nt4_old.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_w2k.txt (with props) vendor/uniata/0.38c2/driver/Dist/readme_xp.txt (with props) vendor/uniata/0.38c2/driver/Dist/rebuild_inf.bat (with props) vendor/uniata/0.38c2/driver/Dist/setup_nt3.bat (with props) vendor/uniata/0.38c2/driver/Dist/setup_w2k.bat (with props) vendor/uniata/0.38c2/driver/Dist/srchrep.exe (with props) vendor/uniata/0.38c2/driver/Dist/uata_2k.in_ (with props) vendor/uniata/0.38c2/driver/Dist/uata_2k.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_2k3.in_ (with props) vendor/uniata/0.38c2/driver/Dist/uata_2kh.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_nt4.bkp.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_nt4.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_xp.in_ (with props) vendor/uniata/0.38c2/driver/Dist/uata_xp.inf (with props) vendor/uniata/0.38c2/driver/Dist/uata_xph.inf (with props) vendor/uniata/0.38c2/driver/Dist/uniata (with props) vendor/uniata/0.38c2/driver/Dist/uniata_w2k.reg (with props) vendor/uniata/0.38c2/driver/Dist/uniata_w2k_uninst.reg (with props) vendor/uniata/0.38c2/driver/LOAD_S.BAT (with props) vendor/uniata/0.38c2/driver/LOAD_S2.BAT (with props) vendor/uniata/0.38c2/driver/LOAD_S2k.BAT (with props) vendor/uniata/0.38c2/driver/LOAD_S3.BAT (with props) vendor/uniata/0.38c2/driver/Lib/ vendor/uniata/0.38c2/driver/Lib/Debug/ vendor/uniata/0.38c2/driver/Lib/Debug/CrossNtK.lib (with props) vendor/uniata/0.38c2/driver/Lib/Debug/PostDbgMesgK.lib (with props) vendor/uniata/0.38c2/driver/Lib/Release/ vendor/uniata/0.38c2/driver/Lib/Release/CrossNtK.lib (with props) vendor/uniata/0.38c2/driver/Makefile (with props) vendor/uniata/0.38c2/driver/atapi.h (with props) vendor/uniata/0.38c2/driver/badblock.h (with props) vendor/uniata/0.38c2/driver/bm_devs.h (with props) vendor/uniata/0.38c2/driver/bsmaster.h (with props) vendor/uniata/0.38c2/driver/build.mak (with props) vendor/uniata/0.38c2/driver/config.h (with props) vendor/uniata/0.38c2/driver/id_ata.cpp (with props) vendor/uniata/0.38c2/driver/id_badblock.cpp (with props) vendor/uniata/0.38c2/driver/id_dma.cpp (with props) vendor/uniata/0.38c2/driver/id_init.cpp (with props) vendor/uniata/0.38c2/driver/id_probe.cpp (with props) vendor/uniata/0.38c2/driver/id_queue.cpp (with props) vendor/uniata/0.38c2/driver/id_queue.h (with props) vendor/uniata/0.38c2/driver/id_sata.cpp (with props) vendor/uniata/0.38c2/driver/id_sata.h (with props) vendor/uniata/0.38c2/driver/idedma.def (with props) vendor/uniata/0.38c2/driver/idedma.dep (with props) vendor/uniata/0.38c2/driver/idedma.mak (with props) vendor/uniata/0.38c2/driver/idedma.rc (with props) vendor/uniata/0.38c2/driver/inc/ vendor/uniata/0.38c2/driver/inc/CrNtDecl.h (with props) vendor/uniata/0.38c2/driver/inc/CrNtStubs.h (with props) vendor/uniata/0.38c2/driver/inc/CrossNt.h (with props) vendor/uniata/0.38c2/driver/inc/PostDbgMesg.h (with props) vendor/uniata/0.38c2/driver/inc/misc.h (with props) vendor/uniata/0.38c2/driver/inc/rwlock.h (with props) vendor/uniata/0.38c2/driver/ntddk_ex.h (with props) vendor/uniata/0.38c2/driver/ntddscsi.h (with props) vendor/uniata/0.38c2/driver/scsi.h (with props) vendor/uniata/0.38c2/driver/srb.h (with props) vendor/uniata/0.38c2/driver/stdafx.cpp (with props) vendor/uniata/0.38c2/driver/stdafx.h (with props) vendor/uniata/0.38c2/driver/todo.txt (with props) vendor/uniata/0.38c2/driver/tools.h (with props) vendor/uniata/0.38c2/driver/uata_ctl.h (with props) vendor/uniata/0.38c2/driver/uniata.mak (with props) vendor/uniata/0.38c2/driver/uniata_ver.h (with props) vendor/uniata/0.38c2/driver/uniata_ver.h_ (with props) vendor/uniata/0.38c2/pkg_files.dist (with props) vendor/uniata/0.38c2/pkg_files.src (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/uniata/0.38c2/atactl/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/Makefile?rev… Added: vendor/uniata/0.38c2/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.cpp?r… Added: vendor/uniata/0.38c2/atactl/atactl.dep URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.dep?r… Added: vendor/uniata/0.38c2/atactl/atactl.dsp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.dsp?r… Added: vendor/uniata/0.38c2/atactl/atactl.dsw URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.dsw?r… Added: vendor/uniata/0.38c2/atactl/atactl.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/atactl/atactl.mak?r… Added: vendor/uniata/0.38c2/build_inf/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/Makefile?… Added: vendor/uniata/0.38c2/build_inf/build_inf.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.dep URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.dsp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.dsw URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/build_inf/build_inf.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/build_inf/build_inf… Added: vendor/uniata/0.38c2/building.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/building.txt?rev=29… Added: vendor/uniata/0.38c2/driver/Dist/OEMSETUP.INF URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/OEMSETU… Added: vendor/uniata/0.38c2/driver/Dist/PciDumpEx.sys URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/PciDump… Added: vendor/uniata/0.38c2/driver/Dist/TXTSETUP.OEM URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/TXTSETU… Added: vendor/uniata/0.38c2/driver/Dist/atactl.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/atactl.… Added: vendor/uniata/0.38c2/driver/Dist/build_inf.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/build_i… Added: vendor/uniata/0.38c2/driver/Dist/drv_ctl.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/drv_ctl… Added: vendor/uniata/0.38c2/driver/Dist/fix_dep.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/fix_dep… Added: vendor/uniata/0.38c2/driver/Dist/readme_nt4.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_nt4_23c.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_nt4_old.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_w2k.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/readme_xp.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/readme_… Added: vendor/uniata/0.38c2/driver/Dist/rebuild_inf.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/rebuild… Added: vendor/uniata/0.38c2/driver/Dist/setup_nt3.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/setup_n… Added: vendor/uniata/0.38c2/driver/Dist/setup_w2k.bat URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/setup_w… Added: vendor/uniata/0.38c2/driver/Dist/srchrep.exe URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/srchrep… Added: vendor/uniata/0.38c2/driver/Dist/uata_2k.in_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_2k.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_2k3.in_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_2kh.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_2k… Added: vendor/uniata/0.38c2/driver/Dist/uata_nt4.bkp.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_nt… Added: vendor/uniata/0.38c2/driver/Dist/uata_nt4.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_nt… Added: vendor/uniata/0.38c2/driver/Dist/uata_xp.in_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_xp… Added: vendor/uniata/0.38c2/driver/Dist/uata_xp.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_xp… Added: vendor/uniata/0.38c2/driver/Dist/uata_xph.inf URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uata_xp… Added: vendor/uniata/0.38c2/driver/Dist/uniata URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uniata?… Added: vendor/uniata/0.38c2/driver/Dist/uniata_w2k.reg URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uniata_… Added: vendor/uniata/0.38c2/driver/Dist/uniata_w2k_uninst.reg URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Dist/uniata_… Added: vendor/uniata/0.38c2/driver/LOAD_S.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S.BAT?r… Added: vendor/uniata/0.38c2/driver/LOAD_S2.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S2.BAT?… Added: vendor/uniata/0.38c2/driver/LOAD_S2k.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S2k.BAT… Added: vendor/uniata/0.38c2/driver/LOAD_S3.BAT URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/LOAD_S3.BAT?… Added: vendor/uniata/0.38c2/driver/Lib/Debug/CrossNtK.lib URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Lib/Debug/Cr… Added: vendor/uniata/0.38c2/driver/Lib/Debug/PostDbgMesgK.lib URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Lib/Debug/Po… Added: vendor/uniata/0.38c2/driver/Lib/Release/CrossNtK.lib URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Lib/Release/… Added: vendor/uniata/0.38c2/driver/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/Makefile?rev… Added: vendor/uniata/0.38c2/driver/atapi.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/atapi.h?rev=… Added: vendor/uniata/0.38c2/driver/badblock.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/badblock.h?r… Added: vendor/uniata/0.38c2/driver/bm_devs.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/bm_devs.h?re… Added: vendor/uniata/0.38c2/driver/bsmaster.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/bsmaster.h?r… Added: vendor/uniata/0.38c2/driver/build.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/build.mak?re… Added: vendor/uniata/0.38c2/driver/config.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/config.h?rev… Added: vendor/uniata/0.38c2/driver/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_ata.cpp?r… Added: vendor/uniata/0.38c2/driver/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_badblock.… Added: vendor/uniata/0.38c2/driver/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_dma.cpp?r… Added: vendor/uniata/0.38c2/driver/id_init.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_init.cpp?… Added: vendor/uniata/0.38c2/driver/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_probe.cpp… Added: vendor/uniata/0.38c2/driver/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_queue.cpp… Added: vendor/uniata/0.38c2/driver/id_queue.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_queue.h?r… Added: vendor/uniata/0.38c2/driver/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_sata.cpp?… Added: vendor/uniata/0.38c2/driver/id_sata.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/id_sata.h?re… Added: vendor/uniata/0.38c2/driver/idedma.def URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.def?r… Added: vendor/uniata/0.38c2/driver/idedma.dep URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.dep?r… Added: vendor/uniata/0.38c2/driver/idedma.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.mak?r… Added: vendor/uniata/0.38c2/driver/idedma.rc URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/idedma.rc?re… Added: vendor/uniata/0.38c2/driver/inc/CrNtDecl.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/CrNtDecl… Added: vendor/uniata/0.38c2/driver/inc/CrNtStubs.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/CrNtStub… Added: vendor/uniata/0.38c2/driver/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/CrossNt.… Added: vendor/uniata/0.38c2/driver/inc/PostDbgMesg.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/PostDbgM… Added: vendor/uniata/0.38c2/driver/inc/misc.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/misc.h?r… Added: vendor/uniata/0.38c2/driver/inc/rwlock.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/inc/rwlock.h… Added: vendor/uniata/0.38c2/driver/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/ntddk_ex.h?r… Added: vendor/uniata/0.38c2/driver/ntddscsi.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/ntddscsi.h?r… Added: vendor/uniata/0.38c2/driver/scsi.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/scsi.h?rev=2… Added: vendor/uniata/0.38c2/driver/srb.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/srb.h?rev=29… Added: vendor/uniata/0.38c2/driver/stdafx.cpp URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/stdafx.cpp?r… Added: vendor/uniata/0.38c2/driver/stdafx.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/stdafx.h?rev… Added: vendor/uniata/0.38c2/driver/todo.txt URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/todo.txt?rev… Added: vendor/uniata/0.38c2/driver/tools.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/tools.h?rev=… Added: vendor/uniata/0.38c2/driver/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uata_ctl.h?r… Added: vendor/uniata/0.38c2/driver/uniata.mak URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uniata.mak?r… Added: vendor/uniata/0.38c2/driver/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uniata_ver.h… Added: vendor/uniata/0.38c2/driver/uniata_ver.h_ URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/driver/uniata_ver.h… Added: vendor/uniata/0.38c2/pkg_files.dist URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/pkg_files.dist?rev=… Added: vendor/uniata/0.38c2/pkg_files.src URL: http://svn.reactos.org/svn/reactos/vendor/uniata/0.38c2/pkg_files.src?rev=2…

1 0

[weiden] 29252: - Display a list of monitors if there's more than one monitor - Display a list of available refresh rates for the current mode
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 21:53:14 2007 New Revision: 29252 URL: http://svn.reactos.org/svn/reactos?rev=29252&view=rev Log: - Display a list of monitors if there's more than one monitor - Display a list of available refresh rates for the current mode Modified: trunk/reactos/dll/win32/shellext/deskmon/deskmon.c trunk/reactos/dll/win32/shellext/deskmon/deskmon.h trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskmon/resource.h Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.c Thu Sep 27 21:53:14 2007 @@ -5,26 +5,341 @@ static HINSTANCE hInstance; +#if 0 +#ifdef UNICODE +typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCWSTR,LPCWSTR,BOOL); +#define FUNC_DEVICEPROPERTIES "DevicePropertiesW" +#else +typedef INT_PTR (WINAPI *PDEVICEPROPERTIES)(HWND,LPCWSTR,LPCSTR,BOOL); +#define FUNC_DEVICEPROPERTIES "DevicePropertiesA" +#endif + +static VOID +ShowMonitorProperties(PDESKMONITOR This, + LPCTSTR lpDevice) +{ + HMODULE hDevMgr; + PDEVICEPROPERTIES pDeviceProperties; + + hDevMgr = LoadLibrary(TEXT("devmgr.dll")); + if (hDevMgr != NULL) + { + pDeviceProperties = (PDEVICEPROPERTIESW)GetProcAddress(hDevMgr, + FUNC_DEVICEPROPERTIES); + if (pDeviceProperties != NULL) + { + pDeviceProperties(This->hwndDlg, + NULL, + lpDevice, + FALSE); + } + + FreeLibrary(hDevMgr); + } +} +#endif + +static VOID +UpdateMonitorDialogControls(PDESKMONITOR This) +{ + PDEVMODEW lpCurrentMode, lpMode; + DWORD dwIndex = 0; + TCHAR szBuffer[64]; + BOOL bHasDef = FALSE; + INT i; + + /* Fill the refresh rate combo box */ + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_RESETCONTENT, + 0, + 0); + + lpCurrentMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + + do + { + lpMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, + dwIndex++); + if (lpMode != NULL && + lpMode->dmBitsPerPel == lpCurrentMode->dmBitsPerPel && + lpMode->dmPelsWidth == lpCurrentMode->dmPelsWidth && + lpMode->dmPelsHeight == lpCurrentMode->dmPelsHeight) + { + /* We're only interested in refresh rates for the current resolution and color depth */ + + if (lpMode->dmDisplayFrequency <= 1) + { + /* Default hardware frequency */ + if (bHasDef) + continue; + + bHasDef = TRUE; + + if (!LoadString(hInstance, + IDS_USEDEFFRQUENCY, + szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]))) + { + szBuffer[0] = TEXT('\0'); + } + } + else + { + TCHAR szFmt[64]; + + if (!LoadString(hInstance, + IDS_FREQFMT, + szFmt, + sizeof(szFmt) / sizeof(szFmt[0]))) + { + szFmt[0] = TEXT('\0'); + } + + _sntprintf(szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + szFmt, + lpMode->dmDisplayFrequency); + } + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_ADDSTRING, + 0, + (LPARAM)szBuffer); + if (i >= 0) + { + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETITEMDATA, + (WPARAM)lpMode, + 0); + + if (lpMode->dmDisplayFrequency == lpCurrentMode->dmDisplayFrequency) + { + SendDlgItemMessage(This->hwndDlg, + IDC_REFRESHRATE, + CB_SETCURSEL, + (WPARAM)i, + 0); + } + } + } + + } while (lpMode != NULL); + + /* FIXME: Update pruning mode controls */ + + /* FIXME: Enable/Disable properties button */ + EnableWindow(GetDlgItem(This->hwndDlg, + IDC_MONITORPROPERTIES), + FALSE); +} + static VOID InitMonitorDialog(PDESKMONITOR This) { - LPTSTR lpMonitorName; - - lpMonitorName = QueryDeskCplString(This->pdtobj, - RegisterClipboardFormat(DESK_EXT_MONITORNAME)); - if (lpMonitorName != NULL) - { + PDESKMONINFO pmi, pminext, *pmilink; + DISPLAY_DEVICE dd; + BOOL bRet; + INT i; + DWORD dwIndex = 0; + + /* Free all allocated monitors */ + pmi = This->Monitors; + This->Monitors = NULL; + while (pmi != NULL) + { + pminext = pmi->Next; + LocalFree((HLOCAL)pmi); + pmi = pminext; + } + + This->SelMonitor = NULL; + This->dwMonitorCount = 0; + + if (This->lpDisplayDevice != NULL) + LocalFree((HLOCAL)This->lpDisplayDevice); + + This->lpDisplayDevice = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_DISPLAYDEVICE)); + + if (This->DeskExtInterface != NULL) + { + if (This->lpDisplayDevice != NULL) + { + /* Enumerate all monitors */ + pmilink = &This->Monitors; + + do + { + dd.cb = sizeof(dd); + bRet = EnumDisplayDevices(This->lpDisplayDevice, + dwIndex++, + &dd, + 0); + if (bRet) + { + pmi = LocalAlloc(LMEM_FIXED, + sizeof(*pmi)); + if (pmi != NULL) + { + CopyMemory(&pmi->dd, + &dd, + sizeof(dd)); + pmi->Next = NULL; + *pmilink = pmi; + pmilink = &pmi->Next; + + This->dwMonitorCount++; + } + } + } while (bRet); + } + + This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + } + else + This->lpDevModeOnInit = NULL; + + /* Setup the UI depending on how many monitors are attached */ + if (This->dwMonitorCount == 0) + { + LPTSTR lpMonitorName; + + /* This is a fallback, let's hope that desk.cpl can provide us with a monitor name */ + lpMonitorName = QueryDeskCplString(This->pdtobj, + RegisterClipboardFormat(DESK_EXT_MONITORNAME)); + SetDlgItemText(This->hwndDlg, IDC_MONITORNAME, lpMonitorName); - LocalFree((HLOCAL)lpMonitorName); - } + if (lpMonitorName != NULL) + LocalFree((HLOCAL)lpMonitorName); + } + else if (This->dwMonitorCount == 1) + { + This->SelMonitor = This->Monitors; + SetDlgItemText(This->hwndDlg, + IDC_MONITORNAME, + This->Monitors->dd.DeviceString); + } + else + { + SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_RESETCONTENT, + 0, + 0); + + pmi = This->Monitors; + while (pmi != NULL) + { + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_ADDSTRING, + 0, + (LPARAM)pmi->dd.DeviceString); + if (i >= 0) + { + SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_SETITEMDATA, + (WPARAM)i, + (LPARAM)pmi); + + if (This->SelMonitor == NULL) + { + SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_SETCURSEL, + (WPARAM)i, + 0); + + This->SelMonitor = pmi; + } + } + + pmi = pmi->Next; + } + } + + /* Show/Hide controls */ + ShowWindow(GetDlgItem(This->hwndDlg, + IDC_MONITORNAME), + (This->dwMonitorCount <= 1 ? SW_SHOW : SW_HIDE)); + ShowWindow(GetDlgItem(This->hwndDlg, + IDC_MONITORLIST), + (This->dwMonitorCount > 1 ? SW_SHOW : SW_HIDE)); + + UpdateMonitorDialogControls(This); +} + +static LONG +ApplyMonitorChanges(PDESKMONITOR This) +{ + LONG lChangeRet; if (This->DeskExtInterface != NULL) { - /* FIXME */ - } + /* Change the display settings through desk.cpl */ + lChangeRet = DeskCplExtDisplaySaveSettings(This->DeskExtInterface, + This->hwndDlg); + if (lChangeRet == DISP_CHANGE_SUCCESSFUL) + { + /* Save the new mode */ + This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + return PSNRET_NOERROR; + } + else if (lChangeRet == DISP_CHANGE_RESTART) + { + /* Notify desk.cpl that the user needs to reboot */ + PropSheet_RestartWindows(GetParent(This->hwndDlg)); + return PSNRET_NOERROR; + } + } + + InitMonitorDialog(This); + + return PSNRET_INVALID_NOCHANGEPAGE; +} + +static VOID +ResetMonitorChanges(PDESKMONITOR This) +{ + if (This->DeskExtInterface != NULL && This->lpDevModeOnInit != NULL) + { + This->DeskExtInterface->SetCurrentMode(This->DeskExtInterface->Context, + This->lpDevModeOnInit); + } +} + +static BOOL +UpdateMonitorSelection(PDESKMONITOR This) +{ + INT i; + + if (This->dwMonitorCount <= 1) + return FALSE; + + i = (INT)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_GETCURSEL, + 0, + 0); + if (i >= 0) + { + This->SelMonitor = (PDESKMONINFO)SendDlgItemMessage(This->hwndDlg, + IDC_MONITORLIST, + LB_GETITEMDATA, + (WPARAM)i, + 0); + } + else + This->SelMonitor = NULL; + + return TRUE; } static INT_PTR CALLBACK @@ -60,9 +375,37 @@ { case IDC_MONITORPROPERTIES: break; + + case IDC_MONITORLIST: + if (HIWORD(wParam) == LBN_SELCHANGE) + { + if (UpdateMonitorSelection(This)) + UpdateMonitorDialogControls(This); + } + break; } - break; + + case WM_NOTIFY: + { + NMHDR *nmh = (NMHDR *)lParam; + + switch (nmh->code) + { + case PSN_APPLY: + { + SetWindowLong(hwndDlg, + DWL_MSGRESULT, + ApplyMonitorChanges(This)); + break; + } + + case PSN_RESET: + ResetMonitorChanges(This); + break; + } + break; + } } return Ret; @@ -71,6 +414,8 @@ static VOID IDeskMonitor_Destroy(PDESKMONITOR This) { + PDESKMONINFO pmi, pminext; + if (This->pdtobj != NULL) { IDataObject_Release(This->pdtobj); @@ -81,6 +426,22 @@ { LocalFree((HLOCAL)This->DeskExtInterface); This->DeskExtInterface = NULL; + } + + if (This->lpDisplayDevice != NULL) + { + LocalFree((HLOCAL)This->lpDisplayDevice); + This->lpDisplayDevice = NULL; + } + + /* Free all monitors */ + pmi = This->Monitors; + This->Monitors = NULL; + while (pmi != NULL) + { + pminext = pmi->Next; + LocalFree((HLOCAL)pmi); + pmi = pminext; } } Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskmon/deskmon.h Thu Sep 27 21:53:14 2007 @@ -1,5 +1,11 @@ #ifndef __DESKMON__H #define __DESKMON__H + +typedef struct _DESKMONINFO +{ + DISPLAY_DEVICE dd; + struct _DESKMONINFO *Next; +} DESKMONINFO, *PDESKMONINFO; typedef struct _DESKMONITOR { @@ -11,6 +17,11 @@ HWND hwndDlg; PDESK_EXT_INTERFACE DeskExtInterface; IDataObject *pdtobj; + LPTSTR lpDisplayDevice; + DWORD dwMonitorCount; + PDESKMONINFO Monitors; + PDESKMONINFO SelMonitor; + PDEVMODEW lpDevModeOnInit; } DESKMONITOR, *PDESKMONITOR; extern LONG dll_refs; Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/en-US.rc Thu Sep 27 21:53:14 2007 @@ -7,6 +7,16 @@ BEGIN GROUPBOX "Monitor type", -1, 7, 3, 237, 52 LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL PUSHBUTTON "&Properties", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Monitor settings", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 47 + LTEXT "&Screen refresh rate:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT END +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "Use hardware default setting" + IDS_FREQFMT "%u Hertz" +END + Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskmon/resource.h Thu Sep 27 21:53:14 2007 @@ -4,6 +4,13 @@ #define IDD_MONITOR 100 #define IDC_MONITORNAME 201 -#define IDC_MONITORPROPERTIES 202 +#define IDC_MONITORLIST 202 +#define IDC_MONITORPROPERTIES 203 +#define IDS_MONITORSETTINGSGROUP 204 +#define IDS_REFRESHRATELABEL 205 +#define IDC_REFRESHRATE 206 + +#define IDS_USEDEFFRQUENCY 101 +#define IDS_FREQFMT 102 #endif /* __RESOURCE__H */

1 0

[tkreuzer] 29251: probe the pointer and some cleanup simplification
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Thu Sep 27 21:25:40 2007 New Revision: 29251 URL: http://svn.reactos.org/svn/reactos?rev=29251&view=rev Log: probe the pointer and some cleanup simplification Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Thu Sep 27 21:25:40 2007 @@ -335,8 +335,8 @@ INT ret = 0; NTSTATUS Status = STATUS_SUCCESS; PDC pDC; - HBITMAP hSourceBitmap = NULL; - SURFOBJ *pDestSurf = NULL, *pSourceSurf = NULL; + HBITMAP hSourceBitmap; + SURFOBJ *pDestSurf, *pSourceSurf; RECTL rcDest; POINTL ptSource; INT DIBWidth; @@ -377,6 +377,7 @@ /* Enter SEH, as the bits are user mode */ _SEH_TRY { + ProbeForRead(Bits, DIBWidth * abs(bmi->bmiHeader.biHeight), 1); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), @@ -392,6 +393,7 @@ pSourceSurf = EngLockSurface((HSURF)hSourceBitmap); if (!pSourceSurf) { + EngDeleteSurface((HSURF)hSourceBitmap); Status = STATUS_UNSUCCESSFUL; _SEH_LEAVE; } @@ -412,6 +414,8 @@ NULL, ROP3_TO_ROP4(SRCCOPY)); + EngUnlockSurface(pSourceSurf); + EngDeleteSurface((HSURF)hSourceBitmap); } _SEH_HANDLE { @@ -425,21 +429,7 @@ ret = ScanLines; } - if (pSourceSurf) - { - EngUnlockSurface(pSourceSurf); - } - - if (hSourceBitmap) - { - EngDeleteSurface((HSURF)hSourceBitmap); - } - - if (pDestSurf) - { - EngUnlockSurface(pDestSurf); - } - + EngUnlockSurface(pDestSurf); DC_UnlockDc(pDC); return ret;

1 0

[weiden] 29250: Set the current device mode selection to the current one if the mode was changed successfully
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 21:24:07 2007 New Revision: 29250 URL: http://svn.reactos.org/svn/reactos?rev=29250&view=rev Log: Set the current device mode selection to the current one if the mode was changed successfully Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 21:24:07 2007 @@ -347,6 +347,7 @@ { /* Save the new mode */ This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + This->lpSelDevMode = This->lpDevModeOnInit; return PSNRET_NOERROR; } else if (lChangeRet == DISP_CHANGE_RESTART)

1 0

[cwittich] 29249: add shell extension for displaying processor information in device manager
by cwittich＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: cwittich Date: Thu Sep 27 21:04:44 2007 New Revision: 29249 URL: http://svn.reactos.org/svn/reactos?rev=29249&view=rev Log: add shell extension for displaying processor information in device manager Added: trunk/reactos/dll/win32/shellext/devcpux/ trunk/reactos/dll/win32/shellext/devcpux/devcpux.def (with props) trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild (with props) trunk/reactos/dll/win32/shellext/devcpux/processor.c (with props) trunk/reactos/dll/win32/shellext/devcpux/processor.rc (with props) trunk/reactos/dll/win32/shellext/devcpux/resource.h (with props) Modified: trunk/reactos/dll/win32/shellext/shellext.rbuild Added: trunk/reactos/dll/win32/shellext/devcpux/devcpux.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/devcpux.def (added) +++ trunk/reactos/dll/win32/shellext/devcpux/devcpux.def Thu Sep 27 21:04:44 2007 @@ -1,0 +1,7 @@ +LIBRARY devcpux.dll + +EXPORTS + +PropSheetExtProc@12 + +; EOF Propchange: trunk/reactos/dll/win32/shellext/devcpux/devcpux.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild (added) +++ trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild Thu Sep 27 21:04:44 2007 @@ -1,0 +1,19 @@ +<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll"> + <importlibrary definition="devcpux.def" /> + <include base="devcpux">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>kernel32</library> + <library>user32</library> + <library>ntdll</library> + <library>powrprof</library> + <library>comctl32</library> + <file>processor.c</file> + <file>processor.rc</file> +</module> Propchange: trunk/reactos/dll/win32/shellext/devcpux/devcpux.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/processor.c (added) +++ trunk/reactos/dll/win32/shellext/devcpux/processor.c Thu Sep 27 21:04:44 2007 @@ -1,0 +1,121 @@ +/* + * PROJECT: ReactOS Shell Extensions + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: dll\win32\shellext\devcpux\processor.c + * PURPOSE: + * COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)ReactOS.org> + * + */ + +#include <windows.h> +#include <setupapi.h> +#include <powrprof.h> + +#include "resource.h" + +HINSTANCE g_hInstance = NULL; +int APIENTRY ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); + +BOOL +APIENTRY +DllMain (HANDLE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + switch (dwReason) + { + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_ATTACH: + case DLL_PROCESS_DETACH: + break; + } + + g_hInstance = (HINSTANCE) hInstance; + return TRUE; +} + + +BOOL +APIENTRY +PropSheetExtProc(PSP_PROPSHEETPAGE_REQUEST PropPageRequest, LPFNADDPROPSHEETPAGE fAddFunc, LPARAM lParam) +{ + PROPSHEETPAGE PropSheetPage; + HPROPSHEETPAGE hPropSheetPage; + + if(PropPageRequest->PageRequested != SPPSR_ENUM_ADV_DEVICE_PROPERTIES) + return FALSE; + + if ((!PropPageRequest->DeviceInfoSet) || (!PropPageRequest->DeviceInfoData)) + return FALSE; + + ZeroMemory(&PropSheetPage, sizeof(PROPSHEETPAGE)); + PropSheetPage.dwSize = sizeof(PROPSHEETPAGE); + PropSheetPage.hInstance = g_hInstance; + PropSheetPage.pszTemplate = MAKEINTRESOURCE(DLG_PROCESSORINFO); + PropSheetPage.pfnDlgProc = ProcessorDlgProc; + + hPropSheetPage = CreatePropertySheetPage(&PropSheetPage); + if(hPropSheetPage) + return FALSE; + + if(!(*fAddFunc)(hPropSheetPage, lParam)) { + DestroyPropertySheetPage (hPropSheetPage); + return FALSE; + } + + return TRUE; +} + +void +AddFeature(WCHAR* szFeatures, WCHAR* Feature, BOOL* bFirst) +{ + if (!*bFirst) + wcscat(szFeatures, L", "); + *bFirst = FALSE; + wcscat(szFeatures, Feature); +} + +int +APIENTRY +ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) +{ + switch (uMessage) { + case WM_INITDIALOG: + { + WCHAR szFeatures[MAX_PATH] = L""; + WCHAR szModel[3]; + WCHAR szStepping[3]; + WCHAR szCurrentMhz[10]; + BOOL bFirst = TRUE; + SYSTEM_INFO SystemInfo; + PROCESSOR_POWER_INFORMATION PowerInfo; + + if (IsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"MMX", &bFirst); + if (IsProcessorFeaturePresent(PF_XMMI_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE", &bFirst); + if (IsProcessorFeaturePresent(PF_XMMI64_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE2", &bFirst); + /*if (IsProcessorFeaturePresent(PF_SSE3_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"SSE3", &bFirst); */ + if (IsProcessorFeaturePresent(PF_3DNOW_INSTRUCTIONS_AVAILABLE)) + AddFeature(szFeatures, L"3DNOW", &bFirst); + + SetDlgItemTextW(hDlg, IDC_FEATURES, szFeatures); + + GetSystemInfo(&SystemInfo); + + wsprintf(szModel, L"%x", HIBYTE(SystemInfo.wProcessorRevision)); + wsprintf(szStepping, L"%d", LOBYTE(SystemInfo.wProcessorRevision)); + + SetDlgItemTextW(hDlg, IDC_MODEL, szModel); + SetDlgItemTextW(hDlg, IDC_STEPPING, szStepping); + + CallNtPowerInformation(11, NULL, 0, &PowerInfo, sizeof(PowerInfo)); + wsprintf(szCurrentMhz, L"%ld %s", PowerInfo.CurrentMhz, L"MHz"); + SetDlgItemTextW(hDlg, IDC_CORESPEED, szCurrentMhz); + + return TRUE; + } + } + return FALSE; +} Propchange: trunk/reactos/dll/win32/shellext/devcpux/processor.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/processor.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/processor.rc (added) +++ trunk/reactos/dll/win32/shellext/devcpux/processor.rc Thu Sep 27 21:04:44 2007 @@ -1,0 +1,31 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Processor Shell Extension\0" +#define REACTOS_STR_INTERNAL_NAME "processorext\0" +#define REACTOS_STR_ORIGINAL_FILENAME "processorext.dll\0" +#include <reactos/version.rc> + + +DLG_PROCESSORINFO DIALOG DISCARDABLE 0, 0, 200, 220 +STYLE WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "CPU" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Features:",-1,5,23,50,51 + LTEXT "Test",IDC_FEATURES,50,23,80,51 + + LTEXT "Model:",-1,5,33,50,51 + LTEXT "test",IDC_MODEL,50,33,80,51 + + LTEXT "Stepping:",-1,5,43,50,51 + LTEXT "test",IDC_STEPPING,50,43,80,51 + + + LTEXT "Core Speed:",-1,5,53,50,51 + LTEXT "test",IDC_CORESPEED,50,53,80,51 + + +END Propchange: trunk/reactos/dll/win32/shellext/devcpux/processor.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shellext/devcpux/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/devcpux… ============================================================================== --- trunk/reactos/dll/win32/shellext/devcpux/resource.h (added) +++ trunk/reactos/dll/win32/shellext/devcpux/resource.h Thu Sep 27 21:04:44 2007 @@ -1,0 +1,6 @@ +#define DLG_PROCESSORINFO 201 + +#define IDC_FEATURES 301 +#define IDC_MODEL 302 +#define IDC_STEPPING 303 +#define IDC_CORESPEED 304 Propchange: trunk/reactos/dll/win32/shellext/devcpux/resource.h ------------------------------------------------------------------------------ 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 21:04:44 2007 @@ -10,4 +10,7 @@ <directory name="deskmon"> <xi:include href="deskmon/deskmon.rbuild" /> </directory> + <directory name="devcpux"> + <xi:include href="devcpux/devcpux.rbuild" /> + </directory> </group>

1 0

[tkreuzer] 29248: Basic implementation of NtGdiSetDIBitsToDeviceInternal() todo: handle XlateObj Now apparition (open source pdf viewer) works on ros.
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Thu Sep 27 21:04:29 2007 New Revision: 29248 URL: http://svn.reactos.org/svn/reactos?rev=29248&view=rev Log: Basic implementation of NtGdiSetDIBitsToDeviceInternal() todo: handle XlateObj Now apparition (open source pdf viewer) works on ros. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Thu Sep 27 21:04:29 2007 @@ -332,8 +332,117 @@ IN OPTIONAL HANDLE hcmXform ) { - UNIMPLEMENTED; - return 0; + INT ret = 0; + NTSTATUS Status = STATUS_SUCCESS; + PDC pDC; + HBITMAP hSourceBitmap = NULL; + SURFOBJ *pDestSurf = NULL, *pSourceSurf = NULL; + RECTL rcDest; + POINTL ptSource; + INT DIBWidth; + SIZEL SourceSize; + XLATEOBJ *XlateObj = NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + if (pDC->IsIC) + { + DC_UnlockDc(pDC); + return 0; + } + + pDestSurf = EngLockSurface((HSURF)pDC->w.hBitmap); + if (!pDestSurf) + { + /* FIXME: SetLastError ? */ + DC_UnlockDc(pDC); + return 0; + } + + SourceSize.cx = bmi->bmiHeader.biWidth; + SourceSize.cy = ScanLines; + DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + + rcDest.left = XDest; + rcDest.top = YDest; + rcDest.right = XDest + Width; + rcDest.bottom = YDest + Height; + ptSource.x = XSrc; + ptSource.y = YSrc; + + /* Enter SEH, as the bits are user mode */ + _SEH_TRY + { + hSourceBitmap = EngCreateBitmap(SourceSize, + DIBWidth, + BitmapFormat(bmi->bmiHeader.biBitCount, bmi->bmiHeader.biCompression), + bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + (PVOID) Bits); + if (!hSourceBitmap) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + Status = STATUS_NO_MEMORY; + _SEH_LEAVE; + } + + pSourceSurf = EngLockSurface((HSURF)hSourceBitmap); + if (!pSourceSurf) + { + Status = STATUS_UNSUCCESSFUL; + _SEH_LEAVE; + } + + /* FIXME: handle XlateObj */ + XlateObj = NULL; + + /* Copy the bits */ + Status = IntEngBitBlt(pDestSurf, + pSourceSurf, + NULL, + pDC->CombinedClip, + XlateObj, + &rcDest, + &ptSource, + NULL, + NULL, + NULL, + ROP3_TO_ROP4(SRCCOPY)); + + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (NT_SUCCESS(Status)) + { + /* FIXME: Should probably be only the number of lines actually copied */ + ret = ScanLines; + } + + if (pSourceSurf) + { + EngUnlockSurface(pSourceSurf); + } + + if (hSourceBitmap) + { + EngDeleteSurface((HSURF)hSourceBitmap); + } + + if (pDestSurf) + { + EngUnlockSurface(pDestSurf); + } + + DC_UnlockDc(pDC); + + return ret; } /* Converts a device-dependent bitmap to a DIB */

1 0

[fireball] 29247: - Coalesce all calls to MmUpdatePageDir through a single inlined function - MiSyncProcessThreadViews, and fix callers which assumed that the kernel stack is KERNEL_STACK_SIZE, when in fact, it may be KERNEL_LARGE_STACK_SIZE. We now detect and handle this, fixing a bug in KiAttachProcess. - Remove all old-scheduler code, it's not needed anymore, nor it's going to be ever supported.
by fireball＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: fireball Date: Thu Sep 27 20:28:56 2007 New Revision: 29247 URL: http://svn.reactos.org/svn/reactos?rev=29247&view=rev Log: - Coalesce all calls to MmUpdatePageDir through a single inlined function - MiSyncProcessThreadViews, and fix callers which assumed that the kernel stack is KERNEL_STACK_SIZE, when in fact, it may be KERNEL_LARGE_STACK_SIZE. We now detect and handle this, fixing a bug in KiAttachProcess. - Remove all old-scheduler code, it's not needed anymore, nor it's going to be ever supported. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/balmgr.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/procobj.c (contents, props changed) trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Sep 27 20:28:56 2007 @@ -1474,7 +1474,7 @@ FORCEINLINE VOID NTAPI -MiSyncThreadProcessViews(IN PKPROCESS Process, +MiSyncThreadProcessViews(IN PVOID Process, IN PVOID Address, IN ULONG Size) { Modified: trunk/reactos/ntoskrnl/ke/balmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/balmgr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ke/balmgr.c (original) +++ trunk/reactos/ntoskrnl/ke/balmgr.c Thu Sep 27 20:28:56 2007 @@ -40,10 +40,6 @@ /* Lock the dispatcher and PRCB */ OldIrql = KiAcquireDispatcherLock(); KiAcquirePrcbLock(Prcb); -#ifndef NEW_SCHEDULER - goto OldSched; -#endif - /* Check if there's any thread that need help */ Summary = Prcb->ReadySummary & ((1 << THREAD_BOOST_PRIORITY) - 2); if (Summary) @@ -76,7 +72,6 @@ if (WaitLimit >= Thread->WaitTime) { /* Remove the thread from the queue */ - DPRINT1("Thread: %p\n", Thread); NextEntry = NextEntry->Blink; ASSERT((Prcb->ReadySummary & PRIORITY_MASK(Index))); if (RemoveEntryList(NextEntry->Flink)) @@ -114,9 +109,6 @@ } /* Release the locks and dispatcher */ -#ifndef NEW_SCHEDULER -OldSched: -#endif KiReleasePrcbLock(Prcb); KiReleaseDispatcherLock(OldIrql); Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Sep 27 20:28:56 2007 @@ -687,11 +687,6 @@ call @KiRetireDpcList@4 CheckSchedule: -#ifndef NEW_SCHEDULER - /* FIXME: ROS HACK */ - call _NtYieldExecution@0 -#endif - /* Check if a next thread is queued */ cmp dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 #ifdef CONFIG_SMP Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c Thu Sep 27 20:28:56 2007 @@ -29,27 +29,6 @@ PVOID KeRaiseUserExceptionDispatcher; /* PRIVATE FUNCTIONS *********************************************************/ - -FORCEINLINE -VOID -NTAPI -UpdatePageDirs(IN PKTHREAD Thread, - IN PKPROCESS Process) -{ - /* - * The stack and the thread structure of the current process may be - * located in a page which is not present in the page directory of - * the process we're attaching to. That would lead to a page fault - * when this function returns. However, since the processor can't - * call the page fault handler 'cause it can't push EIP on the stack, - * this will show up as a stack fault which will crash the entire system. - * To prevent this, make sure the page directory of the process we're - * attaching to is up-to-date. - */ - MmUpdatePageDir((PEPROCESS)Process, - (PVOID)Thread->StackLimit, - KERNEL_STACK_SIZE); -} VOID NTAPI @@ -463,13 +442,15 @@ KeAttachProcess(IN PKPROCESS Process) { KLOCK_QUEUE_HANDLE ApcLock; - PKTHREAD Thread; + PKTHREAD Thread = KeGetCurrentThread(); ASSERT_PROCESS(Process); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Make sure that we are in the right page directory */ - Thread = KeGetCurrentThread(); - UpdatePageDirs(Thread, Process); + MiSyncThreadProcessViews(Process, + (PVOID)Thread->StackLimit, + Thread->LargeStack ? + KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); /* Check if we're already in that process */ if (Thread->ApcState.Process == Process) return; @@ -595,7 +576,10 @@ ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Make sure that we are in the right page directory */ - UpdatePageDirs(Thread, Process); + MiSyncThreadProcessViews(Process, + (PVOID)Thread->StackLimit, + Thread->LargeStack ? + KERNEL_STACK_SIZE : KERNEL_LARGE_STACK_SIZE); /* Crash system if DPC is being executed! */ if (KeIsExecutingDpc()) Propchange: trunk/reactos/ntoskrnl/ke/procobj.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 20:28:56 2007 @@ -810,11 +810,11 @@ Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; - /* ROS Mm HACK */ - MmUpdatePageDir((PEPROCESS)Process, - (PVOID)Thread->StackLimit, - KERNEL_STACK_SIZE); - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); + /* Make sure that we are in the right page directory */ + MiSyncThreadProcessViews(Process, + Thread, + KERNEL_STACK_SIZE); + MiSyncThreadProcessViews(Process, Thread, sizeof(ETHREAD)); #if defined(_M_IX86) /* Enter SEH to avoid crashes due to user mode */ @@ -1006,7 +1006,6 @@ /* Lock the PRCB */ KiAcquirePrcbLock(Prcb); -#ifdef NEW_SCHEDULER /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { @@ -1015,14 +1014,6 @@ NextThread->State = Standby; Prcb->NextThread = NextThread; } -#else - /* We need to dispatch a new thread */ - NextThread = NULL; - CurrentThread->WaitIrql = OldIrql; - KiDispatchThreadNoLock(Ready); - KeLowerIrql(OldIrql); - return; -#endif /* Release the PRCB lock */ KiReleasePrcbLock(Prcb); @@ -1124,7 +1115,6 @@ /* Lock the PRCB */ KiAcquirePrcbLock(Prcb); -#ifdef NEW_SCHEDULER /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { @@ -1133,14 +1123,6 @@ NextThread->State = Standby; Prcb->NextThread = NextThread; } -#else - /* We need to dispatch a new thread */ - NextThread = NULL; - CurrentThread->WaitIrql = OldIrql; - KiDispatchThreadNoLock(Ready); - KeLowerIrql(OldIrql); - return; -#endif /* Release the PRCB lock */ KiReleasePrcbLock(Prcb); Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Thu Sep 27 20:28:56 2007 @@ -265,152 +265,6 @@ KiReleasePrcbLock(Prcb); } -VOID -KiInsertIntoThreadList(KPRIORITY Priority, - PKTHREAD Thread) -{ - ASSERT(Ready == Thread->State); - ASSERT(Thread->Priority == Priority); - - if (Priority >= MAXIMUM_PRIORITY || Priority < LOW_PRIORITY) { - - DPRINT1("Invalid thread priority (%d)\n", Priority); - KEBUGCHECK(0); - } - - InsertTailList(&KeGetCurrentPrcb()->DispatcherReadyListHead[Priority], &Thread->WaitListEntry); - KeGetCurrentPrcb()->ReadySummary |= (1 << Priority); -} - -VOID -KiRemoveFromThreadList(PKTHREAD Thread) -{ - ASSERT(Ready == Thread->State); - RemoveEntryList(&Thread->WaitListEntry); - if (IsListEmpty(&KeGetCurrentPrcb()->DispatcherReadyListHead[Thread->Priority])) { - - KeGetCurrentPrcb()->ReadySummary &= ~(1 << Thread->Priority); - } -} - -PKTHREAD -KiScanThreadList(KPRIORITY Priority, - KAFFINITY Affinity) -{ - PKTHREAD current; - ULONG Mask; - - Mask = (1 << Priority); - - if (KeGetCurrentPrcb()->ReadySummary & Mask) { - - LIST_FOR_EACH(current, &KeGetCurrentPrcb()->DispatcherReadyListHead[Priority], KTHREAD, WaitListEntry) { - - if (current->State != Ready) { - - DPRINT1("%p/%d\n", current, current->State); - } - - ASSERT(current->State == Ready); - - if (current->Affinity & Affinity) { - - KiRemoveFromThreadList(current); - return(current); - } - } - } - - return(NULL); -} - -BOOLEAN -STDCALL -KiDispatchThreadNoLock(ULONG NewThreadStatus) -{ - KPRIORITY CurrentPriority; - PKTHREAD Candidate; - ULONG Affinity; - PKTHREAD CurrentThread = KeGetCurrentThread(); - BOOLEAN ApcState; - - DPRINT("KiDispatchThreadNoLock() %d/%d/%d/%d\n", KeGetCurrentProcessorNumber(), - CurrentThread, NewThreadStatus, CurrentThread->State); - - CurrentThread->State = (UCHAR)NewThreadStatus; - - if (NewThreadStatus == Ready) { - - KiInsertIntoThreadList(CurrentThread->Priority, - CurrentThread); - } - - Affinity = 1 << KeGetCurrentProcessorNumber(); - - for (CurrentPriority = HIGH_PRIORITY; CurrentPriority >= LOW_PRIORITY; CurrentPriority--) { - - Candidate = KiScanThreadList(CurrentPriority, Affinity); - - if (Candidate == CurrentThread) { - - Candidate->State = Running; - KiReleaseDispatcherLockFromDpcLevel(); - return FALSE; - } - - if (Candidate != NULL) { - - PKTHREAD OldThread; - PKTHREAD IdleThread; - - DPRINT("Scheduling %x(%d)\n",Candidate, CurrentPriority); - - Candidate->State = Running; - - OldThread = CurrentThread; - CurrentThread = Candidate; - IdleThread = KeGetCurrentPrcb()->IdleThread; - - if (OldThread == IdleThread) { - - KiIdleSummary &= ~Affinity; - - } else if (CurrentThread == IdleThread) { - - KiIdleSummary |= Affinity; - } - - MmUpdatePageDir((PEPROCESS)PsGetCurrentProcess(),((PETHREAD)CurrentThread)->ThreadsProcess, sizeof(EPROCESS)); - - /* Special note for Filip: This will release the Dispatcher DB Lock ;-) -- Alex */ - DPRINT("You are : %x, swapping to: %x.\n", OldThread, CurrentThread); - KeGetCurrentPrcb()->CurrentThread = CurrentThread; - ApcState = KiSwapContext(OldThread, CurrentThread); - DPRINT("You are : %x, swapped from: %x\n", OldThread, CurrentThread); - return ApcState; - } - } - - DPRINT1("CRITICAL: No threads are ready (CPU%d)\n", KeGetCurrentProcessorNumber()); - KEBUGCHECK(0); - return FALSE; -} - -VOID -STDCALL -KiDispatchThread(ULONG NewThreadStatus) -{ - KIRQL OldIrql; - - if (KeGetCurrentPrcb()->IdleThread == NULL) { - return; - } - - OldIrql = KiAcquireDispatcherLock(); - KiDispatchThreadNoLock(NewThreadStatus); - KeLowerIrql(OldIrql); -} - PKTHREAD FASTCALL KiSelectNextThread(IN PKPRCB Prcb) @@ -446,9 +300,6 @@ KIRQL WaitIrql; LONG_PTR WaitStatus; PKTHREAD NextThread; -#ifdef NEW_SCHEDULER - PEPROCESS HackOfDoom = PsGetCurrentProcess(); -#endif ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); /* Acquire the PRCB lock */ @@ -465,7 +316,6 @@ } else { -#ifdef NEW_SCHEDULER /* Try to find a ready thread */ NextThread = KiSelectReadyThread(0, Prcb); if (NextThread) @@ -484,10 +334,6 @@ Prcb->CurrentThread = NextThread; NextThread->State = Running; } -#else - /* Find a new thread to run */ - ApcState = KiDispatchThreadNoLock(Waiting); -#endif } /* Sanity check and release the PRCB */ @@ -497,13 +343,13 @@ /* Save the wait IRQL */ WaitIrql = CurrentThread->WaitIrql; -#ifdef NEW_SCHEDULER /* REACTOS Mm Hack of Doom */ - MmUpdatePageDir(HackOfDoom,((PETHREAD)NextThread)->ThreadsProcess, sizeof(EPROCESS)); + MiSyncThreadProcessViews(PsGetCurrentProcess(), + ((PETHREAD)NextThread)->ThreadsProcess, + sizeof(EPROCESS)); /* Swap contexts */ ApcState = KiSwapContext(CurrentThread, NextThread); -#endif /* Get the wait status */ WaitStatus = CurrentThread->WaitStatus; @@ -552,13 +398,7 @@ else { /* Insert the thread on the deferred ready list */ -#ifdef NEW_SCHEDULER KiInsertDeferredReadyList(Thread); -#else - /* Insert the thread into the thread list */ - Thread->State = Ready; - KiInsertIntoThreadList(Thread->Priority, Thread); -#endif } } @@ -586,7 +426,6 @@ /* Calculate new Priority */ Thread->Priority = KiComputeNewPriority(Thread, 1); -#ifdef NEW_SCHEDULER /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { @@ -604,11 +443,6 @@ /* This thread can be preempted again */ Thread->Preempted = FALSE; } -#else - /* We need to dispatch a new thread */ - NextThread = NULL; - KiDispatchThread(Ready); -#endif } } @@ -651,7 +485,6 @@ if ((Thread->State == Ready) && (Thread->NextProcessor == Prcb->Number)) { -#ifdef NEW_SCHEDULER /* Sanity check */ ASSERT((Prcb->ReadySummary & PRIORITY_MASK(Thread->Priority))); @@ -663,20 +496,12 @@ Prcb->ReadySummary ^= PRIORITY_MASK(Thread-> Priority); } -#else - KiRemoveFromThreadList(Thread); -#endif /* Update priority */ Thread->Priority = (SCHAR)Priority; /* Re-insert it at its current priority */ -#ifndef NEW_SCHEDULER - KiInsertIntoThreadList(Priority, Thread); - //KiDispatchThreadNoLock(Ready); -#else KiInsertDeferredReadyList(Thread); -#endif /* Release the PRCB Lock */ KiReleasePrcbLock(Prcb); @@ -751,7 +576,6 @@ /* Check if there was a change and there's no new thread */ if ((Priority < OldPriority) && !(Prcb->NextThread)) { -#ifdef NEW_SCHEDULER /* Find a new thread */ NewThread = KiSelectReadyThread(Priority + 1, Prcb); if (NewThread) @@ -763,19 +587,6 @@ /* Request an interrupt */ RequestInterrupt = TRUE; } -#else - /* Check for threads with a higher priority */ - if (KeGetCurrentPrcb()->ReadySummary & ~((1 << (Priority + 1)) - 1)) - { - /* Found a thread, is it us? */ - if (Thread == KeGetCurrentThread()) - { - /* Dispatch us */ - //KiDispatchThreadNoLock(Ready); - return; - } - } -#endif } /* Release the lock and check if we need an interrupt */ @@ -854,7 +665,6 @@ NTAPI NtYieldExecution(VOID) { -#ifdef NEW_SCHEDULER NTSTATUS Status = STATUS_NO_YIELD_PERFORMED; KIRQL OldIrql; PKPRCB Prcb = KeGetCurrentPrcb(); @@ -920,9 +730,6 @@ /* Lower IRQL and return */ KeLowerIrql(OldIrql); return Status; -#else - KiDispatchThread(Ready); - return STATUS_SUCCESS; -#endif -} - +} + +

1 0

[jimtabor] 29246: - First try bug fix for #2698.
by jimtabor＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: jimtabor Date: Thu Sep 27 19:54:51 2007 New Revision: 29246 URL: http://svn.reactos.org/svn/reactos?rev=29246&view=rev Log: - First try bug fix for #2698. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Sep 27 19:54:51 2007 @@ -156,7 +156,7 @@ HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); -VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC); +VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); VOID FASTCALL DC_UpdateXforms(PDC dc); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Sep 27 19:54:51 2007 @@ -252,7 +252,7 @@ IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); PDC dc = DC_LockDc ( dce->hDC ); - IntGdiCopyFromSaveState(dc, defaultDCstate); // Was SetDCState. + IntGdiCopyFromSaveState(dc, defaultDCstate, dce->hDC ); // Was SetDCState. dce->DCXFlags &= ~DCX_DCEBUSY; if (dce->DCXFlags & DCX_DCEDIRTY) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Sep 27 19:54:51 2007 @@ -1365,10 +1365,8 @@ VOID FASTCALL -IntGdiCopyFromSaveState(PDC dc, PDC dcs) -{ - HDC hDC = dc->hSelf; - +IntGdiCopyFromSaveState(PDC dc, PDC dcs, HDC hDC) +{ dc->w.flags = dcs->w.flags & ~DC_SAVED; dc->w.hFirstBitmap = dcs->w.hFirstBitmap; @@ -1512,7 +1510,7 @@ { if ( dcs->w.flags & DC_SAVED ) { - IntGdiCopyFromSaveState( dc, dcs); + IntGdiCopyFromSaveState( dc, dcs, dc->hSelf); } else {

1 0

[weiden] 29245: Set eol-style to native
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 19:50:28 2007 New Revision: 29245 URL: http://svn.reactos.org/svn/reactos?rev=29245&view=rev Log: Set eol-style to native Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc (contents, props changed) trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc (contents, props changed) trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc (contents, props changed) Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc Thu Sep 27 19:50:28 2007 @@ -1,47 +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 +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 Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc Thu Sep 27 19:50:28 2007 @@ -1,56 +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 - +/* + * 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 + Propchange: trunk/reactos/dll/win32/shellext/deskadp/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc Thu Sep 27 19:50:28 2007 @@ -1,12 +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 - +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 + Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 (original) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc Thu Sep 27 19:50:28 2007 @@ -1,20 +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 - +/* + * 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 + Propchange: trunk/reactos/dll/win32/shellext/deskmon/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native

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