Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[tretiakov] 22553: Oops :) forget sizeof(WCHAR)
by tretiakov＠svn.reactos.org 24 Jun '06

24 Jun '06

Author: tretiakov Date: Sat Jun 24 14:37:55 2006 New Revision: 22553 URL: http://svn.reactos.org/svn/reactos?rev=22553&view=rev Log: Oops :) forget sizeof(WCHAR) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Sat Jun 24 14:37:55 2006 @@ -832,7 +832,7 @@ lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class"); lstrcatW(szKeyName, L"\\"); - if(lstrlenW(ClassGuid) < sizeof(szKeyName)-lstrlenW(szKeyName)) + if(lstrlenW(ClassGuid) < sizeof(szKeyName)/sizeof(WCHAR)-lstrlenW(szKeyName)) lstrcatW(szKeyName, ClassGuid); else return CR_INVALID_DATA;

1 0

[ion] 22552: - Hackplement RtlSetUserValueHeap and RtlGetUserInfoHeap, they are needed for being able to build higher-level heap management around the Heap APIs (either for developers or the OS). Case in point, needed for my Global* rewrite in kernel32. The current APIs are utter hacks, but they work (eventually we should get rid of the Wine Windows 95 heap implementation and replace it).
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Sat Jun 24 03:10:58 2006 New Revision: 22552 URL: http://svn.reactos.org/svn/reactos?rev=22552&view=rev Log: - Hackplement RtlSetUserValueHeap and RtlGetUserInfoHeap, they are needed for being able to build higher-level heap management around the Heap APIs (either for developers or the OS). Case in point, needed for my Global* rewrite in kernel32. The current APIs are utter hacks, but they work (eventually we should get rid of the Wine Windows 95 heap implementation and replace it). Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Sat Jun 24 03:10:58 2006 @@ -482,7 +482,7 @@ RtlGetSaclSecurityDescriptor@16 RtlGetSecurityDescriptorRMControl@8 RtlGetSetBootStatusData@24 -;RtlGetUserInfoHeap +RtlGetUserInfoHeap@20 RtlGetVersion@4 RtlHashUnicodeString@16 RtlIdentifierAuthoritySid@4 @@ -638,7 +638,7 @@ RtlSetTimeZoneInformation@4 ;RtlSetUnicodeCallouts ;RtlSetUserFlagsHeap -;RtlSetUserValueHeap +RtlSetUserValueHeap@16 RtlSizeHeap@12 RtlSplay@4 ;RtlStartRXact 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 Sat Jun 24 03:10:58 2006 @@ -496,6 +496,16 @@ HANDLE *HeapArray ); +BOOLEAN +NTAPI +RtlGetUserInfoHeap( + IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + OUT PVOID *UserValue, + OUT PULONG UserFlags +); + NTSYSAPI PVOID NTAPI @@ -515,6 +525,15 @@ BOOLEAN NTAPI RtlUnlockHeap(IN HANDLE Heap); + +BOOLEAN +NTAPI +RtlSetUserValueHeap( + IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + IN PVOID UserValue +); NTSYSAPI ULONG Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=22552&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c (original) +++ trunk/reactos/lib/rtl/heap.c Sat Jun 24 03:10:58 2006 @@ -100,6 +100,7 @@ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ ULONG flags; /* Heap flags */ ULONG magic; /* Magic number */ + PVOID UserValue; PRTL_HEAP_COMMIT_ROUTINE commitRoutine; } HEAP, *PHEAP; @@ -1843,4 +1844,40 @@ return FALSE; } +/* + * @unimplemented + */ +BOOLEAN +NTAPI +RtlSetUserValueHeap(IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + IN PVOID UserValue) +{ + HEAP *heapPtr = HEAP_GetPtr(HeapHandle); + + /* Hack */ + heapPtr->UserValue = UserValue; + return TRUE; +} + +/* + * @unimplemented + */ +BOOLEAN +NTAPI +RtlGetUserInfoHeap(IN PVOID HeapHandle, + IN ULONG Flags, + IN PVOID BaseAddress, + OUT PVOID *UserValue, + OUT PULONG UserFlags) +{ + HEAP *heapPtr = HEAP_GetPtr(HeapHandle); + + /* Hack */ + if (UserValue) *UserValue = heapPtr->UserValue; + if (UserFlags) *UserFlags = heapPtr->flags & HEAP_SETTABLE_USER_FLAGS; + return TRUE; +} + /* EOF */

1 0

[ion] 22551: - Fixes in source code required for the NDK update.
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Sat Jun 24 01:25:11 2006 New Revision: 22551 URL: http://svn.reactos.org/svn/reactos?rev=22551&view=rev Log: - Fixes in source code required for the NDK update. Modified: trunk/reactos/hal/hal/hal.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/winbase.h trunk/reactos/include/winnt.h trunk/reactos/lib/rtl/crc32.c trunk/reactos/lib/rtl/timezone.c trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=22551&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Sat Jun 24 01:25:11 2006 @@ -297,8 +297,8 @@ NTAPI HalGetEnvironmentVariable( PCH Name, - PCH Value, - USHORT ValueLength) + USHORT ValueLength, + PCH Value) { UNIMPLEMENTED; @@ -325,7 +325,7 @@ VOID NTAPI HalHandleNMI( - ULONG Unused) + PVOID NmiData) { UNIMPLEMENTED; } @@ -393,12 +393,13 @@ } -VOID +BOOLEAN NTAPI HalQueryRealTimeClock( PTIME_FIELDS Time) { UNIMPLEMENTED; + return FALSE; } Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=22… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Sat Jun 24 01:25:11 2006 @@ -30,6 +30,7 @@ #include "ntddk.h" +#define _NTIFS_INCLUDED_ #ifdef __cplusplus extern "C" { #endif @@ -2951,13 +2952,6 @@ NTHALAPI VOID NTAPI -HalQueryRealTimeClock ( - IN OUT PTIME_FIELDS TimeFields -); - -NTHALAPI -VOID -NTAPI HalSetRealTimeClock ( IN PTIME_FIELDS TimeFields ); Modified: trunk/reactos/include/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winbase.h?rev=2255… ============================================================================== --- trunk/reactos/include/winbase.h (original) +++ trunk/reactos/include/winbase.h Sat Jun 24 01:25:11 2006 @@ -925,6 +925,8 @@ DWORDLONG ullAvailExtendedVirtual; } MEMORYSTATUSEX, *LPMEMORYSTATUSEX; #endif +#ifndef _LDT_ENTRY_DEFINED +#define _LDT_ENTRY_DEFINED typedef struct _LDT_ENTRY { WORD LimitLow; WORD BaseLow; @@ -949,6 +951,7 @@ } Bits; } HighWord; } LDT_ENTRY,*PLDT_ENTRY,*LPLDT_ENTRY; +#endif typedef struct _PROCESS_HEAP_ENTRY { PVOID lpData; DWORD cbData; Modified: trunk/reactos/include/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winnt.h?rev=22551&… ============================================================================== --- trunk/reactos/include/winnt.h (original) +++ trunk/reactos/include/winnt.h Sat Jun 24 01:25:11 2006 @@ -906,7 +906,7 @@ #define HEAP_TAIL_CHECKING_ENABLED 32 #define HEAP_FREE_CHECKING_ENABLED 64 #define HEAP_DISABLE_COALESCE_ON_FREE 128 -#define HEAP_CREATE_ALIGN_16 0x0000 +#define HEAP_CREATE_ALIGN_16 0x10000 #define HEAP_CREATE_ENABLE_TRACING 0x20000 #define HEAP_MAXIMUM_TAG 0xFFF #define HEAP_PSEUDO_TAG_FLAG 0x8000 Modified: trunk/reactos/lib/rtl/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/crc32.c?rev=22551&… ============================================================================== --- trunk/reactos/lib/rtl/crc32.c (original) +++ trunk/reactos/lib/rtl/crc32.c Sat Jun 24 01:25:11 2006 @@ -85,7 +85,7 @@ * @implemented */ ULONG NTAPI -RtlComputeCrc32 (IN UINT Initial, +RtlComputeCrc32 (IN USHORT Initial, IN PUCHAR Data, IN ULONG Length) { Modified: trunk/reactos/lib/rtl/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timezone.c?rev=225… ============================================================================== --- trunk/reactos/lib/rtl/timezone.c (original) +++ trunk/reactos/lib/rtl/timezone.c Sat Jun 24 01:25:11 2006 @@ -19,7 +19,7 @@ * @implemented */ NTSTATUS NTAPI -RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) +RtlQueryTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation) { RTL_QUERY_REGISTRY_TABLE QueryTable[8]; UNICODE_STRING StandardName; @@ -83,7 +83,7 @@ * @implemented */ NTSTATUS NTAPI -RtlSetTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation) +RtlSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation) { ULONG Length; NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Sat Jun 24 01:25:11 2006 @@ -196,7 +196,7 @@ /* * Get the environment variable */ - Result = HalGetEnvironmentVariable(AName.Buffer, Value, ValueBufferLength); + Result = HalGetEnvironmentVariable(AName.Buffer, ValueBufferLength, Value); if(!Result) { RtlFreeAnsiString(&AName);

1 0

[ion] 22550: - Update the NDK to the current vendor import.
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Sat Jun 24 01:21:45 2006 New Revision: 22550 URL: http://svn.reactos.org/svn/reactos?rev=22550&view=rev Log: - Update the NDK to the current vendor import. Removed: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/extypes.h trunk/reactos/include/ndk/halfuncs.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/ndk/ntndk.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h (original) +++ trunk/reactos/include/ndk/exfuncs.h Sat Jun 24 01:21:45 2006 @@ -340,8 +340,8 @@ NtQuerySystemInformation( IN SYSTEM_INFORMATION_CLASS SystemInformationClass, OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); NTSYSCALLAPI @@ -481,7 +481,7 @@ NtSetSystemInformation( IN SYSTEM_INFORMATION_CLASS SystemInformationClass, IN PVOID SystemInformation, - IN ULONG SystemInformationLength + IN SIZE_T SystemInformationLength ); NTSYSCALLAPI @@ -784,8 +784,8 @@ ZwQuerySystemInformation( IN SYSTEM_INFORMATION_CLASS SystemInformationClass, OUT PVOID SystemInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); NTSYSAPI @@ -908,7 +908,7 @@ ZwSetSystemInformation( IN SYSTEM_INFORMATION_CLASS SystemInformationClass, IN PVOID SystemInformation, - IN ULONG SystemInformationLength + IN SIZE_T SystemInformationLength ); #ifdef NTOS_MODE_USER Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Sat Jun 24 01:21:45 2006 @@ -1199,7 +1199,7 @@ } SYSTEM_LEGACY_DRIVER_INFORMATION, *PSYSTEM_LEGACY_DRIVER_INFORMATION; // Class 44 -typedef struct _TIME_ZONE_INFORMATION RTL_TIME_ZONE_INFORMATION; +//typedef struct _TIME_ZONE_INFORMATION RTL_TIME_ZONE_INFORMATION; // Class 45 typedef struct _SYSTEM_LOOKASIDE_INFORMATION Removed: trunk/reactos/include/ndk/fixmes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/fixmes.txt?rev… ============================================================================== (empty) Modified: trunk/reactos/include/ndk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/halfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/halfuncs.h (original) +++ trunk/reactos/include/ndk/halfuncs.h Sat Jun 24 01:21:45 2006 @@ -31,8 +31,8 @@ // The DDK steals these away from you. // #ifdef _MSC_VER -#pragma intrinsic(_enable) -#pragma intrinsic(_disable) +//#pragma intrinsic(_enable) +//#pragma intrinsic(_disable) #endif // @@ -129,9 +129,9 @@ BOOLEAN NTAPI HalGetEnvironmentVariable( - PCH Name, - PCH Value, - USHORT ValueLength + PCH Variable, + USHORT Length, + PCH Buffer ); NTHALAPI @@ -159,7 +159,7 @@ VOID NTAPI HalHandleNMI( - ULONG Unknown + PVOID NmiInfo ); // @@ -192,7 +192,7 @@ // Time Functions // NTHALAPI -VOID +BOOLEAN NTAPI HalQueryRealTimeClock( IN PTIME_FIELDS RtcTime Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sat Jun 24 01:21:45 2006 @@ -22,6 +22,13 @@ // // Dependencies // + +// +// Machine Types +// +#define MACHINE_TYPE_ISA 0x0000 +#define MACHINE_TYPE_EISA 0x0001 +#define MACHINE_TYPE_MCA 0x0002 // // X86 80386 Segment Types @@ -38,16 +45,16 @@ // #define RPL_MASK 0x0003 #define MODE_MASK 0x0001 -#define KGDT_R0_CODE (0x8) -#define KGDT_R0_DATA (0x10) -#define KGDT_R3_CODE (0x18) -#define KGDT_R3_DATA (0x20) -#define KGDT_TSS (0x28) -#define KGDT_R0_PCR (0x30) -#define KGDT_R3_TEB (0x38) -#define KGDT_LDT (0x48) -#define KGDT_DF_TSS (0x50) -#define KGDT_NMI_TSS (0x58) +#define KGDT_R0_CODE 0x8 +#define KGDT_R0_DATA 0x10 +#define KGDT_R3_CODE 0x18 +#define KGDT_R3_DATA 0x20 +#define KGDT_TSS 0x28 +#define KGDT_R0_PCR 0x30 +#define KGDT_R3_TEB 0x38 +#define KGDT_LDT 0x48 +#define KGDT_DF_TSS 0x50 +#define KGDT_NMI_TSS 0x58 // // CR4 @@ -66,9 +73,12 @@ // // EFlags // -#define EFLAGS_TF 0x100 -#define EFLAGS_INTERRUPT_MASK 0x200 -#define EFLAGS_NESTED_TASK 0x4000 +#define EFLAGS_CF 0x01L +#define EFLAGS_ZF 0x40L +#define EFLAGS_TF 0x100L +#define EFLAGS_INTERRUPT_MASK 0x200L +#define EFLAGS_DF 0x400L +#define EFLAGS_NESTED_TASK 0x4000L #define EFLAGS_V86_MASK 0x20000 #define EFLAGS_ALIGN_CHECK 0x40000 #define EFLAGS_VIF 0x80000 @@ -76,7 +86,6 @@ #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 -#ifndef NTOS_MODE_USER // // IPI Types // @@ -87,48 +96,17 @@ #define IPI_SYNCH_REQUEST 16 // -// FN/FX (FPU) Save Area Structures -// -typedef struct _FNSAVE_FORMAT -{ - ULONG ControlWord; - ULONG StatusWord; - ULONG TagWord; - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - UCHAR RegisterArea[80]; -} FNSAVE_FORMAT, *PFNSAVE_FORMAT; - -typedef struct _FXSAVE_FORMAT -{ - USHORT ControlWord; - USHORT StatusWord; - USHORT TagWord; - USHORT ErrorOpcode; - ULONG ErrorOffset; - ULONG ErrorSelector; - ULONG DataOffset; - ULONG DataSelector; - ULONG MXCsr; - ULONG MXCsrMask; - UCHAR RegisterArea[128]; - UCHAR Reserved3[128]; - UCHAR Reserved4[224]; - UCHAR Align16Byte[8]; -} FXSAVE_FORMAT, *PFXSAVE_FORMAT; - -typedef struct _FX_SAVE_AREA -{ - union - { - FNSAVE_FORMAT FnArea; - FXSAVE_FORMAT FxArea; - } U; - ULONG NpxSavedCpu; - ULONG Cr0NpxState; -} FX_SAVE_AREA, *PFX_SAVE_AREA; +// Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) +// +#define KSEG0_BASE 0x80000000 + +// +// Macro to get current KPRCB +// +#ifndef _REACTOS_ // fixme +#define KeGetCurrentPrcb() \ + (PKPRCB)__readfsdword(KPCR_PRCB); +#endif // // Trap Frame Definition @@ -154,7 +132,7 @@ ULONG Ecx; ULONG Eax; ULONG PreviousPreviousMode; - struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList; + struct _EXCEPTION_REGISTRATION_RECORD FAR *ExceptionList; ULONG SegFs; ULONG Edi; ULONG Esi; @@ -175,6 +153,8 @@ // // LDT Entry Definition // +#ifndef _LDT_ENTRY_DEFINED +#define _LDT_ENTRY_DEFINED typedef struct _LDT_ENTRY { USHORT LimitLow; @@ -203,6 +183,7 @@ } Bits; } HighWord; } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY; +#endif // // GDT Entry Definition @@ -266,12 +247,60 @@ USHORT ExtendedOffset; } KIDTENTRY, *PKIDTENTRY; +#include <pshpack2.h> typedef struct _DESCRIPTOR { - USHORT Pad; USHORT Limit; ULONG Base; + USHORT Padding; } KDESCRIPTOR, *PKDESCRIPTOR; +#include <poppack.h> + +#ifndef NTOS_MODE_USER + +// +// FN/FX (FPU) Save Area Structures +// +typedef struct _FNSAVE_FORMAT +{ + ULONG ControlWord; + ULONG StatusWord; + ULONG TagWord; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + UCHAR RegisterArea[80]; +} FNSAVE_FORMAT, *PFNSAVE_FORMAT; + +typedef struct _FXSAVE_FORMAT +{ + USHORT ControlWord; + USHORT StatusWord; + USHORT TagWord; + USHORT ErrorOpcode; + ULONG ErrorOffset; + ULONG ErrorSelector; + ULONG DataOffset; + ULONG DataSelector; + ULONG MXCsr; + ULONG MXCsrMask; + UCHAR RegisterArea[128]; + UCHAR Reserved3[128]; + UCHAR Reserved4[224]; + UCHAR Align16Byte[8]; +} FXSAVE_FORMAT, *PFXSAVE_FORMAT; + +typedef struct _FX_SAVE_AREA +{ + union + { + FNSAVE_FORMAT FnArea; + FXSAVE_FORMAT FxArea; + } U; + ULONG NpxSavedCpu; + ULONG Cr0NpxState; +} FX_SAVE_AREA, *PFX_SAVE_AREA; // // Special Registers Structure (outside of CONTEXT) @@ -329,6 +358,7 @@ ULONG CFlushSize; UCHAR PrcbPad0[88]; #else + ULONG CFlushSize; UCHAR PrcbPad0[92]; #endif KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h Sat Jun 24 01:21:45 2006 @@ -28,6 +28,24 @@ // #define PAGE_SIZE 0x1000 #define PAGE_SHIFT 12L +#define MM_ALLOCATION_GRANULARITY 0x10000 +#define MM_ALLOCATION_GRANULARITY_SHIFT 16L + +// +// Sanity checks for Paging Macros +// +#ifndef __GNUC__ +C_ASSERT(PAGE_SIZE == (1 << PAGE_SHIFT)); +C_ASSERT(MM_ALLOCATION_GRANULARITY == (1 << MM_ALLOCATION_GRANULARITY_SHIFT)); +C_ASSERT(MM_ALLOCATION_GRANULARITY && + !(MM_ALLOCATION_GRANULARITY & (MM_ALLOCATION_GRANULARITY - 1))); +C_ASSERT(MM_ALLOCATION_GRANULARITY >= PAGE_SIZE); +#endif + +// +// PAE SEG0 Base? +// +#define KSEG0_BASE_PAE 0xE0000000 // // Page Table Entry Definitions Modified: trunk/reactos/include/ndk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmfuncs.h (original) +++ trunk/reactos/include/ndk/mmfuncs.h Sat Jun 24 01:21:45 2006 @@ -180,8 +180,8 @@ IN HANDLE SectionHandle, IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); NTSYSCALLAPI @@ -192,8 +192,8 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); NTSYSCALLAPI @@ -350,8 +350,8 @@ IN HANDLE SectionHandle, IN SECTION_INFORMATION_CLASS SectionInformationClass, OUT PVOID SectionInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); NTSYSAPI @@ -362,8 +362,8 @@ IN PVOID Address, IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength + IN SIZE_T Length, + OUT PSIZE_T ResultLength ); NTSYSAPI 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 Sat Jun 24 01:21:45 2006 @@ -31,6 +31,11 @@ #define PAGE_ROUND_DOWN(x) (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) #define PAGE_ROUND_UP(x) \ ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#ifdef NTOS_MODE_USER +#define ROUND_TO_PAGES(Size) (((ULONG_PTR)(Size) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) +#endif +#define ROUND_TO_ALLOCATION_GRANULARITY(Size) (((ULONG_PTR)(Size) + MM_ALLOCATION_GRANULARITY - 1) \ + & ~(MM_ALLOCATION_GRANULARITY - 1)) // // Macro for generating pool tags @@ -578,6 +583,24 @@ ULONG Type; } MEMORY_BASIC_INFORMATION,*PMEMORY_BASIC_INFORMATION; + +// +// Mm Global Variables +// + +// +// Default heap size values. For user mode, these values are copied to a new +// process's PEB by the kernel in MmCreatePeb. In kernel mode, RtlCreateHeap +// reads these variables directly. +// +// These variables should be considered "const"; they are written only once, +// during MmInitSystem. +// +extern SIZE_T MmHeapSegmentReserve; +extern SIZE_T MmHeapSegmentCommit; +extern SIZE_T MmHeapDeCommitTotalFreeThreshold; +extern SIZE_T MmHeapDeCommitFreeBlockThreshold; + #endif // !NTOS_MODE_USER #endif // _MMTYPES_H Modified: trunk/reactos/include/ndk/ntndk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ntndk.h?rev=22… ============================================================================== --- trunk/reactos/include/ndk/ntndk.h (original) +++ trunk/reactos/include/ndk/ntndk.h Sat Jun 24 01:21:45 2006 @@ -34,6 +34,8 @@ // // Headers needed for NDK // +#include <stdio.h> // C Standard Header +#include <excpt.h> // C Standard Header #include <stdarg.h> // C Standard Header #include <umtypes.h> // General Definitions 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 Sat Jun 24 01:21:45 2006 @@ -66,6 +66,19 @@ NTAPI PsGetThreadWin32Thread( PETHREAD Thread +); + +BOOLEAN +NTAPI +PsGetThreadHardErrorsAreDisabled( + PETHREAD Thread +); + +VOID +NTAPI +PsSetThreadHardErrorsAreDisabled( + PETHREAD Thread, + IN BOOLEAN Disabled ); VOID 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 Sat Jun 24 01:21:45 2006 @@ -213,6 +213,11 @@ #endif // +// This macro does nothing in kernel mode +// +#define RTL_PAGED_CODE NOP_FUNCTION + +// // RTL Splay Tree Functions // NTSYSAPI @@ -301,6 +306,16 @@ } #endif +#ifdef NTOS_KERNEL_RUNTIME + +// +// Executing RTL functions at DISPATCH_LEVEL or higher will result in a +// bugcheck. +// +#define RTL_PAGED_CODE PAGED_CODE + +#endif + // // Error and Exception Functions // @@ -442,6 +457,18 @@ ); NTSYSAPI +PVOID +NTAPI +RtlDebugCreateHeap( + IN ULONG Flags, + IN PVOID BaseAddress OPTIONAL, + IN SIZE_T SizeToReserve OPTIONAL, + IN SIZE_T SizeToCommit OPTIONAL, + IN PVOID Lock OPTIONAL, + IN PRTL_HEAP_PARAMETERS Parameters OPTIONAL +); + +NTSYSAPI HANDLE NTAPI RtlDestroyHeap(HANDLE hheap); @@ -456,6 +483,12 @@ ); NTSYSAPI +ULONG +NTAPI +RtlGetNtGlobalFlags( + VOID +); + ULONG NTAPI RtlGetProcessHeaps( @@ -2677,7 +2710,7 @@ ULONG NTAPI RtlComputeCrc32( - IN UINT PartialCrc, + IN USHORT PartialCrc, IN PUCHAR Buffer, IN ULONG Length ); @@ -2737,11 +2770,10 @@ // // Time Functions // -struct _RTL_TIME_ZONE_INFORMATION; -NTSYSAPI -NTSTATUS -NTAPI -RtlQueryTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation); +NTSYSAPI +NTSTATUS +NTAPI +RtlQueryTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); NTSYSAPI VOID @@ -2754,7 +2786,7 @@ NTSYSAPI NTSTATUS NTAPI -RtlSetTimeZoneInformation(LPTIME_ZONE_INFORMATION TimeZoneInformation); +RtlSetTimeZoneInformation(PRTL_TIME_ZONE_INFORMATION TimeZoneInformation); NTSYSAPI BOOLEAN @@ -2802,6 +2834,25 @@ NTAPI RtlGetNtProductType(OUT PNT_PRODUCT_TYPE ProductType); +// +// Secure Memory Functions +// +#ifdef NTOS_MODE_USER +NTSYSAPI +NTSTATUS +NTAPI +RtlRegisterSecureMemoryCacheCallback( + IN PRTL_SECURE_MEMORY_CACHE_CALLBACK Callback); + +NTSYSAPI +BOOLEAN +NTAPI +RtlFlushSecureMemoryCache( + IN PVOID MemoryCache, + IN OPTIONAL SIZE_T MemoryLength +); +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Sat Jun 24 01:21:45 2006 @@ -74,8 +74,30 @@ 0x1 // -// Heap Flags -// +// Public Heap Flags +// +#if !defined(NTOS_MODE_USER) && !defined(_NTIFS_) +#define HEAP_NO_SERIALIZE 0x00000001 +#define HEAP_GROWABLE 0x00000002 +#define HEAP_GENERATE_EXCEPTIONS 0x00000004 +#define HEAP_ZERO_MEMORY 0x00000008 +#define HEAP_REALLOC_IN_PLACE_ONLY 0x00000010 +#define HEAP_TAIL_CHECKING_ENABLED 0x00000020 +#define HEAP_FREE_CHECKING_ENABLED 0x00000040 +#define HEAP_DISABLE_COALESCE_ON_FREE 0x00000080 +#define HEAP_CREATE_ALIGN_16 0x00010000 +#define HEAP_CREATE_ENABLE_TRACING 0x00020000 +#define HEAP_CREATE_ENABLE_EXECUTE 0x00040000 +#endif + +// +// User-Defined Heap Flags and Classes +// +#define HEAP_SETTABLE_USER_VALUE 0x00000100 +#define HEAP_SETTABLE_USER_FLAG1 0x00000200 +#define HEAP_SETTABLE_USER_FLAG2 0x00000400 +#define HEAP_SETTABLE_USER_FLAG3 0x00000800 +#define HEAP_SETTABLE_USER_FLAGS 0x00000E00 #define HEAP_CLASS_0 0x00000000 #define HEAP_CLASS_1 0x00001000 #define HEAP_CLASS_2 0x00002000 @@ -86,6 +108,39 @@ #define HEAP_CLASS_7 0x00007000 #define HEAP_CLASS_8 0x00008000 #define HEAP_CLASS_MASK 0x0000F000 + +// +// Internal HEAP Structure Flags +// +#define HEAP_FLAG_PAGE_ALLOCS 0x01000000 +#define HEAP_PROTECTION_ENABLED 0x02000000 +#define HEAP_BREAK_WHEN_OUT_OF_VM 0x04000000 +#define HEAP_NO_ALIGNMENT 0x08000000 +#define HEAP_CAPTURE_STACK_BACKTRACES 0x08000000 +#define HEAP_SKIP_VALIDATION_CHECKS 0x10000000 +#define HEAP_VALIDATE_ALL_ENABLED 0x20000000 +#define HEAP_VALIDATE_PARAMETERS_ENABLED 0x40000000 +#define HEAP_LOCK_USER_ALLOCATED 0x80000000 + +// +// Heap Validation Flags +// +#define HEAP_CREATE_VALID_MASK \ + (HEAP_NO_SERIALIZE | \ + HEAP_GROWABLE | \ + HEAP_GENERATE_EXCEPTIONS | \ + HEAP_ZERO_MEMORY | \ + HEAP_REALLOC_IN_PLACE_ONLY | \ + HEAP_TAIL_CHECKING_ENABLED | \ + HEAP_FREE_CHECKING_ENABLED | \ + HEAP_DISABLE_COALESCE_ON_FREE | \ + HEAP_CLASS_MASK | \ + HEAP_CREATE_ALIGN_16 | \ + HEAP_CREATE_ENABLE_TRACING | \ + HEAP_CREATE_ENABLE_EXECUTE) +#ifndef __GNUC__ +C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); +#endif // // Registry Keys @@ -462,6 +517,17 @@ ); // +// RTL Secure Memory callbacks +// +#ifdef NTOS_MODE_USER +typedef NTSTATUS +(NTAPI *PRTL_SECURE_MEMORY_CACHE_CALLBACK)( + IN PVOID Address, + IN SIZE_T Length +); +#endif + +// // RTL Range List callbacks // #ifdef NTOS_MODE_USER @@ -497,6 +563,7 @@ // // Parameters for RtlCreateHeap +// FIXME: Determine whether Length is SIZE_T or ULONG // typedef struct _RTL_HEAP_PARAMETERS { @@ -1064,8 +1131,7 @@ PRTL_ATOM_TABLE_ENTRY Buckets[1]; } RTL_ATOM_TABLE, *PRTL_ATOM_TABLE; -#ifndef NTOS_MODE_USER - +#ifndef _WINBASE_ // // System Time and Timezone Structures // @@ -1091,8 +1157,12 @@ SYSTEMTIME DaylightDate; LONG DaylightBias; } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; - -#endif +#endif + +// +// Native version of Timezone Structure +// +typedef LPTIME_ZONE_INFORMATION PRTL_TIME_ZONE_INFORMATION; // // Hotpatch Header Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umtypes.h (original) +++ trunk/reactos/include/ndk/umtypes.h Sat Jun 24 01:21:45 2006 @@ -19,15 +19,34 @@ #if !defined(_NTDEF_) && !defined(_NTDEF_H) #define _NTDEF_ #define _NTDEF_H -#undef WIN32_NO_STATUS + +// +// NDK Applications must use Unicode +// +#ifndef UNICODE +#define UNICODE +#endif + +// +// Don't use the SDK status values +// +#ifndef WIN32_NO_STATUS +#define WIN32_NO_STATUS +#endif + +// +// Let the NDK know we're in Application Mode +// #define NTOS_MODE_USER // // Dependencies // +#include <windef.h> +#undef WIN32_NO_STATUS +#include <ntstatus.h> #include <winioctl.h> #include <ntnls.h> -#include <ntstatus.h> // // Compiler Definitions

1 0

[cwittich] 22549: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 01:19:01 2006 New Revision: 22549 URL: http://svn.reactos.org/svn/reactos?rev=22549&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/sysdm/advanced.c trunk/reactos/dll/cpl/sysdm/environment.c trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/hardware.c trunk/reactos/dll/cpl/sysdm/sysdm.c trunk/reactos/dll/cpl/sysdm/userprofile.c trunk/reactos/dll/cpl/sysdm/virtmem.c trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c Sat Jun 24 01:19:01 2006 @@ -40,6 +40,7 @@ WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: @@ -52,14 +53,14 @@ DialogBox(hApplet, MAKEINTRESOURCE(IDD_VIRTMEM), hwndDlg, - VirtMemDlgProc); + (DLGPROC) VirtMemDlgProc); break; case IDC_ENVVAR: DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), hwndDlg, - EnvironmentDlgProc); + (DLGPROC) EnvironmentDlgProc); break; } break; Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sat Jun 24 01:19:01 2006 @@ -326,7 +326,7 @@ if (!DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - EditVariableDlgProc, + (DLGPROC) EditVariableDlgProc, (LPARAM)VarData) > 0) { if (VarData->lpName != NULL) @@ -378,7 +378,7 @@ if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - EditVariableDlgProc, + (DLGPROC) EditVariableDlgProc, (LPARAM)VarData) > 0) { ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Sat Jun 24 01:19:01 2006 @@ -98,6 +98,9 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardware.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardware.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardware.c Sat Jun 24 01:19:01 2006 @@ -39,11 +39,11 @@ PDEVMGREXEC DevMgrExec; BOOL Ret; - if(!(hDll = LoadLibrary(_TEXT("devmgr.dll")))) - { + hDll = LoadLibrary(_TEXT("devmgr.dll")); + if(!hDll) return FALSE; - } - if(!(DevMgrExec = (PDEVMGREXEC)GetProcAddress(hDll, "DeviceManager_ExecuteW"))) + DevMgrExec = (PDEVMGREXEC)GetProcAddress(hDll, "DeviceManager_ExecuteW"); + if(!DevMgrExec) { FreeLibrary(hDll); return FALSE; @@ -63,6 +63,7 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Sat Jun 24 01:19:01 2006 @@ -64,6 +64,7 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -111,11 +112,11 @@ psh.ppsp = psp; psh.pfnCallback = NULL; /* PropSheetProc; */ - InitPropSheetPage(&psp[0], IDD_PROPPAGEGENERAL, GeneralPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGECOMPUTER, ComputerPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEHARDWARE, HardwarePageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEUSERPROFILE, UserProfilePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEADVANCED, AdvancedPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGECOMPUTER, (DLGPROC) ComputerPageProc); + InitPropSheetPage(&psp[2], IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); + InitPropSheetPage(&psp[3], IDD_PROPPAGEUSERPROFILE, (DLGPROC) UserProfilePageProc); + InitPropSheetPage(&psp[4], IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -129,7 +130,8 @@ LPARAM lParam2) { int i = (int)lParam1; - + UNREFERENCED_PARAMETER(hwndCPl) + switch(uMsg) { case CPL_INIT: @@ -165,6 +167,7 @@ DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c Sat Jun 24 01:19:01 2006 @@ -39,6 +39,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sat Jun 24 01:19:01 2006 @@ -14,6 +14,7 @@ WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandti… ============================================================================== --- trunk/reactos/dll/cpl/timedate/dateandtime.c (original) +++ trunk/reactos/dll/cpl/timedate/dateandtime.c Sat Jun 24 01:19:01 2006 @@ -309,9 +309,9 @@ { ChangeMonthCalDate(GetDlgItem(hwndDlg, IDC_MONTHCALENDAR), - -1, + (WORD) -1, GetCBSelectedMonth((HWND)lParam), - -1); + (WORD) -1); } } break; @@ -341,14 +341,14 @@ { short wYear; LPNMUPDOWN updown = (LPNMUPDOWN) lpnm; - wYear = SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); + wYear = (short) SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); ChangeMonthCalDate(GetDlgItem(hwndDlg, IDC_MONTHCALENDAR), - -1, - -1, - wYear + updown->iDelta); + (WORD) -1, + (WORD) -1, + (WORD) (wYear + updown->iDelta)); } break; } Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Sat Jun 24 01:19:01 2006 @@ -84,9 +84,9 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc); - InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc); - InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, InetTimePageProc); + InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, (DLGPROC) DateTimePageProc); + InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, (DLGPROC) TimeZonePageProc); + InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, (DLGPROC) InetTimePageProc); Ret = (LONG)(PropertySheet(&psh) != -1); Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c Sat Jun 24 01:19:01 2006 @@ -279,7 +279,7 @@ DWORD dwIndex; DWORD i; - dwIndex = SendMessage(hwnd, + dwIndex = (DWORD) SendMessage(hwnd, CB_GETCURSEL, 0, 0);

1 0

[fireball] 22548: Andrey Korotaev: Fix errors and typos in Russian translation, change Wine-specific parts to ReactOS.
by fireball＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: fireball Date: Sat Jun 24 01:12:32 2006 New Revision: 22548 URL: http://svn.reactos.org/svn/reactos?rev=22548&view=rev Log: Andrey Korotaev: Fix errors and typos in Russian translation, change Wine-specific parts to ReactOS. Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_Ru.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_Ru.rc Sat Jun 24 01:12:32 2006 @@ -21,8 +21,8 @@ MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Áîëüøèå Èêîíêè", FCIDM_SHVIEW_BIGICON - MENUITEM "&Ìåëêèå Èêîíêè", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Áîëüøèå çíà÷êè", FCIDM_SHVIEW_BIGICON + MENUITEM "&Ìåëêèå çíà÷êè", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ñïèñîê", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ïîäðîáíî", FCIDM_SHVIEW_REPORTVIEW END @@ -36,13 +36,13 @@ BEGIN POPUP "&Ïðîñìîòð" BEGIN - MENUITEM "&Áîëüøèå Èêîíêè", FCIDM_SHVIEW_BIGICON - MENUITEM "&Ìåëêèå Èêîíêè", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Áîëüøèå çíà÷êè", FCIDM_SHVIEW_BIGICON + MENUITEM "&Ìåëêèå çíà÷êè", FCIDM_SHVIEW_SMALLICON MENUITEM "&Ñïèñîê", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Ïîäðîáíî", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "Âûñòðîèòü &çíà÷êè" BEGIN MENUITEM "Ïî &Èìåíè", 0x30 /* column 0 */ MENUITEM "Ïî &Òèïó", 0x32 /* column 2 */ @@ -51,12 +51,12 @@ MENUITEM SEPARATOR MENUITEM "&Àâòîìàòè÷åñêè", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Â&ûðîâíÿòü èêîíêè", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Â&ûðîâíÿòü çíà÷êè", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Î&áíîâèòü", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "&Âñòàâèòü", FCIDM_SHVIEW_INSERT - MENUITEM "Âñòàâèòü &ÿðêëûê", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Âñòàâèòü &ÿðëûê", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Ñîçäàòü" BEGIN @@ -82,8 +82,8 @@ MENUITEM "&Âûðåçàòü", FCIDM_SHVIEW_CUT MENUITEM "&Êîïèðîâàòü", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Ñîçäàòü &ßîëûê", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Óäàëìòü", FCIDM_SHVIEW_DELETE + MENUITEM "Ñîçäàòü &ÿðëûê", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Óäàëèòü", FCIDM_SHVIEW_DELETE MENUITEM "Ïåðåè&ìåíîâàòü", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "Ñâî&éñòâà", FCIDM_SHVIEW_PROPERTIES @@ -152,27 +152,27 @@ IDS_MYCOMPUTER "Ìîé êîìïüþòåð" /* context menus */ - IDS_VIEW_LARGE "&Áîëüøèå Èêîíêè" - IDS_VIEW_SMALL "&Ìåëêèå Èêîíêè" + IDS_VIEW_LARGE "&Áîëüøèå çíà÷êè" + IDS_VIEW_SMALL "&Ìåëêèå çíà÷êè" IDS_VIEW_LIST "&Ñïèñîê" IDS_VIEW_DETAILS "&Ïîäðîáíî" IDS_SELECT "&Âûáðàòü" IDS_OPEN "&Îòêðûòü" - IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." + IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - îòêàçàíî â äîñòóïå" IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" IDS_DELETEITEM_CAPTION "Ïîäòâåðæäåíèå óäàëåíèÿ ôàéëà" IDS_DELETEFOLDER_CAPTION "Ïîäòâåðæäåíèå óäàëåíèÿ ïàïêè" IDS_DELETEITEM_TEXT "Óäàëèòü '%1'?" - IDS_DELETEMULTIPLE_TEXT "Óäàëèòü ýòè îáüåêòû (%1?" + IDS_DELETEMULTIPLE_TEXT "Óäàëèòü ýòè îáüåêòû %1?" IDS_OVERWRITEFILE_TEXT "Çàìåíèòü ôàéë(û) %1?" IDS_OVERWRITEFILE_CAPTION "Ïîäòâåðæäåíèå çàìåíû ôàéëà" /* message box strings */ IDS_RESTART_TITLE "Ïåðåçàãðóçèòü" - IDS_RESTART_PROMPT "Âû õîòèòå ñèìóëèðîâàòü ïåðåçàïóñê Windows?" + IDS_RESTART_PROMPT "Âû äåéñòâèòåëüíî õîòèòå ïåðåçàãðóçèòü ReactOS?" IDS_SHUTDOWN_TITLE "Âûêëþ÷èòü ïèòàíèå" - IDS_SHUTDOWN_PROMPT "Âû õîòèòå çàêèí÷èòü ðàáîòó ñ Wine?" + IDS_SHUTDOWN_PROMPT "Âû äåéñòâèòåëüíî õîòèòå çàêîí÷èòü ðàáîòó ñ ReactOS?" /* shell folder path default values */ IDS_PROGRAMS "Ãëàâíîå ìåíþ\\Ïðîãðàììû" @@ -180,7 +180,7 @@ IDS_FAVORITES "Èçáðàííîå" IDS_STARTUP "Ãëàâíîå ìåíþ\\Ïðîãðàììû\\Àâòîçàãðóçêà" IDS_RECENT "Recent" - IDS_SENDTO "Îòïðââèòü" + IDS_SENDTO "Îòïðàâèòü" IDS_STARTMENU "Ãëàâíîå ìåíþ" IDS_MYMUSIC "Ìîè äîêóìåíòû\\Ìîÿ ìóçûêà" IDS_MYVIDEO "Ìîè äîêóìåíòû\\Ìîè ôèëüìû"

1 0

[cwittich] 22547: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 00:49:21 2006 New Revision: 22547 URL: http://svn.reactos.org/svn/reactos?rev=22547&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c trunk/reactos/base/applications/msconfig/systempage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Sat Jun 24 00:49:21 2006 @@ -15,6 +15,9 @@ INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + switch (message) { case WM_INITDIALOG: hFreeLdrDialog = hDlg; Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.c (original) +++ trunk/reactos/base/applications/msconfig/generalpage.c Sat Jun 24 00:49:21 2006 @@ -15,6 +15,9 @@ INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + switch (message) { case WM_INITDIALOG: hGeneralDialog = hDlg; Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Sat Jun 24 00:49:21 2006 @@ -21,12 +21,12 @@ TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); @@ -192,13 +192,17 @@ INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(hPrevInstance) + UNREFERENCED_PARAMETER(lpCmdLine) + UNREFERENCED_PARAMETER(nCmdShow) + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; InitCommonControlsEx(&InitControls); hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc); return 0; } Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c Sat Jun 24 00:49:21 2006 @@ -21,6 +21,9 @@ LV_COLUMN column; TCHAR szTemp[256]; DWORD dwStyle; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Sat Jun 24 00:49:21 2006 @@ -21,6 +21,9 @@ LV_COLUMN column; TCHAR szTemp[256]; DWORD dwStyle; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/systempage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.c (original) +++ trunk/reactos/base/applications/msconfig/systempage.c Sat Jun 24 00:49:21 2006 @@ -14,6 +14,8 @@ INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch (message) { case WM_INITDIALOG: hSystemDialog = hDlg;

1 0

[cwittich] 22546: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 00:08:52 2006 New Revision: 22546 URL: http://svn.reactos.org/svn/reactos?rev=22546&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Sat Jun 24 00:08:52 2006 @@ -52,6 +52,7 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -99,11 +100,11 @@ psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, DisplayPageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, MousePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, GeneralPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC) KeyboardPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC) SoundPageProc); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC) DisplayPageProc); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC) MousePageProc); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -117,7 +118,8 @@ LPARAM lParam2) { int i = (int)lParam1; - + UNREFERENCED_PARAMETER(hwndCPl) + switch(uMsg) { case CPL_INIT: @@ -153,6 +155,7 @@ DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Sat Jun 24 00:08:52 2006 @@ -22,6 +22,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Sat Jun 24 00:08:52 2006 @@ -195,6 +195,7 @@ static INT_PTR CALLBACK InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: @@ -234,6 +235,9 @@ static INT_PTR CALLBACK RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case WM_INITDIALOG: @@ -279,8 +283,8 @@ psh.ppsp = psp; psh.pfnCallback = NULL; - InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, InstallPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, RosPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEINSTALL, (DLGPROC) InstallPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGEROSSETUP, (DLGPROC) RosPageProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -292,6 +296,8 @@ { CPLINFO *CPlInfo; DWORD i; + + UNREFERENCED_PARAMETER(hwndCPl) i = (DWORD)lParam1; switch(uMsg) @@ -322,6 +328,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Sat Jun 24 00:08:52 2006 @@ -52,6 +52,10 @@ DWORD Reboot; BOOL ret; LONG rc; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(uMsg) hNewDev = LoadLibrary(_T("newdev.dll")); if (!hNewDev) @@ -136,6 +140,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH:

1 0

[cwittich] 22545: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Sat Jun 24 00:01:20 2006 New Revision: 22545 URL: http://svn.reactos.org/svn/reactos?rev=22545&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Sat Jun 24 00:01:20 2006 @@ -15,6 +15,10 @@ WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(hwndDlg) + switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sat Jun 24 00:01:20 2006 @@ -302,6 +302,8 @@ BOOL CheckListBoxFilename(HWND list, TCHAR *filename) { + UNREFERENCED_PARAMETER(filename) + UNREFERENCED_PARAMETER(list) return FALSE; } @@ -571,7 +573,7 @@ { if(command == CBN_SELCHANGE) { - g_placementSelection = SendMessage(g_hPlacementCombo, CB_GETCURSEL, 0, 0); + g_placementSelection = (int)SendMessage(g_hPlacementCombo, CB_GETCURSEL, 0, 0); InvalidateRect(g_hBackgroundPreview, NULL, TRUE); Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=22… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Sat Jun 24 00:01:20 2006 @@ -49,6 +49,11 @@ PROPSHEETHEADER psh; TCHAR Caption[1024]; + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(hwnd) + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); @@ -62,10 +67,10 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_BACKGROUND, BackgroundPageProc); - InitPropSheetPage(&psp[1], IDD_SCREENSAVER, ScreenSaverPageProc); - InitPropSheetPage(&psp[2], IDD_APPEARANCE, AppearancePageProc); - InitPropSheetPage(&psp[3], IDD_SETTINGS, SettingsPageProc); + 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); return (LONG)(PropertySheet(&psh) != -1); } 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 Sat Jun 24 00:01:20 2006 @@ -69,7 +69,7 @@ } } if (LoadString(hApplet, (2900 + CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) - SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, -1, (LPARAM)Buffer); + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); } static PSETTINGS_ENTRY

1 0

[greatlrd] 22544: norwigen translation from lars_martin4 at hotmail.com, please use LANG_NORWEGIAN, SUBLANG_NEUTRAL when u doing a translation. bug 1607
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 23:55:19 2006 New Revision: 22544 URL: http://svn.reactos.org/svn/reactos?rev=22544&view=rev Log: norwigen translation from lars_martin4 at hotmail.com, please use LANG_NORWEGIAN, SUBLANG_NEUTRAL when u doing a translation. bug 1607 Added: trunk/reactos/base/applications/msconfig/No.rc (with props) Modified: trunk/reactos/base/applications/msconfig/msconfig.rc Added: trunk/reactos/base/applications/msconfig/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/No.rc (added) +++ trunk/reactos/base/applications/msconfig/No.rc Fri Jun 23 23:55:19 2006 @@ -1,0 +1,156 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE 0, 0, 378, 220 +STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "System configuration program" +FONT 8, "Tahoma" +BEGIN + CONTROL "kategori1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Hjelp", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Bruk", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "liste3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Aktivere alt",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deaktivere alt",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "Liste2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Kjør", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "Liste1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Aktivere alt",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deaktivere alt",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Oppstarts utvalg", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "&Normal oppstart - laste inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "&Last inn System tjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "", IDC_LIST_BOX, "Listeboks", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Sjekk alle oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/&SIKKEROPPSTART", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 + CHECKBOX "/&OPPSTARTLOGG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Tidsavbrudd:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "sek.", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFIL", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Avbryt", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "System konfigurasjon program" + IDS_TAB_GENERAL "Generelt" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Tjenester" + IDS_TAB_STARTUP "Oppstart" + IDS_TAB_TOOLS "Verktøy" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Tjeneste" + IDS_SERVICES_COLUMN_REQ "Viktig" + IDS_SERVICES_COLUMN_VENDOR "Produsent" + IDS_SERVICES_COLUMN_STATUS "Status" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Navn" + IDS_TOOLS_COLUMN_DESCR "Beskrivelse" + + IDS_TOOLS_CMD_NAME "ledertekst" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Versjon" + IDS_TOOLS_INFO_DESCR "Vis versjon informasjon." + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Register-Editor" + IDS_TOOLS_REGEDIT_DESCR "Åpne Register-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "System egenskaper" + IDS_TOOLS_SYSDM_DESCR "Vis informasjon om denne datamaskinen." + IDS_TOOLS_SYSDM_CMD "kontroll" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "kommando" + IDS_STARTUP_COLUMN_PATH "Plassering" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Kjører" + IDS_SERVICES_STATUS_STOPPED "Stoppet" + IDS_SERVICES_YES "Ja" + IDS_SERVICES_UNKNOWN "Ukjent" +END + Propchange: trunk/reactos/base/applications/msconfig/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rc (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rc Fri Jun 23 23:55:19 2006 @@ -18,4 +18,5 @@ #include "Fr.rc" #include "Hu.rc" #include "Nl.rc" +#include "No.rc"

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
60
Older →

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 June 2006