Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 29214: - Implement InterlockedExchangeAdd/Decrement/Increment16. - Fix MM_EXTEND_INFO definition. - Fix MMWSLE definition. - Fix EPROCESS definition. - Add quota functions to NDK. - Add one more parameter to PspMapSystemDll to support mapping large pages. - Don't make the quota functions do anything for the system process. - Add page file quota functions. - Other misc small fixes.
by fireball＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: fireball Date: Wed Sep 26 20:41:35 2007 New Revision: 29214 URL: http://svn.reactos.org/svn/reactos?rev=29214&view=rev Log: - Implement InterlockedExchangeAdd/Decrement/Increment16. - Fix MM_EXTEND_INFO definition. - Fix MMWSLE definition. - Fix EPROCESS definition. - Add quota functions to NDK. - Add one more parameter to PspMapSystemDll to support mapping large pages. - Don't make the quota functions do anything for the system process. - Add page file quota functions. - Other misc small fixes. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/psdk/intrin_x86.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/drvlck.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/quota.c 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 Wed Sep 26 20:41:35 2007 @@ -9689,6 +9689,20 @@ NTKERNELAPI PVOID NTAPI +MmLockPageableDataSection ( + IN PVOID AddressWithinSection +); + +NTKERNELAPI +VOID +NTAPI +MmUnlockPageableImageSection( + IN PVOID ImageSectionHandle +); + +NTKERNELAPI +PVOID +NTAPI MmPageEntireDriver( IN PVOID AddressWithinSection); @@ -9748,6 +9762,9 @@ } \ } +#define MmGetProcedureAddress(Address) (Address) +#define MmLockPagableCodeSection(Address) MmLockPagableDataSection(Address) + NTKERNELAPI VOID NTAPI 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 Wed Sep 26 20:41:35 2007 @@ -248,20 +248,6 @@ } MMPTE, *PMMPTE; // -// Section Information structure -// -typedef struct _MI_EXTRA_IMAGE_INFORMATION -{ - ULONG SizeOfHeaders; -} MI_EXTRA_IMAGE_INFORMATION, *PMI_EXTRA_IMAGE_INFORMATION; - -typedef struct _MI_SECTION_IMAGE_INFORMATION -{ - SECTION_IMAGE_INFORMATION ExportedImageInformation; - MI_EXTRA_IMAGE_INFORMATION InternalImageInformation; -} MI_SECTION_IMAGE_INFORMATION, *PMI_SECTION_IMAGE_INFORMATION; - -// // Section Extension Information // typedef struct _MMEXTEND_INFO @@ -295,12 +281,12 @@ PVOID BaseAddress; union { - ULONG ImageCommitment; + SIZE_T ImageCommitment; PEPROCESS CreatingProcess; } u1; union { - PMI_SECTION_IMAGE_INFORMATION ImageInformation; + PSECTION_IMAGE_INFORMATION ImageInformation; PVOID FirstMappedVa; } u2; PMMPTE PrototypePte; @@ -545,7 +531,7 @@ PVOID VirtualAddress; ULONG Long; MMWSLENTRY e1; - }; + } u1; } MMWSLE, *PMMWSLE; typedef struct _MMWSLE_HASH Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h (original) +++ trunk/reactos/include/ndk/psfuncs.h Wed Sep 26 20:41:35 2007 @@ -130,6 +130,68 @@ NTAPI PsIsProtectedProcess( IN PEPROCESS Process +); + +// +// Quota Functions +// +NTKERNELAPI +VOID +NTAPI +PsChargePoolQuota( + IN PEPROCESS Process, + IN POOL_TYPE PoolType, + IN ULONG Amount +); + +NTKERNELAPI +NTSTATUS +NTAPI +PsChargeProcessNonPagedPoolQuota( + IN PEPROCESS Process, + IN ULONG_PTR Amount +); + +NTKERNELAPI +NTSTATUS +NTAPI +PsChargeProcessPagedPoolQuota( + IN PEPROCESS Process, + IN ULONG_PTR Amount +); + +NTKERNELAPI +NTSTATUS +NTAPI +PsChargeProcessPoolQuota( + IN PEPROCESS Process, + IN POOL_TYPE PoolType, + IN ULONG Amount +); + +NTKERNELAPI +VOID +NTAPI +PsReturnPoolQuota( + IN PEPROCESS Process, + IN POOL_TYPE PoolType, + IN ULONG_PTR Amount +); + +NTKERNELAPI +VOID +NTAPI +PsReturnProcessNonPagedPoolQuota( + IN PEPROCESS Process, + IN ULONG_PTR Amount +); + +NTKERNELAPI +VOID +NTAPI +PsReturnProcessPagedPoolQuota( + IN PEPROCESS Process, + IN ULONG_PTR Amount ); #endif 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 Wed Sep 26 20:41:35 2007 @@ -1177,16 +1177,12 @@ EX_PUSH_LOCK AddressCreationLock; PETHREAD RotateInProgress; #else - FAST_MUTEX AddressCreationLock; // FIXME: FAST_MUTEX for XP, KGUARDED_MUTEX for 2K3 + KGUARDED_MUTEX AddressCreationLock; KSPIN_LOCK HyperSpaceLock; #endif PETHREAD ForkInProgress; ULONG HardwareTrigger; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - PMM_AVL_TABLE PhysicalVadroot; -#else - MM_AVL_TABLE PhysicalVadroot; -#endif + PMM_AVL_TABLE PhysicalVadRoot; PVOID CloneRoot; ULONG NumberOfPrivatePages; ULONG NumberOfLockedPages; Modified: trunk/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86.h (original) +++ trunk/reactos/include/psdk/intrin_x86.h Wed Sep 26 20:41:35 2007 @@ -128,6 +128,11 @@ return __sync_lock_test_and_set(Target, Value); } +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +{ + return __sync_fetch_and_add(Addend, Value); +} + static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) { return __sync_fetch_and_add(Addend, Value); @@ -239,6 +244,13 @@ return retval; } +static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +{ + long retval = Value; + __asm__("lock; xaddw %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); + return retval; +} + static __inline__ __attribute__((always_inline)) long _InterlockedExchangeAdd(volatile long * const Addend, const long Value) { long retval = Value; @@ -424,6 +436,16 @@ static __inline__ __attribute__((always_inline)) long _InterlockedIncrement(volatile long * const lpAddend) { return _InterlockedExchangeAdd(lpAddend, 1) + 1; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedDecrement16(volatile short * const lpAddend) +{ + return _InterlockedExchangeAdd16(lpAddend, -1) - 1; +} + +static __inline__ __attribute__((always_inline)) long _InterlockedIncrement16(volatile short * const lpAddend) +{ + return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } static __inline__ __attribute__((always_inline)) unsigned char _interlockedbittestandreset(volatile long * a, const long b) Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h Wed Sep 26 20:41:35 2007 @@ -79,6 +79,9 @@ #define Ke386HaltProcessor() __asm__("hlt\n\t"); #define Ke386FnInit() __asm__("fninit\n\t"); + +#define Ke386WbInvd() __asm__("wbinvd\n\t"); + // // CR Macros 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 Wed Sep 26 20:41:35 2007 @@ -751,6 +751,15 @@ NTAPI KeFlushCurrentTb(VOID); +BOOLEAN +NTAPI +KeInvalidateAllCaches(VOID); + +VOID +FASTCALL +KeZeroPages(IN PVOID Address, + IN ULONG Size); + VOID NTAPI KeRosDumpStackFrames( Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Wed Sep 26 20:41:35 2007 @@ -96,7 +96,7 @@ PKTHREAD _Thread = KeGetCurrentThread(); \ \ /* Sanity checks */ \ - ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); \ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); \ ASSERT(_Thread == KeGetCurrentThread()); \ ASSERT((_Thread->SpecialApcDisable <= 0) && \ (_Thread->SpecialApcDisable != -32768)); \ @@ -113,7 +113,7 @@ PKTHREAD _Thread = KeGetCurrentThread(); \ \ /* Sanity checks */ \ - ASSERT_IRQL_LESS_OR_EQUAL(APC_LEVEL); \ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); \ ASSERT(_Thread == KeGetCurrentThread()); \ ASSERT(_Thread->SpecialApcDisable < 0); \ \ @@ -1540,3 +1540,11 @@ return KeGetCurrentThread()->PreviousMode; } +VOID +FORCEINLINE +KeFlushProcessTb(VOID) +{ + /* Flush the TLB by resetting CR3 */ + __writecr3(__readcr3()); +} + 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 Wed Sep 26 20:41:35 2007 @@ -1457,4 +1457,14 @@ IN BOOLEAN PurgeSection ); +FORCEINLINE +VOID +NTAPI +MiSyncThreadProcessViews(IN PKPROCESS Process, + IN PVOID Address, + IN ULONG Size) +{ + MmUpdatePageDir((PEPROCESS)Process, Address, Size); +} + #endif Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Wed Sep 26 20:41:35 2007 @@ -105,7 +105,8 @@ NTAPI PspMapSystemDll( IN PEPROCESS Process, - OUT PVOID *DllBase + OUT PVOID *DllBase, + IN BOOLEAN UseLargePages ); NTSTATUS @@ -347,6 +348,23 @@ PsSuspendThread( IN PETHREAD Thread, OUT PULONG PreviousCount OPTIONAL +); + +// +// Process Quotas +// +NTSTATUS +NTAPI +PsReturnProcessPageFileQuota( + IN PEPROCESS Process, + IN SIZE_T Amount +); + +NTSTATUS +NTAPI +PsChargeProcessPageFileQuota( + IN PEPROCESS Process, + IN SIZE_T Amount ); // Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Wed Sep 26 20:41:35 2007 @@ -20,18 +20,20 @@ ((Mask) & 48) // -// Set Process Flag routines -// -#define PspSetProcessFlag(Process, Flag) \ - InterlockedOr((PLONG)&Process->Flags, Flag) - -// // Cross Thread Flag routines // #define PspSetCrossThreadFlag(Thread, Flag) \ InterlockedOr((PLONG)&Thread->CrossThreadFlags, Flag) #define PspClearCrossThreadFlag(Thread, Flag) \ InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~Flag) + +// +// Process flag routines +// +#define PspSetProcessFlag(Process, Flag) \ + InterlockedOr((PLONG)&Process->Flags, Flag) +#define PspClearProcessFlag(Process, Flag) \ + InterlockedAnd((PLONG)&Process->Flags, ~Flag) VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Wed Sep 26 20:41:35 2007 @@ -78,6 +78,9 @@ KIRQL KiOldIrql; ULONG KiFreezeFlag; +/* Flush data */ +volatile LONG KiTbFlushTimeStamp; + /* CPU Signatures */ static const CHAR CmpIntelID[] = "GenuineIntel"; static const CHAR CmpAmdID[] = "AuthenticAMD"; @@ -882,6 +885,27 @@ if (Enable) _enable(); } +BOOLEAN +NTAPI +KeInvalidateAllCaches(VOID) +{ + /* Only supported on Pentium Pro and higher */ + if (KeI386CpuType < 6) return FALSE; + + /* Invalidate all caches */ + Ke386WbInvd(); + return TRUE; +} + +VOID +FASTCALL +KeZeroPages(IN PVOID Address, + IN ULONG Size) +{ + /* Not using XMMI in this routine */ + RtlZeroMemory(Address, Size); +} + /* PUBLIC FUNCTIONS **********************************************************/ /* Modified: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c Wed Sep 26 20:41:35 2007 @@ -39,11 +39,11 @@ if (AddressSpace->Process) { - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&AddressSpace->Process->AddressCreationLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe((PFAST_MUTEX)&AddressSpace->Process->AddressCreationLock); } else { - ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&KernelAddressSpaceLock); + ExEnterCriticalRegionAndAcquireFastMutexUnsafe((PFAST_MUTEX)&KernelAddressSpaceLock); } } @@ -60,11 +60,11 @@ } if (AddressSpace->Process) { - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&AddressSpace->Process->AddressCreationLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((PFAST_MUTEX)&AddressSpace->Process->AddressCreationLock); } else { - ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&KernelAddressSpaceLock); + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((PFAST_MUTEX)&KernelAddressSpaceLock); } } @@ -98,11 +98,11 @@ AddressSpace->MemoryAreaRoot = NULL; if (Process) { - ExInitializeFastMutex(&Process->AddressCreationLock); + ExInitializeFastMutex((PFAST_MUTEX)&Process->AddressCreationLock); } else { - ExInitializeFastMutex(&KernelAddressSpaceLock); + ExInitializeFastMutex((PFAST_MUTEX)&KernelAddressSpaceLock); } if (Process != NULL) { Modified: trunk/reactos/ntoskrnl/mm/drvlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/drvlck.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/drvlck.c (original) +++ trunk/reactos/ntoskrnl/mm/drvlck.c Wed Sep 26 20:41:35 2007 @@ -14,6 +14,8 @@ #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ + +#undef MmLockPagableDataSection #if 0 VOID 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 Wed Sep 26 20:41:35 2007 @@ -592,7 +592,7 @@ if (!NT_SUCCESS(Status)) goto CleanupWithRef; /* Check if we have a section object and map the system DLL */ - if (SectionObject) PspMapSystemDll(Process, NULL); + if (SectionObject) PspMapSystemDll(Process, NULL, FALSE); /* Create a handle for the Process */ CidEntry.Object = Process; Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Wed Sep 26 20:41:35 2007 @@ -218,13 +218,14 @@ NTSTATUS NTAPI PspMapSystemDll(IN PEPROCESS Process, - IN PVOID *DllBase) + IN PVOID *DllBase, + IN BOOLEAN UseLargePages) { NTSTATUS Status; LARGE_INTEGER Offset = {{0}}; SIZE_T ViewSize = 0; PVOID ImageBase = 0; - + /* Map the System DLL */ Status = MmMapViewOfSection(PspSystemDllSection, Process, @@ -236,7 +237,12 @@ ViewShare, 0, PAGE_READWRITE); - + if (Status != STATUS_SUCCESS) + { + /* Normalize status code */ + Status = STATUS_CONFLICTING_ADDRESSES; + } + /* Write the image base and return status */ if (DllBase) *DllBase = ImageBase; return Status; @@ -316,7 +322,7 @@ } /* Map it */ - Status = PspMapSystemDll(PsGetCurrentProcess(), &PspSystemDllBase); + Status = PspMapSystemDll(PsGetCurrentProcess(), &PspSystemDllBase, FALSE); if (!NT_SUCCESS(Status)) { /* Failed, bugcheck */ Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Wed Sep 26 20:41:35 2007 @@ -59,6 +59,19 @@ } } +NTSTATUS +NTAPI +PsChargeProcessPageFileQuota(IN PEPROCESS Process, + IN SIZE_T Amount) +{ + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; + + /* Otherwise, not implemented */ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + /* * @implemented */ @@ -70,14 +83,12 @@ { NTSTATUS Status; + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return; + /* Charge the usage */ Status = PsChargeProcessPoolQuota(Process, PoolType, Amount); - - /* Raise Exception */ - if (!NT_SUCCESS(Status)) - { - ExRaiseStatus(Status); - } + if (!NT_SUCCESS(Status)) ExRaiseStatus(Status); } /* @@ -113,6 +124,9 @@ IN POOL_TYPE PoolType, IN ULONG Amount) { + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; + UNIMPLEMENTED; return STATUS_SUCCESS; } @@ -126,6 +140,9 @@ IN POOL_TYPE PoolType, IN ULONG_PTR Amount) { + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return; + UNIMPLEMENTED; } @@ -137,6 +154,9 @@ PsReturnProcessNonPagedPoolQuota(IN PEPROCESS Process, IN ULONG_PTR Amount) { + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return; + UNIMPLEMENTED; } @@ -148,7 +168,23 @@ PsReturnProcessPagedPoolQuota(IN PEPROCESS Process, IN ULONG_PTR Amount) { + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return; + UNIMPLEMENTED; } +NTSTATUS +NTAPI +PsReturnProcessPageFileQuota(IN PEPROCESS Process, + IN SIZE_T Amount) +{ + /* Don't do anything for the system process */ + if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; + + /* Otherwise, not implemented */ + UNIMPLEMENTED; + return STATUS_SUCCESS; +} + /* EOF */

1 0

[dreimer] 29213: Updated German Translation.
by dreimer＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: dreimer Date: Wed Sep 26 13:53:48 2007 New Revision: 29213 URL: http://svn.reactos.org/svn/reactos?rev=29213&view=rev Log: Updated German Translation. Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Wed Sep 26 13:53:48 2007 @@ -112,7 +112,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -120,6 +127,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Deaktiviert", ID_MENU_DISABLED MENUITEM "Ausgewählt", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Mehrere Monitore)" + IDS_UNKNOWNMONITOR "(Unbekannter Monitor)" + IDS_ADVANCEDTITLEFMT "%s und %s" END STRINGTABLE

1 0

[cfinck] 29212: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2692 for more details.
by cfinck＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: cfinck Date: Wed Sep 26 12:48:29 2007 New Revision: 29212 URL: http://svn.reactos.org/svn/reactos?rev=29212&view=rev Log: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2692 for more details. Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/scrnsave/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/starfield/lang/uk-UA.rc Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc trunk/reactos/base/applications/screensavers/starfield/starfield.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc (original) +++ trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc Wed Sep 26 12:48:29 2007 @@ -15,3 +15,4 @@ #include "lang/fr-FR.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/screensavers/cylfrac/lang/uk-UA.rc Wed Sep 26 12:48:29 2007 @@ -1,0 +1,16 @@ +/* + * PROJECT: Cylinders fractal ScreenSaver + * LICENSE: Public Domain + * FILE: base/applications/screensavers/cylfrac/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Cylinders fractal ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà ""Cylinders fractal""" + IDS_TITLE "Ïðî" + IDS_TEXT "Cylinders fractal â³ä unC0Rr.\nÑïåö³àëüíî äëÿ ReactOS." +END Added: trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc Wed Sep 26 12:48:29 2007 @@ -1,0 +1,16 @@ +/* + * PROJECT: Logon ScreenSaver + * LICENSE: Public Domain + * FILE: base/applications/screensavers/logon/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Logon ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà ""Âõ³ä äî ñèñòåìè""" + IDS_TITLE "Ïðî" + IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." +END Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Wed Sep 26 12:48:29 2007 @@ -18,3 +18,4 @@ #include "lang/fr-FR.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/scrnsave/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/screensavers/scrnsave/lang/uk-UA.rc Wed Sep 26 12:48:29 2007 @@ -1,0 +1,16 @@ +/* + * PROJECT: Default ScreenSaver + * LICENSE: Public Domain + * FILE: base/applications/screensavers/scrnsave/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Default ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà çà çàìîâ÷óâàííÿì" + IDS_TITLE "Ïðî" + IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." +END Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc Wed Sep 26 12:48:29 2007 @@ -15,3 +15,4 @@ #include "lang/fr-FR.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/starfield/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/screensavers/starfield/lang/uk-UA.rc Wed Sep 26 12:48:29 2007 @@ -1,0 +1,16 @@ +/* + * PROJECT: Default ScreenSaver + * LICENSE: Public Domain + * FILE: base/applications/screensavers/starfield/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Default ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Çàñòàâêà ""Çîðÿíå ïîëå""" + IDS_TITLE "Ïðî" + IDS_TEXT "Öÿ çàñòàâêà íå ìàº íàëàøòîâóâàíèõ ïàðàìåòð³â." +END Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rc (original) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rc Wed Sep 26 12:48:29 2007 @@ -15,3 +15,4 @@ #include "lang/fr-FR.rc" #include "lang/nl-NL.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Wed Sep 26 12:48:29 2007 @@ -10,7 +10,7 @@ IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Òëî" +CAPTION "Ðîáî÷èé ñò³ë" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, @@ -44,7 +44,7 @@ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "õâ", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Çà&õèñò ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"button", + CONTROL "Çà&õèñò ïàðîëåì",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "&Åíåðãîçáåðåæåííÿ", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Ùîá çì³íèòè ïàðàìåòðè æèâëåííÿ ìîí³òîðà, íàòèñí³òü êíîïêó ""Æèâëåííÿ"".", @@ -59,7 +59,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Êîë³ðíà ñõåìà", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Äîäàòêîâî", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END @@ -104,7 +104,7 @@ IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Íàñòðîéêè" +CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Äèñïëåé:",1820,3,100,30,8 @@ -115,12 +115,19 @@ LTEXT "Ìåíøå",1815,9,130,15,8,NOT WS_GROUP LTEXT "Á³ëüøå",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10, NOT WS_GROUP | SS_CENTER - GROUPBOX "&Êîëüîðè",1817,125,120,115,43 + GROUPBOX "&ßê³ñòü êîëüîðîïåðåäà÷³",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -130,11 +137,18 @@ MENUITEM "Âèáðàíà", ID_MENU_SELECTED END +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Äåê³ëüêà ìîí³òîð³â)" + IDS_UNKNOWNMONITOR "(Íåâ³äîìèé ìîí³òîð)" + IDS_ADVANCEDTITLEFMT "%s ³ %s" +END + STRINGTABLE BEGIN - IDS_CPLNAME "Äèñïëåé" + IDS_CPLNAME "Åêðàí" IDS_CPLDESCRIPTION "Âèáåð³òü â³äîáðàæåííÿ ðîáî÷îãî ñòîëó é çáåð³ãà÷à åêðàíó." - IDS_NONE "(Íåìàº)" + IDS_NONE "(íåìàº)" IDS_CENTER "Ïî öåíòðó" IDS_STRETCH "Ðîçòÿãíóòè" IDS_TILE "Ïëèòêîþ" @@ -144,10 +158,10 @@ BEGIN IDS_COLOR_4BIT "16 êîëüîð³â" IDS_COLOR_8BIT "256 êîëüîð³â" - IDS_COLOR_16BIT "High Color (16 á³ò³â)" - IDS_COLOR_24BIT "True Color (24 á³òè)" - IDS_COLOR_32BIT "True Color (32 á³òè)" - IDS_PIXEL "%lux%lu ï³êñåë³â" + IDS_COLOR_16BIT "Ñåðåäíÿ (16 á³ò)" + IDS_COLOR_24BIT "Âèñîêà (24 á³òà)" + IDS_COLOR_32BIT "Íàéâèùà (32 á³òà)" + IDS_PIXEL "%lu íà %lu êðàïîê" END STRINGTABLE DISCARDABLE

1 0

[jimtabor] 29211: Fix calling conventions.
by jimtabor＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: jimtabor Date: Wed Sep 26 10:26:17 2007 New Revision: 29211 URL: http://svn.reactos.org/svn/reactos?rev=29211&view=rev Log: Fix calling conventions. Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/wingl… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/wingl.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/wingl.c Wed Sep 26 10:26:17 2007 @@ -28,11 +28,11 @@ -typedef int (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); -typedef BOOL (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *); -typedef BOOL (*SWAPBUFFERS) (HDC hdc); -typedef int (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); -typedef int (*GETPIXELFMT) (HDC); +typedef int STDCALL (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *); +typedef BOOL STDCALL (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *); +typedef BOOL STDCALL (*SWAPBUFFERS) (HDC hdc); +typedef int STDCALL (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); +typedef int STDCALL (*GETPIXELFMT) (HDC); static CHOOSEPIXELFMT glChoosePixelFormat = NULL;

1 0

[weiden] 29210: Display advanced display settings and allow shell extensions to extend it. Not yet fully functional/working
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Wed Sep 26 10:20:16 2007 New Revision: 29210 URL: http://svn.reactos.org/svn/reactos?rev=29210&view=rev Log: Display advanced display settings and allow shell extensions to extend it. Not yet fully functional/working Added: trunk/reactos/dll/cpl/desk/advmon.c (with props) trunk/reactos/dll/cpl/desk/devsett.c (with props) Modified: trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c Added: trunk/reactos/dll/cpl/desk/advmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advmon.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/advmon.c (added) +++ trunk/reactos/dll/cpl/desk/advmon.c Wed Sep 26 10:20:16 2007 @@ -1,0 +1,187 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/advmon.c + * PURPOSE: Advanced monitor/display settings + */ + +#include "desk.h" + +#define MAX_ADVANCED_PAGES 32 + +static BOOL CALLBACK +PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) +{ + PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; + if (ppsh != NULL && ppsh->nPages < MAX_ADVANCED_PAGES) + { + ppsh->phpage[ppsh->nPages++] = hpage; + return TRUE; + } + + return FALSE; +} + +static BOOL +InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc, LPARAM lParam) +{ + HPROPSHEETPAGE hPage; + PROPSHEETPAGE psp; + + if (ppsh->nPages < MAX_ADVANCED_PAGES) + { + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(idDlg); + psp.pfnDlgProc = DlgProc; + psp.lParam = lParam; + + hPage = CreatePropertySheetPage(&psp); + if (hPage != NULL) + { + return PropSheetAddPage(hPage, (LPARAM)ppsh); + } + } + + return FALSE; +} + +static INT_PTR CALLBACK +AdvGeneralPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDISPLAY_DEVICE_ENTRY DispDevice = NULL; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + DispDevice = (PDISPLAY_DEVICE_ENTRY)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); + + Ret = TRUE; + break; + } + + return Ret; +} + +static LPTSTR +QueryDevSettingsString(IDataObject *pdo, UINT cfFormat) +{ + FORMATETC fetc; + STGMEDIUM medium; + SIZE_T BufLen; + LPWSTR lpRecvBuffer; + LPTSTR lpStr = NULL; + + fetc.cfFormat = (CLIPFORMAT)cfFormat; + fetc.ptd = NULL; + fetc.dwAspect = DVASPECT_CONTENT; + fetc.lindex = -1; + fetc.tymed = TYMED_HGLOBAL; + + if (SUCCEEDED(IDataObject_GetData(pdo, &fetc, &medium)) && medium.hGlobal != NULL) + { + /* We always receive the string in unicode! */ + lpRecvBuffer = (LPWSTR)GlobalLock(medium.hGlobal); + + BufLen = wcslen(lpRecvBuffer) + 1; + lpStr = LocalAlloc(LMEM_FIXED, BufLen * sizeof(TCHAR)); + if (lpStr != NULL) + { +#ifdef UNICODE + wcscpy(lpStr, lpRecvBuffer); +#else + WideCharToMultiByte(CP_APC, 0, lpRecvBuffer, -1, lpStr, BufLen, NULL, NULL); +#endif + } + + GlobalUnlock(medium.hGlobal); + ReleaseStgMedium(&medium); + } + + return lpStr; +} + +static VOID +BuildAdvPropTitle(IDataObject *pdo, LPTSTR lpBuffer, DWORD dwBufferLen) +{ + UINT uiMonitorName, uiDisplayName; + LPTSTR lpMonitorName, lpDisplayName; + TCHAR szFormatBuff[32]; + + if (!LoadString(hApplet, IDS_ADVANCEDTITLEFMT, szFormatBuff, sizeof(szFormatBuff) / sizeof(szFormatBuff[0]))) + { + szFormatBuff[0] = _T('\0'); + } + + uiMonitorName = RegisterClipboardFormat(TEXT("Monitor Name")); + uiDisplayName = RegisterClipboardFormat(TEXT("Display Name")); + + lpMonitorName = QueryDevSettingsString(pdo, uiMonitorName); + lpDisplayName = QueryDevSettingsString(pdo, uiDisplayName); + + _sntprintf(lpBuffer, dwBufferLen, szFormatBuff, lpMonitorName, lpDisplayName); + + if (lpMonitorName != NULL) + LocalFree((HLOCAL)lpMonitorName); + if (lpDisplayName != NULL) + LocalFree((HLOCAL)lpDisplayName); +} + +BOOL +DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice) +{ + TCHAR szCaption[128]; + HPROPSHEETPAGE hpsp[MAX_ADVANCED_PAGES]; + PROPSHEETHEADER psh; + HPSXA hpsxaDev, hpsxaDisp; + BOOL Ret; + IDataObject *pdo; + + /* FIXME: Build the "%s and %s" caption string for the monitor and adapter name */ + szCaption[0] = _T('\0'); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = hWndParent; + psh.hInstance = hApplet; + psh.pszCaption = szCaption; + psh.phpage = hpsp; + + InitPropSheetPage(&psh, IDD_ADVANCED_GENERAL, AdvGeneralPageProc, (LPARAM)DisplayDevice); + + pdo = CreateDevSettings(DisplayDevice); + + if (pdo != NULL) + BuildAdvPropTitle(pdo, szCaption, sizeof(szCaption) / sizeof(szCaption[0])); + + hpsxaDev = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Device"), MAX_ADVANCED_PAGES - psh.nPages, pdo); + if (hpsxaDev != NULL) + SHAddFromPropSheetExtArray(hpsxaDev, PropSheetAddPage, (LPARAM)&psh); + + hpsxaDisp = SHCreatePropSheetExtArrayEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Display"), MAX_ADVANCED_PAGES - psh.nPages, pdo); + if (hpsxaDisp != NULL) + SHAddFromPropSheetExtArray(hpsxaDisp, PropSheetAddPage, (LPARAM)&psh); + + Ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxaDisp != NULL) + SHDestroyPropSheetExtArray(hpsxaDisp); + + if (hpsxaDev != NULL) + SHDestroyPropSheetExtArray(hpsxaDev); + + IDataObject_Release(pdo); + + return Ret; +} Propchange: trunk/reactos/dll/cpl/desk/advmon.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Wed Sep 26 10:20:16 2007 @@ -33,26 +33,66 @@ } }; +static BOOL CALLBACK +PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) +{ + PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; + if (ppsh != NULL && ppsh->nPages < MAX_DESK_PAGES) + { + ppsh->phpage[ppsh->nPages++] = hpage; + return TRUE; + } -static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) -{ - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + return FALSE; } +static BOOL +InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) +{ + HPROPSHEETPAGE hPage; + PROPSHEETPAGE psp; + + if (ppsh->nPages < MAX_DESK_PAGES) + { + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(idDlg); + psp.pfnDlgProc = DlgProc; + + hPage = CreatePropertySheetPage(&psp); + if (hPage != NULL) + { + return PropSheetAddPage(hPage, (LPARAM)ppsh); + } + } + + return FALSE; +} + +static const struct +{ + WORD idDlg; + DLGPROC DlgProc; +} PropPages[] = +{ + { IDD_BACKGROUND, BackgroundPageProc }, + { IDD_SCREENSAVER, ScreenSaverPageProc }, + { IDD_APPEARANCE, AppearancePageProc }, + { IDD_SETTINGS, SettingsPageProc }, +}; /* Display Applet */ static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - PROPSHEETPAGE psp[4]; + HPROPSHEETPAGE hpsp[MAX_DESK_PAGES]; PROPSHEETHEADER psh; + HPSXA hpsxa; TCHAR Caption[1024]; + LONG ret; + UINT i; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); @@ -63,21 +103,41 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; + psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_DESK_ICON)); psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nPages = 0; psh.nStartPage = 0; - psh.ppsp = psp; + psh.phpage = hpsp; - InitPropSheetPage(&psp[0], IDD_BACKGROUND, (DLGPROC) BackgroundPageProc); - InitPropSheetPage(&psp[1], IDD_SCREENSAVER, (DLGPROC) ScreenSaverPageProc); - InitPropSheetPage(&psp[2], IDD_APPEARANCE, (DLGPROC) AppearancePageProc); - InitPropSheetPage(&psp[3], IDD_SETTINGS, (DLGPROC) SettingsPageProc); + /* Allow shell extensions to replace the background page */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Desk"), MAX_DESK_PAGES - psh.nPages); - return (LONG)(PropertySheet(&psh) != -1); + for (i = 0; i != sizeof(PropPages) / sizeof(PropPages[0]); i++) + { + /* Override the background page if requested by a shell extension */ + if (PropPages[i].idDlg == IDD_BACKGROUND && hpsxa != NULL && + SHReplaceFromPropSheetExtArray(hpsxa, CPLPAGE_DISPLAY_BACKGROUND, PropSheetAddPage, (LPARAM)&psh) != 0) + { + /* The shell extension added one or more pages to replace the background page. + Don't create the built-in page anymore! */ + continue; + } + + InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc); + } + + /* NOTE: Don;t call SHAddFromPropSheetExtArray here because this applet only allows + replacing the background page but not extending the applet by more pages */ + + ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + SHDestroyPropSheetExtArray(hpsxa); + + return ret; } Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Wed Sep 26 10:20:16 2007 @@ -1,6 +1,7 @@ #ifndef __CPL_DESK_H__ #define __CPL_DESK_H__ +#define COBJMACROS #include <windows.h> #include <commctrl.h> #include <commdlg.h> @@ -8,6 +9,9 @@ #include <tchar.h> #include <setupapi.h> #include <stdio.h> +#include <shlobj.h> +#include <regstr.h> +#include <cplext.h> #include "resource.h" @@ -37,7 +41,51 @@ HINSTANCE hInst, UINT uID); -DWORD DbgPrint(PCH Format,...); +ULONG __cdecl DbgPrint(PCCH Format,...); + +#define MAX_DESK_PAGES 32 + +/* As slider control can't contain user data, we have to keep an + * array of RESOLUTION_INFO to have our own associated data. + */ +typedef struct _RESOLUTION_INFO +{ + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} RESOLUTION_INFO, *PRESOLUTION_INFO; + +typedef struct _SETTINGS_ENTRY +{ + struct _SETTINGS_ENTRY *Blink; + struct _SETTINGS_ENTRY *Flink; + DWORD dmBitsPerPel; + DWORD dmPelsWidth; + DWORD dmPelsHeight; +} SETTINGS_ENTRY, *PSETTINGS_ENTRY; + +typedef struct _DISPLAY_DEVICE_ENTRY +{ + struct _DISPLAY_DEVICE_ENTRY *Flink; + LPTSTR DeviceDescription; + LPTSTR DeviceName; + LPTSTR DeviceKey; + LPTSTR DeviceID; + DWORD DeviceStateFlags; + PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ + DWORD SettingsCount; + PRESOLUTION_INFO Resolutions; + DWORD ResolutionsCount; + PSETTINGS_ENTRY CurrentSettings; /* Points into Settings list */ + SETTINGS_ENTRY InitialSettings; +} DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; + +BOOL +DisplayAdvancedSettings(HWND hWndParent, PDISPLAY_DEVICE_ENTRY DisplayDevice); + +IDataObject * +CreateDevSettings(PDISPLAY_DEVICE_ENTRY DisplayDeviceInfo); + +HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); #endif /* __CPL_DESK_H__ */ Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild Wed Sep 26 10:20:16 2007 @@ -15,15 +15,19 @@ <library>gdi32</library> <library>comctl32</library> <library>comdlg32</library> + <library>ole32</library> <library>setupapi</library> <library>shell32</library> <library>ntdll</library> <library>msimg32</library> <library>msvcrt</library> + <library>uuid</library> + <file>advmon.c</file> <file>appearance.c</file> <file>background.c</file> <file>classinst.c</file> <file>desk.c</file> + <file>devsett.c</file> <file>dibitmap.c</file> <file>misc.c</file> <file>preview.c</file> Added: trunk/reactos/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/devsett.c (added) +++ trunk/reactos/dll/cpl/desk/devsett.c Wed Sep 26 10:20:16 2007 @@ -1,0 +1,910 @@ +/* +* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: lib/cpl/desk/devsett.c + * PURPOSE: ReactOS Display Control Panel Shell Extension Support + */ + +#include "desk.h" + +#define NDEBUG +#include <debug.h> + +#define DEBUG_DEVSETTINGS + +#define DESK_EXT_CALLBACK CALLBACK + +typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_ENUMALLMODES)(PVOID Context, DWORD Index); +typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_GETCURRENTMODE)(PVOID Context); +typedef BOOL (DESK_EXT_CALLBACK *PDESK_EXT_SETCURRENTMODE)(PVOID Context, const DEVMODEW *pDevMode); +typedef VOID (DESK_EXT_CALLBACK *PDESK_EXT_GETPRUNINGMODE)(PVOID Context, PBOOL pbModesPruned, PBOOL pbKeyIsReadOnly, PBOOL pbPruningOn); +typedef VOID (DESK_EXT_CALLBACK *PDESK_EXT_SETPRUNINGMODE)(PVOID Context, BOOL PruningOn); + +typedef struct _DESK_EXT_INTERFACE +{ + /* NOTE: This structure is binary compatible to XP. The windows shell + extensions rely on this structure to be properly filled! */ + DWORD cbSize; + + PVOID Context; /* This value is passed on to the callback routines */ + + /* Callback routines called by the shell extensions */ + PDESK_EXT_ENUMALLMODES EnumAllModes; + PDESK_EXT_SETCURRENTMODE SetCurrentMode; + PDESK_EXT_GETCURRENTMODE GetCurrentMode; + PDESK_EXT_SETPRUNINGMODE SetPruningMode; + PDESK_EXT_GETPRUNINGMODE GetPruningMode; + + /* HardwareInformation.* values provided in the device registry key */ + WCHAR MemorySize[128]; + WCHAR ChipType[128]; + WCHAR DacType[128]; + WCHAR AdapterString[128]; + WCHAR BiosString[128]; +} DESK_EXT_INTERFACE, *PDESK_EXT_INTERFACE; + +typedef struct _CDevSettings +{ + const struct IDataObjectVtbl *lpIDataObjectVtbl; + DWORD ref; + + CLIPFORMAT cfExtInterface; /* "Desk.cpl extension interface" */ + CLIPFORMAT cfDisplayDevice; /* "Display Device" */ + CLIPFORMAT cfDisplayName; /* "Display Name" */ + CLIPFORMAT cfDisplayId; /* "Display ID" */ + CLIPFORMAT cfMonitorName; /* "Monitor Name" */ + CLIPFORMAT cfMonitorDevice; /* "Monitor Device" */ + CLIPFORMAT cfMonitorId; /* "Monitor ID" */ + CLIPFORMAT cfDisplayKey; /* "Display Key" */ + CLIPFORMAT cfDisplayStateFlags; /* "Display State Flags" */ + CLIPFORMAT cfPruningMode; /* "Pruning Mode" */ + + PWSTR pDisplayDevice; + PWSTR pDisplayName; + PWSTR pDisplayKey; + PWSTR pDisplayId; + PWSTR pMonitorName; + PWSTR pMonitorDevice; + PWSTR pMonitorId; + + DESK_EXT_INTERFACE ExtInterface; + + DWORD StateFlags; + + union + { + DWORD Flags; + struct + { + DWORD bModesPruned : 1; + DWORD bKeyIsReadOnly : 1; + DWORD bPruningOn : 1; + }; + }; +} CDevSettings, *PCDevSettings; + +#define impl_to_interface(impl,iface) (struct iface *)(&(impl)->lp##iface##Vtbl) + +static __inline PCDevSettings +impl_from_IDataObject(struct IDataObject *iface) +{ + return (PCDevSettings)((ULONG_PTR)iface - FIELD_OFFSET(CDevSettings, + lpIDataObjectVtbl)); +} + +static __inline VOID +pCDevSettings_FreeString(PWCHAR *psz) +{ + if (*psz != NULL) + { + LocalFree((HLOCAL)*psz); + *psz = NULL; + } +} + +static PWSTR +pCDevSettings_AllocAndCopyString(const TCHAR *pszSrc) +{ + INT c; + PWSTR str; + + c = _tcslen(pszSrc) + 1; + str = (PWSTR)LocalAlloc(LMEM_FIXED, + c * sizeof(WCHAR)); + if (str != NULL) + { +#ifdef UNICODE + wcscpy(str, + pszSrc); +#else + MultiByteToWideChar(CP_APC, + 0, + pszSrc, + -1, + str, + c); +#endif + } + + return str; +} + +static PWSTR +pCDevSettings_GetMonitorName(const WCHAR *pszDisplayDevice) +{ + DISPLAY_DEVICEW dd, dd2; + PWSTR str = NULL; + + dd.cb = sizeof(dd); + if (EnumDisplayDevicesW(pszDisplayDevice, + 0, + &dd, + 0)) + { + dd2.cb = sizeof(dd2); + if (EnumDisplayDevicesW(pszDisplayDevice, + 1, + &dd2, + 0)) + { + /* There's more than one monitor connected... */ + LoadStringW(hApplet, + IDS_MULTIPLEMONITORS, + dd.DeviceString, + sizeof(dd.DeviceString) / sizeof(dd.DeviceString[0])); + } + } + else + { + /* We can't enumerate a monitor, make sure this fact is reported + to the user! */ + LoadStringW(hApplet, + IDS_UNKNOWNMONITOR, + dd.DeviceString, + sizeof(dd.DeviceString) / sizeof(dd.DeviceString[0])); + } + + str = LocalAlloc(LMEM_FIXED, + (wcslen(dd.DeviceString) + 1) * sizeof(WCHAR)); + if (str != NULL) + { + wcscpy(str, + dd.DeviceString); + } + + return str; +} + +static PWSTR +pCDevSettings_GetMonitorDevice(const WCHAR *pszDisplayDevice) +{ + DISPLAY_DEVICEW dd; + PWSTR str = NULL; + + dd.cb = sizeof(dd); + if (EnumDisplayDevicesW(pszDisplayDevice, + 0, + &dd, + 0)) + { + str = LocalAlloc(LMEM_FIXED, + (wcslen(dd.DeviceName) + 1) * sizeof(WCHAR)); + if (str != NULL) + { + wcscpy(str, + dd.DeviceName); + } + } + + return str; +} + +static PWSTR +pCDevSettings_GetDeviceInstanceId(const WCHAR *pszDevice) +{ + /* FIXME: Implement */ + DPRINT1("CDevSettings::GetDeviceInstanceId(%ws) UNIMPLEMENTED!\n", pszDevice); + return NULL; +} + + +static HKEY +pCDevSettings_OpenDeviceKey(PCDevSettings This, + BOOL ReadOnly) +{ + static const WCHAR szRegPrefix[] = L"\\Registry\\Machine\\"; + PWSTR lpRegKey; + REGSAM Access = KEY_READ; + HKEY hKey; + + lpRegKey = This->pDisplayKey; + if (lpRegKey != NULL) + { + if (wcslen(lpRegKey) >= wcslen(szRegPrefix) && + !wcsnicmp(lpRegKey, + szRegPrefix, + wcslen(szRegPrefix))) + { + lpRegKey += wcslen(szRegPrefix); + } + + if (!ReadOnly) + Access |= KEY_WRITE; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + lpRegKey, + 0, + Access, + &hKey) == ERROR_SUCCESS) + { + return hKey; + } + } + + return NULL; +} + +PDEVMODEW DESK_EXT_CALLBACK +CDevSettings_EnumAllModes(PVOID Context, + DWORD Index) +{ + //PCDevSettings This = impl_from_IDataObject((IDataObject *)Context); + /* FIXME: Implement */ + DPRINT1("CDevSettings::EnumAllModes(%u)\n", Index); + return NULL; +} + +PDEVMODEW DESK_EXT_CALLBACK +CDevSettings_GetCurrentMode(PVOID Context) +{ + //PCDevSettings This = impl_from_IDataObject((IDataObject *)Context); + /* FIXME: Implement */ + DPRINT1("CDevSettings::GetCurrentMode\n"); + return NULL; +} + +BOOL DESK_EXT_CALLBACK +CDevSettings_SetCurrentMode(PVOID Context, + const DEVMODEW *pDevMode) +{ + //PCDevSettings This = impl_from_IDataObject((IDataObject *)Context); + /* FIXME: Implement */ + DPRINT1("CDevSettings::SetCurrentMode(0x%p)\n", pDevMode); + return FALSE; +} + +VOID DESK_EXT_CALLBACK +CDevSettings_GetPruningMode(PVOID Context, + PBOOL pbModesPruned, + PBOOL pbKeyIsReadOnly, + PBOOL pbPruningOn) +{ + PCDevSettings This = impl_from_IDataObject((IDataObject *)Context); + + DPRINT1("CDevSettings::GetPruningMode(%p,%p,%p)\n", pbModesPruned, pbKeyIsReadOnly, pbPruningOn); + + *pbModesPruned = This->bModesPruned; + *pbKeyIsReadOnly = This->bKeyIsReadOnly; + *pbPruningOn = This->bPruningOn; +} + +VOID DESK_EXT_CALLBACK +CDevSettings_SetPruningMode(PVOID Context, + BOOL PruningOn) +{ + HKEY hKey; + DWORD dwValue; + PCDevSettings This = impl_from_IDataObject((IDataObject *)Context); + + DPRINT1("CDevSettings::SetPruningMode(%d)\n", PruningOn); + + if (This->bModesPruned && !This->bKeyIsReadOnly && + PruningOn != This->bPruningOn) + { + This->bPruningOn = (PruningOn != FALSE); + + hKey = pCDevSettings_OpenDeviceKey(This, + FALSE); + if (hKey != NULL) + { + dwValue = (DWORD)This->bPruningOn; + + RegSetValueEx(hKey, + TEXT("PruningMode"), + 0, + REG_DWORD, + (const BYTE *)&dwValue, + sizeof(dwValue)); + + RegCloseKey(hKey); + } + } +} + +static VOID +pCDevSettings_ReadHardwareInfo(HKEY hKey, + LPCTSTR lpValueName, + LPWSTR lpBuffer) +{ + DWORD type = REG_BINARY; + DWORD size = 128 * sizeof(WCHAR); + RegQueryValueEx(hKey, + lpValueName, + NULL, + &type, + (PBYTE)lpBuffer, + &size); +} + +static VOID +pCDevSettings_InitializeExtInterface(PCDevSettings This) +{ + PDESK_EXT_INTERFACE Interface = &This->ExtInterface; + HKEY hKeyDev; + + ZeroMemory(Interface, + sizeof(*Interface)); + Interface->cbSize = sizeof(*Interface); + + /* Initialize the callback table */ + Interface->Context = impl_to_interface(This, IDataObject); + Interface->EnumAllModes = CDevSettings_EnumAllModes; + Interface->SetCurrentMode = CDevSettings_SetCurrentMode; + Interface->GetCurrentMode = CDevSettings_GetCurrentMode; + Interface->SetPruningMode = CDevSettings_SetPruningMode; + Interface->GetPruningMode = CDevSettings_GetPruningMode; + + /* Read the HardwareInformation.* values from the registry key */ + hKeyDev = pCDevSettings_OpenDeviceKey(This, + TRUE); + if (hKeyDev != NULL) + { + DWORD dwType, dwMemSize = 0; + DWORD dwSize = sizeof(dwMemSize); + + if (RegQueryValueEx(hKeyDev, + TEXT("HardwareInformation.MemorySize"), + NULL, + &dwType, + (PBYTE)&dwMemSize, + &dwSize) == ERROR_SUCCESS && + (dwType == REG_BINARY || dwType == REG_DWORD) && + dwSize == sizeof(dwMemSize)) + { + dwMemSize /= 1024; + + if (dwMemSize > 1024) + { + dwMemSize /= 1024; + if (dwMemSize > 1024) + { + wsprintf(Interface->MemorySize, + _T("%u GB"), + dwMemSize / 1024); + } + else + { + wsprintf(Interface->MemorySize, + _T("%u MB"), + dwMemSize); + } + } + else + { + wsprintf(Interface->MemorySize, + _T("%u KB"), + dwMemSize); + } + } + + pCDevSettings_ReadHardwareInfo(hKeyDev, + TEXT("HardwareInformation.ChipType"), + Interface->ChipType); + pCDevSettings_ReadHardwareInfo(hKeyDev, + TEXT("HardwareInformation.DacType"), + Interface->DacType); + pCDevSettings_ReadHardwareInfo(hKeyDev, + TEXT("HardwareInformation.AdapterString"), + Interface->AdapterString); + pCDevSettings_ReadHardwareInfo(hKeyDev, + TEXT("HardwareInformation.BiosString"), + Interface->BiosString); + RegCloseKey(hKeyDev); + } +} + +static HRESULT +pCDevSettings_Initialize(PCDevSettings This, + PDISPLAY_DEVICE_ENTRY DisplayDeviceInfo) +{ + HKEY hKey; + + This->Flags = 0; + This->StateFlags = DisplayDeviceInfo->DeviceStateFlags; + DPRINT1("This->StateFlags: %x\n", This->StateFlags); + + /* Register clipboard formats */ + This->cfExtInterface = RegisterClipboardFormat(TEXT("Desk.cpl extension interface")); + This->cfDisplayDevice = RegisterClipboardFormat(TEXT("Display Device")); + This->cfDisplayName = RegisterClipboardFormat(TEXT("Display Name")); + This->cfDisplayId = RegisterClipboardFormat(TEXT("Display ID")); + This->cfDisplayKey = RegisterClipboardFormat(TEXT("Display Key")); + This->cfDisplayStateFlags = RegisterClipboardFormat(TEXT("Display State Flags")); + This->cfMonitorName = RegisterClipboardFormat(TEXT("Monitor Name")); + This->cfMonitorDevice = RegisterClipboardFormat(TEXT("Monitor Device")); + This->cfMonitorId = RegisterClipboardFormat(TEXT("Monitor ID")); + This->cfPruningMode = RegisterClipboardFormat(TEXT("Pruning Mode")); + + /* Copy the device name */ + This->pDisplayDevice = pCDevSettings_AllocAndCopyString(DisplayDeviceInfo->DeviceName); + DPRINT1("This->pDisplayDevice: %ws\n", This->pDisplayDevice); + This->pDisplayName = pCDevSettings_AllocAndCopyString(DisplayDeviceInfo->DeviceDescription); + DPRINT1("This->pDisplayName: %ws\n", This->pDisplayName); + This->pDisplayKey = pCDevSettings_AllocAndCopyString(DisplayDeviceInfo->DeviceKey); + DPRINT1("This->pDisplayKey: %ws\n", This->pDisplayKey); + This->pDisplayId = pCDevSettings_GetDeviceInstanceId(This->pDisplayDevice); + DPRINT1("This->pDisplayId: %ws\n", This->pDisplayId); + This->pMonitorName = pCDevSettings_GetMonitorName(This->pDisplayDevice); + DPRINT1("This->pMonitorName: %ws\n", This->pMonitorName); + This->pMonitorDevice = pCDevSettings_GetMonitorDevice(This->pDisplayDevice); + DPRINT1("This->pMonitorDevice: %ws\n", This->pMonitorDevice); + This->pMonitorId = pCDevSettings_GetDeviceInstanceId( This->pMonitorDevice); + DPRINT1("This->pMonitorId: %ws\n", This->pMonitorId); + + /* Check pruning mode */ + This->bModesPruned = ((DisplayDeviceInfo->DeviceStateFlags & DISPLAY_DEVICE_MODESPRUNED) != 0); + hKey = pCDevSettings_OpenDeviceKey(This, + FALSE); + if (hKey == NULL) + { + hKey = pCDevSettings_OpenDeviceKey(This, + FALSE); + This->bKeyIsReadOnly = TRUE; + } + if (hKey != NULL) + { + DWORD dw = 0; + DWORD dwType, dwSize; + + dwSize = sizeof(dw); + if (RegQueryValueEx(hKey, + TEXT("PruningMode"), + NULL, + &dwType, + (PBYTE)&dw, + &dwSize) == ERROR_SUCCESS) + { + if (dwType == REG_DWORD && dwSize == sizeof(dw)) + This->bPruningOn = (dw != 0); + } + + RegCloseKey(hKey); + } + + /* Initialize the shell extension interface */ + pCDevSettings_InitializeExtInterface(This); + + return S_OK; +} + +static VOID +pCDevSettings_Free(PCDevSettings This) +{ + pCDevSettings_FreeString(&This->pDisplayDevice); + pCDevSettings_FreeString(&This->pDisplayName); + pCDevSettings_FreeString(&This->pDisplayKey); + pCDevSettings_FreeString(&This->pDisplayId); + pCDevSettings_FreeString(&This->pMonitorName); + pCDevSettings_FreeString(&This->pMonitorDevice); + pCDevSettings_FreeString(&This->pMonitorId); +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_QueryInterface(IDataObject* iface, + REFIID riid, + void** ppvObject) +{ + PCDevSettings This = impl_from_IDataObject(iface); + + *ppvObject = NULL; + + if (IsEqualGUID(riid, + &IID_IUnknown) || + IsEqualGUID(riid, + &IID_IDataObject)) + { + *ppvObject = (PVOID)impl_to_interface(This, IDataObject); + return S_OK; + } + else + { + DPRINT1("CDevSettings::QueryInterface: Queried unknown interface\n"); + } + + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE +CDevSettings_AddRef(IDataObject* iface) +{ + PCDevSettings This = impl_from_IDataObject(iface); + return (ULONG)InterlockedIncrement((PLONG)&This->ref); +} + +static ULONG STDMETHODCALLTYPE +CDevSettings_Release(IDataObject* iface) +{ + ULONG refs; + PCDevSettings This = impl_from_IDataObject(iface); + refs = (ULONG)InterlockedDecrement((PLONG)&This->ref); + if (refs == 0) + pCDevSettings_Free(This); + + return refs; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_GetData(IDataObject* iface, + FORMATETC* pformatetcIn, + STGMEDIUM* pmedium) +{ + static const WCHAR szEmpty[] = {0}; + HRESULT hr; + PCWSTR pszRet = NULL; + PWSTR pszBuf; + PCDevSettings This = impl_from_IDataObject(iface); + + ZeroMemory(pmedium, + sizeof(STGMEDIUM)); + + hr = IDataObject_QueryGetData(iface, + pformatetcIn); + if (SUCCEEDED(hr)) + { + /* Return the reqested data back to the shell extension */ + + if (pformatetcIn->cfFormat == This->cfDisplayDevice) + { + pszRet = This->pDisplayDevice; + DPRINT1("CDevSettings::GetData returns display device %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfDisplayName) + { + pszRet = This->pDisplayName; + DPRINT1("CDevSettings::GetData returns display name %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfDisplayKey) + { + pszRet = This->pDisplayKey; + DPRINT1("CDevSettings::GetData returns display key %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfDisplayId) + { + pszRet = This->pDisplayId; + DPRINT1("CDevSettings::GetData returns display id %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfMonitorName) + { + pszRet = This->pMonitorName; + DPRINT1("CDevSettings::GetData returns monitor name %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfMonitorDevice) + { + pszRet = This->pMonitorDevice; + DPRINT1("CDevSettings::GetData returns monitor device %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfMonitorId) + { + pszRet = This->pMonitorId; + DPRINT1("CDevSettings::GetData returns monitor id %ws\n", pszRet); + } + else if (pformatetcIn->cfFormat == This->cfExtInterface) + { + PDESK_EXT_INTERFACE pIface; + + pIface = GlobalAlloc(GPTR, + sizeof(*pIface)); + if (pIface != NULL) + { + CopyMemory(pIface, + &This->ExtInterface, + sizeof(This->ExtInterface)); + + DPRINT1("CDevSettings::GetData returns the desk.cpl extension interface\n"); + + pmedium->tymed = TYMED_HGLOBAL; + pmedium->hGlobal = pIface; + + return S_OK; + } + else + return E_OUTOFMEMORY; + } + else if (pformatetcIn->cfFormat == This->cfDisplayStateFlags) + { + PDWORD pdw; + + pdw = GlobalAlloc(GPTR, + sizeof(*pdw)); + if (pdw != NULL) + { + *pdw = This->StateFlags; + + DPRINT1("CDevSettings::GetData returns the display state flags %x\n", This->StateFlags); + + pmedium->tymed = TYMED_HGLOBAL; + pmedium->hGlobal = pdw; + + return S_OK; + } + else + return E_OUTOFMEMORY; + } + else if (pformatetcIn->cfFormat == This->cfPruningMode) + { + PBYTE pb; + + pb = GlobalAlloc(GPTR, + sizeof(*pb)); + if (pb != NULL) + { + *pb = (This->bModesPruned && This->bPruningOn); + + pmedium->tymed = TYMED_HGLOBAL; + pmedium->hGlobal = pb; + + return S_OK; + } + else + return E_OUTOFMEMORY; + } + + /* NOTE: This only returns null-terminated strings! */ + if (pszRet == NULL) + pszRet = szEmpty; + + pszBuf = GlobalAlloc(GPTR, + (_tcslen(pszRet) + 1) * sizeof(WCHAR)); + if (pszBuf != NULL) + { + _tcscpy(pszBuf, + pszRet); + + pmedium->tymed = TYMED_HGLOBAL; + pmedium->hGlobal = pszBuf; + + hr = S_OK; + } + else + hr = E_OUTOFMEMORY; + } + + return hr; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_GetDataHere(IDataObject* iface, + FORMATETC* pformatetc, + STGMEDIUM* pmedium) +{ + ZeroMemory(pformatetc, + sizeof(*pformatetc)); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_QueryGetData(IDataObject* iface, + FORMATETC* pformatetc) +{ +#if DEBUG + TCHAR szFormatName[255]; +#endif + PCDevSettings This = impl_from_IDataObject(iface); + + if (pformatetc->dwAspect != DVASPECT_CONTENT) + return DV_E_DVASPECT; + + if (pformatetc->lindex != -1) + return DV_E_LINDEX; + + if (!(pformatetc->tymed & TYMED_HGLOBAL)) + return DV_E_TYMED; + + /* Check if the requested data can be provided */ + if (pformatetc->cfFormat == This->cfExtInterface || + pformatetc->cfFormat == This->cfDisplayDevice || + pformatetc->cfFormat == This->cfDisplayName || + pformatetc->cfFormat == This->cfDisplayId || + pformatetc->cfFormat == This->cfDisplayKey || + pformatetc->cfFormat == This->cfDisplayStateFlags || + pformatetc->cfFormat == This->cfMonitorDevice || + pformatetc->cfFormat == This->cfMonitorName || + pformatetc->cfFormat == This->cfMonitorId || + pformatetc->cfFormat == This->cfPruningMode) + { + return S_OK; + } +#if DEBUG + else + { + if (GetClipboardFormatName(pformatetc->cfFormat, + szFormatName, + sizeof(szFormatName) / sizeof(szFormatName[0]))) + { + DPRINT1("CDevSettings::QueryGetData(\"%ws\")\n", szFormatName); + } + else + { + DPRINT1("CDevSettings::QueryGetData(Format %u)\n", (unsigned int)pformatetc->cfFormat); + } + } +#endif + + return DV_E_FORMATETC; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_GetCanonicalFormatEtc(IDataObject* iface, + FORMATETC* pformatectIn, + FORMATETC* pformatetcOut) +{ + HRESULT hr; + + DPRINT1("CDevSettings::GetCanonicalFormatEtc\n"); + + hr = IDataObject_QueryGetData(iface, + pformatectIn); + if (SUCCEEDED(hr)) + { + CopyMemory(pformatetcOut, + pformatectIn, + sizeof(FORMATETC)); + + /* Make sure the data is target device independent */ + if (pformatectIn->ptd == NULL) + hr = DATA_S_SAMEFORMATETC; + else + { + pformatetcOut->ptd = NULL; + hr = S_OK; + } + } + else + { + ZeroMemory(pformatetcOut, + sizeof(FORMATETC)); + } + + return hr; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_SetData(IDataObject* iface, + FORMATETC* pformatetc, + STGMEDIUM* pmedium, + BOOL fRelease) +{ + DPRINT1("CDevSettings::SetData UNIMPLEMENTED\n"); + return E_NOTIMPL; +} + +static __inline VOID +pCDevSettings_FillFormatEtc(FORMATETC *pFormatEtc, + CLIPFORMAT cf) +{ + pFormatEtc->cfFormat = cf; + pFormatEtc->ptd = NULL; + pFormatEtc->dwAspect = DVASPECT_CONTENT; + pFormatEtc->lindex = -1; + pFormatEtc->tymed = TYMED_HGLOBAL; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_EnumFormatEtc(IDataObject* iface, + DWORD dwDirection, + IEnumFORMATETC** ppenumFormatEtc) +{ + HRESULT hr; + FORMATETC fetc[10]; + PCDevSettings This = impl_from_IDataObject(iface); + + *ppenumFormatEtc = NULL; + + if (dwDirection == DATADIR_GET) + { + pCDevSettings_FillFormatEtc(&fetc[0], + This->cfExtInterface); + pCDevSettings_FillFormatEtc(&fetc[1], + This->cfDisplayDevice); + pCDevSettings_FillFormatEtc(&fetc[2], + This->cfDisplayName); + pCDevSettings_FillFormatEtc(&fetc[3], + This->cfDisplayId); + pCDevSettings_FillFormatEtc(&fetc[4], + This->cfDisplayKey); + pCDevSettings_FillFormatEtc(&fetc[5], + This->cfDisplayStateFlags); + pCDevSettings_FillFormatEtc(&fetc[6], + This->cfMonitorName); + pCDevSettings_FillFormatEtc(&fetc[7], + This->cfMonitorDevice); + pCDevSettings_FillFormatEtc(&fetc[8], + This->cfMonitorId); + pCDevSettings_FillFormatEtc(&fetc[9], + This->cfPruningMode); + + hr = SHCreateStdEnumFmtEtc(sizeof(fetc) / sizeof(fetc[0]), + fetc, + ppenumFormatEtc); + } + else + hr = E_NOTIMPL; + + return hr; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_DAdvise(IDataObject* iface, + FORMATETC* pformatetc, + DWORD advf, + IAdviseSink* pAdvSink, + DWORD* pdwConnection) +{ + *pdwConnection = 0; + return OLE_E_ADVISENOTSUPPORTED; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_DUnadvise(IDataObject* iface, + DWORD dwConnection) +{ + return OLE_E_ADVISENOTSUPPORTED; +} + +static HRESULT STDMETHODCALLTYPE +CDevSettings_EnumDAdvise(IDataObject* iface, + IEnumSTATDATA** ppenumAdvise) +{ + *ppenumAdvise = NULL; + return OLE_E_ADVISENOTSUPPORTED; +} + +static const struct IDataObjectVtbl vtblIDataObject = { + CDevSettings_QueryInterface, + CDevSettings_AddRef, + CDevSettings_Release, + CDevSettings_GetData, + CDevSettings_GetDataHere, + CDevSettings_QueryGetData, + CDevSettings_GetCanonicalFormatEtc, + CDevSettings_SetData, + CDevSettings_EnumFormatEtc, + CDevSettings_DAdvise, + CDevSettings_DUnadvise, + CDevSettings_EnumDAdvise, +}; + +IDataObject * +CreateDevSettings(PDISPLAY_DEVICE_ENTRY DisplayDeviceInfo) +{ + PCDevSettings This; + + This = HeapAlloc(GetProcessHeap(), + 0, + sizeof(*This)); + if (This != NULL) + { + This->lpIDataObjectVtbl = &vtblIDataObject; + This->ref = 1; + + if (SUCCEEDED(pCDevSettings_Initialize(This, + DisplayDeviceInfo))) + { + return impl_to_interface(This, IDataObject); + } + + CDevSettings_Release(impl_to_interface(This, IDataObject)); + } + + return NULL; +} Propchange: trunk/reactos/dll/cpl/desk/devsett.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Wed Sep 26 10:20:16 2007 @@ -114,7 +114,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -122,6 +129,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Wed Sep 26 10:20:16 2007 @@ -22,6 +22,7 @@ #define IDD_APPEARANCE 102 #define IDD_SETTINGS 103 #define IDD_ADVAPPEARANCE 104 +#define IDD_ADVANCED_GENERAL 200 /* Background Page */ #define IDC_BACKGROUND_LIST 1000 @@ -145,6 +146,9 @@ #define IDS_ELEMENT_22 3222 #define IDS_ELEMENT_23 3223 +#define IDS_MULTIPLEMONITORS 3300 +#define IDS_UNKNOWNMONITOR 3301 +#define IDS_ADVANCEDTITLEFMT 3302 #endif /* __CPL_DESK_RESOURCE_H__ */ Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Wed Sep 26 10:20:16 2007 @@ -10,37 +10,6 @@ #include "desk.h" -/* As slider control can't contain user data, we have to keep an - * array of RESOLUTION_INFO to have our own associated data. - */ -typedef struct _RESOLUTION_INFO -{ - DWORD dmPelsWidth; - DWORD dmPelsHeight; -} RESOLUTION_INFO, *PRESOLUTION_INFO; - -typedef struct _SETTINGS_ENTRY -{ - struct _SETTINGS_ENTRY *Blink; - struct _SETTINGS_ENTRY *Flink; - DWORD dmBitsPerPel; - DWORD dmPelsWidth; - DWORD dmPelsHeight; -} SETTINGS_ENTRY, *PSETTINGS_ENTRY; - -typedef struct _DISPLAY_DEVICE_ENTRY -{ - struct _DISPLAY_DEVICE_ENTRY *Flink; - LPTSTR DeviceDescription; - LPTSTR DeviceName; - PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ - DWORD SettingsCount; - PRESOLUTION_INFO Resolutions; - DWORD ResolutionsCount; - PSETTINGS_ENTRY CurrentSettings; /* Points into Settings list */ - SETTINGS_ENTRY InitialSettings; -} DISPLAY_DEVICE_ENTRY, *PDISPLAY_DEVICE_ENTRY; - typedef struct _GLOBAL_DATA { PDISPLAY_DEVICE_ENTRY DisplayDeviceList; @@ -76,7 +45,7 @@ } static PSETTINGS_ENTRY -GetPossibleSettings(IN LPTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) +GetPossibleSettings(IN LPCTSTR DeviceName, OUT DWORD* pSettingsCount, OUT PSETTINGS_ENTRY* CurrentSettings) { DEVMODE devmode; DWORD NbSettings = 0; @@ -168,13 +137,14 @@ } static BOOL -AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN LPTSTR Description, IN LPTSTR DeviceName) +AddDisplayDevice(IN PGLOBAL_DATA pGlobalData, IN const DISPLAY_DEVICE *DisplayDevice) { PDISPLAY_DEVICE_ENTRY newEntry = NULL; LPTSTR description = NULL; LPTSTR name = NULL; - DWORD descriptionSize; - DWORD nameSize; + LPTSTR key = NULL; + LPTSTR devid = NULL; + DWORD descriptionSize, nameSize, keySize, devidSize; PSETTINGS_ENTRY Current; DWORD ResolutionsCount = 1; DWORD i; @@ -183,7 +153,7 @@ memset(newEntry, 0, sizeof(DISPLAY_DEVICE_ENTRY)); if (!newEntry) goto ByeBye; - newEntry->Settings = GetPossibleSettings(DeviceName, &newEntry->SettingsCount, &newEntry->CurrentSettings); + newEntry->Settings = GetPossibleSettings(DisplayDevice->DeviceName, &newEntry->SettingsCount, &newEntry->CurrentSettings); if (!newEntry->Settings) goto ByeBye; newEntry->InitialSettings.dmPelsWidth = newEntry->CurrentSettings->dmPelsWidth; @@ -219,18 +189,31 @@ i++; } } - descriptionSize = (_tcslen(Description) + 1) * sizeof(TCHAR); + descriptionSize = (_tcslen(DisplayDevice->DeviceString) + 1) * sizeof(TCHAR); description = HeapAlloc(GetProcessHeap(), 0, descriptionSize); if (!description) goto ByeBye; - nameSize = (_tcslen(DeviceName) + 1) * sizeof(TCHAR); + nameSize = (_tcslen(DisplayDevice->DeviceName) + 1) * sizeof(TCHAR); name = HeapAlloc(GetProcessHeap(), 0, nameSize); if (!name) goto ByeBye; - memcpy(description, Description, descriptionSize); - memcpy(name, DeviceName, nameSize); + keySize = (_tcslen(DisplayDevice->DeviceKey) + 1) * sizeof(TCHAR); + key = HeapAlloc(GetProcessHeap(), 0, keySize); + if (!key) goto ByeBye; + + devidSize = (_tcslen(DisplayDevice->DeviceID) + 1) * sizeof(TCHAR); + devid = HeapAlloc(GetProcessHeap(), 0, devidSize); + if (!devid) goto ByeBye; + + memcpy(description, DisplayDevice->DeviceString, descriptionSize); + memcpy(name, DisplayDevice->DeviceName, nameSize); + memcpy(key, DisplayDevice->DeviceKey, keySize); + memcpy(devid, DisplayDevice->DeviceID, devidSize); newEntry->DeviceDescription = description; newEntry->DeviceName = name; + newEntry->DeviceKey = key; + newEntry->DeviceID = devid; + newEntry->DeviceStateFlags = DisplayDevice->StateFlags; newEntry->Flink = pGlobalData->DisplayDeviceList; pGlobalData->DisplayDeviceList = newEntry; return TRUE; @@ -256,6 +239,10 @@ HeapFree(GetProcessHeap(), 0, description); if (name != NULL) HeapFree(GetProcessHeap(), 0, name); + if (key != NULL) + HeapFree(GetProcessHeap(), 0, key); + if (devid != NULL) + HeapFree(GetProcessHeap(), 0, devid); return FALSE; } @@ -307,11 +294,11 @@ /* Get video cards list */ displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); - while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0)) + while (EnumDisplayDevices(NULL, iDevNum, &displayDevice, 0x1)) { if ((displayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0) { - if (AddDisplayDevice(pGlobalData, displayDevice.DeviceString, displayDevice.DeviceName)) + if (AddDisplayDevice(pGlobalData, &displayDevice)) Result++; } iDevNum++; @@ -518,12 +505,6 @@ /* we shouldn't go there */ } -static VOID -OnAdvancedButton() -{ - MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); -} - /* Property page dialog callback */ INT_PTR CALLBACK SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) @@ -543,7 +524,7 @@ DWORD command = HIWORD(wParam); if (controlId == IDC_SETTINGS_ADVANCED && command == BN_CLICKED) - OnAdvancedButton(); + DisplayAdvancedSettings(hwndDlg, pGlobalData->CurrentDisplayDevice); else if (controlId == IDC_SETTINGS_BPP && command == CBN_SELCHANGE) OnBPPChanged(hwndDlg, pGlobalData); break;

1 0

[weiden] 29209: Add stub for SHCreatePropSheetExtArrayEx, temporarily
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Wed Sep 26 10:14:05 2007 New Revision: 29209 URL: http://svn.reactos.org/svn/reactos?rev=29209&view=rev Log: Add stub for SHCreatePropSheetExtArrayEx, temporarily Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellord.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Wed Sep 26 10:14:05 2007 @@ -153,7 +153,7 @@ 165 stdcall -noname SHCreateDirectory(long ptr) 166 stdcall -noname CallCPLEntry16(long long long long long long) 167 stdcall -noname SHAddFromPropSheetExtArray(long long long) - 168 stdcall -noname SHCreatePropSheetExtArray(long str long) + 168 stdcall -noname SHCreatePropSheetExtArray(long wstr long) 169 stdcall -noname SHDestroyPropSheetExtArray(long) 170 stdcall -noname SHReplaceFromPropSheetExtArray(long long long long) 171 stdcall -noname PathCleanupSpec(ptr ptr) @@ -179,7 +179,7 @@ 191 stdcall -noname SHUpdateImageA(str long long long) 192 stdcall -noname SHUpdateImageW(wstr long long long) 193 stdcall -noname SHHandleUpdateImage(ptr) - 194 stub SHCreatePropSheetExtArrayEx + 194 stdcall -noname SHCreatePropSheetExtArrayEx(long wstr long ptr) 195 stdcall -noname SHFree(ptr) 196 stdcall -noname SHAlloc(long) 197 stub SHGlobalDefect Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c (original) +++ trunk/reactos/dll/win32/shell32/shellord.c Wed Sep 26 10:14:05 2007 @@ -1545,6 +1545,15 @@ } /************************************************************************* + * SHCreatePropSheetExtArrayEx [SHELL32.194] + */ +HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj) +{ + FIXME("(%p,%s,%u,%p)stub\n", hKey, debugstr_w(pszSubKey), max_iface, pDataObj); + return NULL; +} + +/************************************************************************* * SHReplaceFromPropSheetExtArray [SHELL32.170] */ UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam)

1 0

[weiden] 29208: Fix copy&paste typo in comment
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Wed Sep 26 08:33:50 2007 New Revision: 29208 URL: http://svn.reactos.org/svn/reactos?rev=29208&view=rev Log: Fix copy&paste typo in comment Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed Sep 26 08:33:50 2007 @@ -1846,7 +1846,7 @@ if (PropPages[i].uiReplaceWith != 0 && hpsxa != NULL && SHReplaceFromPropSheetExtArray(hpsxa, PropPages[i].uiReplaceWith, PropSheetAddPage, (LPARAM)&psh) != 0) { - /* The shell extension added one or more pages to replace the background page. + /* The shell extension added one or more pages to replace a page. Don't create the built-in page anymore! */ continue; }

1 0

[weiden] 29207: Allow loading shell extensions
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Wed Sep 26 08:30:57 2007 New Revision: 29207 URL: http://svn.reactos.org/svn/reactos?rev=29207&view=rev Log: Allow loading shell extensions Modified: trunk/reactos/dll/cpl/main/keyboard.c trunk/reactos/dll/cpl/main/main.c trunk/reactos/dll/cpl/main/main.h trunk/reactos/dll/cpl/main/main.rbuild trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/keyboard.c?re… ============================================================================== --- trunk/reactos/dll/cpl/main/keyboard.c (original) +++ trunk/reactos/dll/cpl/main/keyboard.c Wed Sep 26 08:30:57 2007 @@ -28,13 +28,14 @@ #include <devguid.h> #include <commctrl.h> #include <prsht.h> +#include <shlobj.h> #include <cpl.h> +#include <regstr.h> #include "main.h" #include "resource.h" #define ID_BLINK_TIMER 345 - typedef struct _SPEED_DATA { @@ -47,7 +48,6 @@ BOOL fShowCursor; RECT rcCursor; } SPEED_DATA, *PSPEED_DATA; - /* Property page dialog callback */ static INT_PTR CALLBACK @@ -296,9 +296,11 @@ LONG APIENTRY KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - PROPSHEETPAGE psp[2]; + HPROPSHEETPAGE hpsp[MAX_CPL_PAGES]; PROPSHEETHEADER psh; + HPSXA hpsxa; TCHAR szCaption[256]; + LONG ret; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); @@ -309,19 +311,31 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_2)); psh.pszCaption = szCaption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; - psh.ppsp = psp; - - InitPropSheetPage(&psp[0], IDD_KEYBSPEED, KeyboardSpeedProc); - InitPropSheetPage(&psp[1], IDD_HARDWARE, KeybHardwareProc); - - return (LONG)(PropertySheet(&psh) != -1); + psh.phpage = hpsp; + + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Keyboard"), MAX_CPL_PAGES - psh.nPages); + + /* NOTE: The speed page (CPLPAGE_KEYBOARD_SPEED) cannot be replaced by + shell extensions since Win2k! */ + InitPropSheetPage(&psh, IDD_KEYBSPEED, KeyboardSpeedProc); + InitPropSheetPage(&psh, IDD_HARDWARE, KeybHardwareProc); + + if (hpsxa != NULL) + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + + ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + SHDestroyPropSheetExtArray(hpsxa); + + return ret; } /* EOF */ Modified: trunk/reactos/dll/cpl/main/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/main/main.c (original) +++ trunk/reactos/dll/cpl/main/main.c Wed Sep 26 08:30:57 2007 @@ -30,6 +30,7 @@ #include <devguid.h> #include <commctrl.h> #include <cpl.h> +#include <cplext.h> #include "main.h" #include "resource.h" @@ -49,15 +50,42 @@ }; -VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +BOOL +InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; + HPROPSHEETPAGE hPage; + PROPSHEETPAGE psp; + + if (ppsh->nPages < MAX_CPL_PAGES) + { + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(idDlg); + psp.pfnDlgProc = DlgProc; + + hPage = CreatePropertySheetPage(&psp); + if (hPage != NULL) + { + return PropSheetAddPage(hPage, (LPARAM)ppsh); + } + } + + return FALSE; +} + +BOOL CALLBACK +PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) +{ + PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; + if (ppsh != NULL && ppsh->nPages < MAX_CPL_PAGES) + { + ppsh->phpage[ppsh->nPages++] = hpage; + return TRUE; + } + + return FALSE; } Modified: trunk/reactos/dll/cpl/main/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.h?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/main/main.h (original) +++ trunk/reactos/dll/cpl/main/main.h Wed Sep 26 08:30:57 2007 @@ -26,6 +26,7 @@ extern HINSTANCE hApplet; +#define MAX_CPL_PAGES 32 /* keyboard.c */ @@ -34,11 +35,11 @@ /* main.c */ -VOID -InitPropSheetPage(PROPSHEETPAGE *psp, - WORD idDlg, - DLGPROC DlgProc); +BOOL +InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc); +BOOL CALLBACK +PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam); /* mouse.c */ Modified: trunk/reactos/dll/cpl/main/main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/main/main.rbuild (original) +++ trunk/reactos/dll/cpl/main/main.rbuild Wed Sep 26 08:30:57 2007 @@ -13,6 +13,7 @@ <library>comctl32</library> <library>devmgr</library> <library>comdlg32</library> + <library>shell32</library> <library>gdi32</library> <library>msvcrt</library> <file>keyboard.c</file> Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed Sep 26 08:30:57 2007 @@ -38,6 +38,9 @@ #include <tchar.h> #include <math.h> #include <limits.h> +#include <shlobj.h> +#include <cplext.h> +#include <regstr.h> #include <stdio.h> @@ -53,7 +56,6 @@ #define MIN_DOUBLE_CLICK_SPEED 200 #define MAX_DOUBLE_CLICK_SPEED 900 #define DEFAULT_WHEEL_SCROLL_LINES 3 - typedef struct _BUTTON_DATA { @@ -1794,13 +1796,29 @@ return FALSE; } +static const struct +{ + WORD idDlg; + DLGPROC DlgProc; + UINT uiReplaceWith; +} PropPages[] = +{ + { IDD_PAGE_BUTTON, ButtonProc, CPLPAGE_MOUSE_BUTTONS }, + { IDD_PAGE_POINTER, PointerProc, 0 }, + { IDD_PAGE_OPTION, OptionProc, CPLPAGE_MOUSE_PTRMOTION }, + { IDD_PAGE_WHEEL, WheelProc, CPLPAGE_MOUSE_WHEEL }, + { IDD_HARDWARE, MouseHardwareProc, 0 }, +}; LONG APIENTRY MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - PROPSHEETPAGE psp[5]; + HPROPSHEETPAGE hpsp[MAX_CPL_PAGES]; PROPSHEETHEADER psh; + HPSXA hpsxa; TCHAR Caption[256]; + UINT i; + LONG ret; UNREFERENCED_PARAMETER(lParam1); UNREFERENCED_PARAMETER(lParam2); @@ -1811,21 +1829,40 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; + psh.dwFlags = PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1)); psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; - psh.ppsp = psp; - - InitPropSheetPage(&psp[0], IDD_PAGE_BUTTON, ButtonProc); - InitPropSheetPage(&psp[1], IDD_PAGE_POINTER, PointerProc); - InitPropSheetPage(&psp[2], IDD_PAGE_OPTION, OptionProc); - InitPropSheetPage(&psp[3], IDD_PAGE_WHEEL, WheelProc); - InitPropSheetPage(&psp[4], IDD_HARDWARE, MouseHardwareProc); - return (LONG)(PropertySheet(&psh) != -1); + psh.phpage = hpsp; + + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Mouse"), MAX_CPL_PAGES - psh.nPages); + + for (i = 0; i != sizeof(PropPages) / sizeof(PropPages[0]); i++) + { + /* Override the background page if requested by a shell extension */ + if (PropPages[i].uiReplaceWith != 0 && hpsxa != NULL && + SHReplaceFromPropSheetExtArray(hpsxa, PropPages[i].uiReplaceWith, PropSheetAddPage, (LPARAM)&psh) != 0) + { + /* The shell extension added one or more pages to replace the background page. + Don't create the built-in page anymore! */ + continue; + } + + InitPropSheetPage(&psh, PropPages[i].idDlg, PropPages[i].DlgProc); + } + + if (hpsxa != NULL) + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + + ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + SHDestroyPropSheetExtArray(hpsxa); + + return ret; } /* EOF */

1 0

[jimtabor] 29206: Fix calling conventions and do not unload setupapi.dll after registering the notification. Thank you Thomas.
by jimtabor＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: jimtabor Date: Wed Sep 26 05:10:51 2007 New Revision: 29206 URL: http://svn.reactos.org/svn/reactos?rev=29206&view=rev Log: Fix calling conventions and do not unload setupapi.dll after registering the notification. Thank you Thomas. Modified: trunk/reactos/dll/win32/user32/misc/resources.c Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c Wed Sep 26 05:10:51 2007 @@ -9,13 +9,16 @@ #define CR_INVALID_DATA 0x0000001F #endif -typedef DWORD (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); -typedef DWORD (*CMP_UNREGNOTIFY) (ULONG ); +typedef DWORD STDCALL (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); +typedef DWORD STDCALL (*CMP_UNREGNOTIFY) (ULONG ); /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which does not seem to work properly for stack address space. */ /* kill `left-hand operand of comma expression has no effect' warning */ #define IsBadWritePtr(lp, n) ((DWORD)lp==n?0:0) + + +static HINSTANCE hSetupApi = NULL; BOOL STDCALL _InternalLoadString ( @@ -253,16 +256,16 @@ DWORD ConfigRet = 0; CMP_REGNOTIFY RegNotify = NULL; HDEVNOTIFY hDevNotify = NULL; - HINSTANCE hSetupApi = LoadLibraryA("SETUPAPI.DLL"); - if (hSetupApi == NULL) return NULL; + if ( hSetupApi == NULL ) hSetupApi = LoadLibraryA("SETUPAPI.DLL"); + if ( hSetupApi == NULL ) return NULL; RegNotify = (CMP_REGNOTIFY) GetProcAddress ( hSetupApi, "CMP_RegisterNotification"); if (RegNotify == NULL) { FreeLibrary ( hSetupApi ); + hSetupApi = NULL; return NULL; } ConfigRet = RegNotify ( hRecipient, NotificationFilter, Flags, (PULONG) &hDevNotify); - FreeLibrary ( hSetupApi ); if (ConfigRet != CR_SUCCESS) { switch (ConfigRet) @@ -295,16 +298,16 @@ { DWORD ConfigRet = 0; CMP_UNREGNOTIFY UnRegNotify = NULL; - HINSTANCE hSetupApi = LoadLibraryA("SETUPAPI.DLL"); - if (hSetupApi == NULL) return FALSE; + if ( hSetupApi == NULL ) hSetupApi = LoadLibraryA("SETUPAPI.DLL"); + if ( hSetupApi == NULL ) return FALSE; UnRegNotify = (CMP_UNREGNOTIFY) GetProcAddress ( hSetupApi, "CMP_UnregisterNotification"); if (UnRegNotify == NULL) { FreeLibrary ( hSetupApi ); + hSetupApi = NULL; return FALSE; } ConfigRet = UnRegNotify ( (ULONG) Handle ); - FreeLibrary ( hSetupApi ); if (ConfigRet != CR_SUCCESS) { switch (ConfigRet)

1 0

[jimtabor] 29205: Testing return as default user32 error ERROR_SERVICE_SPECIFIC_ERROR.
by jimtabor＠svn.reactos.org 25 Sep '07

25 Sep '07

Author: jimtabor Date: Wed Sep 26 03:43:28 2007 New Revision: 29205 URL: http://svn.reactos.org/svn/reactos?rev=29205&view=rev Log: Testing return as default user32 error ERROR_SERVICE_SPECIFIC_ERROR. Modified: trunk/reactos/dll/win32/user32/misc/resources.c Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c Wed Sep 26 03:43:28 2007 @@ -6,7 +6,6 @@ #define CR_SUCCESS 0x00000000 #define CR_OUT_OF_MEMORY 0x00000002 #define CR_INVALID_POINTER 0x00000003 -#define CR_FAILURE 0x00000013 #define CR_INVALID_DATA 0x0000001F #endif @@ -277,7 +276,6 @@ case CR_INVALID_DATA: SetLastError (ERROR_INVALID_DATA); break; - case CR_FAILURE: default: SetLastError (ERROR_SERVICE_SPECIFIC_ERROR); break; @@ -317,7 +315,6 @@ case CR_INVALID_DATA: SetLastError (ERROR_INVALID_DATA); break; - case CR_FAILURE: default: SetLastError (ERROR_SERVICE_SPECIFIC_ERROR); break;

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