Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 27978: Make sure LONG/ULONG is correctly defined for both cmlib and mkhive
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sun Jul 29 01:33:23 2007 New Revision: 27978 URL: http://svn.reactos.org/svn/reactos?rev=27978&view=rev Log: Make sure LONG/ULONG is correctly defined for both cmlib and mkhive Modified: trunk/reactos/include/psdk/basetyps.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h (original) +++ trunk/reactos/include/psdk/basetyps.h Sun Jul 29 01:33:23 2007 @@ -77,7 +77,11 @@ #include <guiddef.h> #ifndef _ERROR_STATUS_T_DEFINED +#if defined(__NO_LLP64__) +typedef unsigned int error_status_t; +#else typedef unsigned long error_status_t; +#endif #define _ERROR_STATUS_T_DEFINED #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sun Jul 29 01:33:23 2007 @@ -102,8 +102,13 @@ typedef short SHORT; #ifndef LONG_DEFINED #define LONG_DEFINED +#if defined(__NO_LLP64__) + typedef int LONG; + typedef unsigned int ULONG,*PULONG; +#else typedef long LONG; typedef unsigned long ULONG,*PULONG; +#endif #endif//LONG_DEFINED typedef char CCHAR, *PCCHAR; typedef unsigned char UCHAR,*PUCHAR; @@ -3844,9 +3849,10 @@ ULONG MaxIdleState; ULONG CurrentIdleState; } PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION; -#endif typedef DWORD EXECUTION_STATE; +#endif + typedef enum _POWER_INFORMATION_LEVEL { SystemPowerPolicyAc, SystemPowerPolicyDc, Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=27… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Sun Jul 29 01:33:23 2007 @@ -33,7 +33,7 @@ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ -D_X86_ -D__i386__ -D_REACTOS_ -D_NTOSKRNL_ -D_NTSYSTEM_ \ -DCMLIB_HOST -D_M_IX86 -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude/psdk -Iinclude/ddk -Iinclude/crt \ - -D__NO_CTYPE_INLINES + -D__NO_CTYPE_INLINES -D__NO_LLP64__ $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.rbuild (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild Sun Jul 29 01:33:23 2007 @@ -4,6 +4,7 @@ <define name="_NTOSKRNL_" /> <define name="_NTSYSTEM_" /> <define name="NASSERT" /> + <define name="__NO_LLP64__" /> <pch>cmlib.h</pch> <library>rtl</library> <file>cminit.c</file> Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Sun Jul 29 01:33:23 2007 @@ -31,7 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -D_NTOSKRNL_ -D_NTSYSTEM_ \ + -D_NTOSKRNL_ -D_NTSYSTEM_ -D__NO_LLP64__ \ -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

1 0

[weiden] 27977: Some more function prototype fixes and pointer type warning fixes
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sun Jul 29 01:30:16 2007 New Revision: 27977 URL: http://svn.reactos.org/svn/reactos?rev=27977&view=rev Log: Some more function prototype fixes and pointer type warning fixes Modified: trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/include/ndk/mmfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/env.c trunk/reactos/lib/rtl/error.c trunk/reactos/lib/rtl/handle.c trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/path.c trunk/reactos/lib/rtl/ppb.c trunk/reactos/lib/rtl/process.c trunk/reactos/lib/rtl/sid.c trunk/reactos/lib/rtl/thread.c trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c Sun Jul 29 01:30:16 2007 @@ -1991,7 +1991,7 @@ NTSTATUS Status; PLDR_DATA_TABLE_ENTRY tmpModule; HANDLE SectionHandle; - ULONG ViewSize; + SIZE_T ViewSize; PVOID ImageBase; PIMAGE_NT_HEADERS NtHeaders; BOOLEAN MappedAsDataFile; @@ -2963,7 +2963,7 @@ FILE_STANDARD_INFORMATION FileInfo; IO_STATUS_BLOCK IoStatusBlock; HANDLE SectionHandle; - ULONG ViewSize; + SIZE_T ViewSize; PVOID BaseAddress; BOOLEAN Result; NTSTATUS Status; Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Sun Jul 29 01:30:16 2007 @@ -2240,7 +2240,7 @@ DWORD NameLength; DWORD ClassLength = 0; DWORD BufferSize; - DWORD ResultSize; + ULONG ResultSize; HANDLE KeyHandle; NTSTATUS Status; @@ -2541,7 +2541,7 @@ { HANDLE KeyHandle; NTSTATUS status; - DWORD total_size; + ULONG total_size; char buffer[256], *buf_ptr = buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); @@ -2587,7 +2587,7 @@ if (is_string(info->Type)) { - DWORD len; + ULONG len; RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), total_size - info->DataOffset ); if (data && len) @@ -2612,7 +2612,7 @@ if (value && !status) { - DWORD len; + ULONG len; RtlUnicodeToMultiByteSize( &len, info->Name, info->NameLength ); if (len >= *val_count) @@ -2668,7 +2668,7 @@ { HANDLE KeyHandle; NTSTATUS status; - DWORD total_size; + ULONG total_size; char buffer[256], *buf_ptr = buffer; KEY_VALUE_FULL_INFORMATION *info = (KEY_VALUE_FULL_INFORMATION *)buffer; static const int info_size = FIELD_OFFSET( KEY_VALUE_FULL_INFORMATION, Name ); 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 Sun Jul 29 01:30:16 2007 @@ -261,8 +261,8 @@ IN HANDLE ProcessHandle, IN PVOID BaseAddress, OUT PVOID Buffer, - IN ULONG NumberOfBytesToRead, - OUT PULONG NumberOfBytesRead + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead ); NTSTATUS @@ -270,7 +270,7 @@ NtResetWriteWatch( IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG RegionSize + IN SIZE_T RegionSize ); NTSYSCALLAPI @@ -279,8 +279,8 @@ NtUnlockVirtualMemory( IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToUnlock, - OUT PULONG NumberOfBytesUnlocked OPTIONAL + IN SIZE_T NumberOfBytesToUnlock, + OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL ); NTSYSCALLAPI @@ -369,8 +369,8 @@ ZwLockVirtualMemory( HANDLE ProcessHandle, PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked + SIZE_T NumberOfBytesToLock, + PSIZE_T NumberOfBytesLocked ); NTSYSAPI @@ -439,8 +439,8 @@ IN HANDLE ProcessHandle, IN PVOID BaseAddress, OUT PVOID Buffer, - IN ULONG NumberOfBytesToRead, - OUT PULONG NumberOfBytesRead + IN SIZE_T NumberOfBytesToRead, + OUT PSIZE_T NumberOfBytesRead ); NTSYSAPI @@ -449,8 +449,8 @@ ZwUnlockVirtualMemory( IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG NumberOfBytesToUnlock, - OUT PULONG NumberOfBytesUnlocked OPTIONAL + IN SIZE_T NumberOfBytesToUnlock, + OUT PSIZE_T NumberOfBytesUnlocked OPTIONAL ); NTSYSAPI 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 Sun Jul 29 01:30:16 2007 @@ -576,7 +576,7 @@ HANDLE Heap, ULONG Flags, PVOID Ptr, - ULONG Size + SIZE_T Size ); NTSYSAPI Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=27… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c Sun Jul 29 01:30:16 2007 @@ -54,8 +54,8 @@ if (NULL != Buf) { Status = NtFreeVirtualMemory( NtCurrentProcess(), - (PVOID)&Buf, - &Buf->ViewSize, + (PVOID)&Buf, + (PSIZE_T)&Buf->ViewSize, /* FIXME: not portable! */ MEM_RELEASE); } if (!NT_SUCCESS(Status)) Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=27977&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c (original) +++ trunk/reactos/lib/rtl/debug.c Sun Jul 29 01:30:16 2007 @@ -313,7 +313,7 @@ NTAPI DbgLoadImageSymbols(IN PANSI_STRING Name, IN PVOID Base, - IN ULONG ProcessId) + IN ULONG_PTR ProcessId) { PIMAGE_NT_HEADERS NtHeader; KD_SYMBOLS_INFO SymbolInfo; Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=27977&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c (original) +++ trunk/reactos/lib/rtl/env.c Sun Jul 29 01:30:16 2007 @@ -25,7 +25,7 @@ MEMORY_BASIC_INFORMATION MemInfo; PVOID EnvPtr = NULL; NTSTATUS Status = STATUS_SUCCESS; - ULONG RegionSize = PAGE_SIZE; + SIZE_T RegionSize = PAGE_SIZE; if (Inherit == TRUE) { @@ -96,7 +96,7 @@ VOID NTAPI RtlDestroyEnvironment(PWSTR Environment) { - ULONG Size = 0; + SIZE_T Size = 0; NtFreeVirtualMemory(NtCurrentProcess(), (PVOID)&Environment, @@ -275,7 +275,7 @@ int hole_len, new_len, env_len = 0; WCHAR *new_env = 0, *env_end = 0, *wcs, *env, *val = 0, *tail = 0, *hole = 0; PWSTR head = NULL; - ULONG size = 0, new_size; + SIZE_T size = 0, new_size; LONG f = 1; NTSTATUS Status = STATUS_SUCCESS; Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=27977&… ============================================================================== --- trunk/reactos/lib/rtl/error.c (original) +++ trunk/reactos/lib/rtl/error.c Sun Jul 29 01:30:16 2007 @@ -932,7 +932,7 @@ * * @implemented */ -DWORD NTAPI +ULONG NTAPI RtlNtStatusToDosError(IN NTSTATUS Status) { PTEB Teb = NtCurrentTeb (); Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=27977… ============================================================================== --- trunk/reactos/lib/rtl/handle.c (original) +++ trunk/reactos/lib/rtl/handle.c Sun Jul 29 01:30:16 2007 @@ -35,7 +35,7 @@ RtlDestroyHandleTable(PRTL_HANDLE_TABLE HandleTable) { PVOID ArrayPointer; - ULONG ArraySize; + SIZE_T ArraySize; /* free handle array */ if (HandleTable->CommittedHandles) @@ -61,7 +61,7 @@ NTSTATUS Status; PRTL_HANDLE_TABLE_ENTRY retval; PVOID ArrayPointer; - ULONG ArraySize; + SIZE_T ArraySize; pp_new = &HandleTable->FreeHandles; Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=27977&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c (original) +++ trunk/reactos/lib/rtl/nls.c Sun Jul 29 01:30:16 2007 @@ -809,6 +809,8 @@ WCHAR UpcaseChar; ULONG Size = 0; ULONG i; + + ASSERT(NlsUnicodeToOemTable != NULL); if (NlsMbOemCodePageTag == FALSE) { Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=27977&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c (original) +++ trunk/reactos/lib/rtl/path.c Sun Jul 29 01:30:16 2007 @@ -611,15 +611,15 @@ * * @implemented */ -DWORD NTAPI RtlGetFullPathName_U( +ULONG NTAPI RtlGetFullPathName_U( const WCHAR* name, ULONG size, WCHAR* buffer, WCHAR** file_part) { WCHAR* ptr; - DWORD dosdev; - DWORD reqsize; + ULONG dosdev; + ULONG reqsize; DPRINT("RtlGetFullPathName_U(%S %lu %p %p)\n", name, size, buffer, file_part); Modified: trunk/reactos/lib/rtl/ppb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/ppb.c?rev=27977&r1… ============================================================================== --- trunk/reactos/lib/rtl/ppb.c (original) +++ trunk/reactos/lib/rtl/ppb.c Sun Jul 29 01:30:16 2007 @@ -55,7 +55,7 @@ { NTSTATUS Status = STATUS_SUCCESS; PRTL_USER_PROCESS_PARAMETERS Param = NULL; - ULONG RegionSize = 0; + SIZE_T RegionSize = 0; ULONG Length = 0; PWCHAR Dest; UNICODE_STRING EmptyString; @@ -222,7 +222,7 @@ NTSTATUS NTAPI RtlDestroyProcessParameters(PRTL_USER_PROCESS_PARAMETERS ProcessParameters) { - ULONG RegionSize = 0; + SIZE_T RegionSize = 0; return ZwFreeVirtualMemory (NtCurrentProcess (), (PVOID)ProcessParameters, Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=2797… ============================================================================== --- trunk/reactos/lib/rtl/process.c (original) +++ trunk/reactos/lib/rtl/process.c Sun Jul 29 01:30:16 2007 @@ -72,8 +72,8 @@ { NTSTATUS Status; PVOID BaseAddress = NULL; - ULONG EnviroSize; - ULONG Size; + SIZE_T EnviroSize; + SIZE_T Size; PWCHAR Environment = 0; DPRINT("RtlpInitEnvironment (hProcess: %p, Peb: %p Params: %p)\n", ProcessHandle, Peb, ProcessParameters); Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=27977&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c (original) +++ trunk/reactos/lib/rtl/sid.c Sun Jul 29 01:30:16 2007 @@ -80,7 +80,7 @@ PAGED_CODE_RTL(); - return &Sid->SubAuthority[SubAuthority]; + return (PULONG)&Sid->SubAuthority[SubAuthority]; } Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=27977… ============================================================================== --- trunk/reactos/lib/rtl/thread.c (original) +++ trunk/reactos/lib/rtl/thread.c Sun Jul 29 01:30:16 2007 @@ -133,7 +133,7 @@ RtlpFreeUserStack(IN HANDLE Process, IN PINITIAL_TEB InitialTeb) { - ULONG Dummy = 0; + SIZE_T Dummy = 0; NTSTATUS Status; /* Free the Stack */ @@ -242,7 +242,7 @@ { NTSTATUS Status; THREAD_BASIC_INFORMATION ThreadBasicInfo; - ULONG Dummy, Size = 0; + SIZE_T Dummy, Size = 0; PVOID StackLocation; /* Query the Basic Info */ Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=2… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c (original) +++ trunk/reactos/lib/rtl/timerqueue.c Sun Jul 29 01:30:16 2007 @@ -32,11 +32,11 @@ NTAPI RtlCreateTimer(HANDLE TimerQueue, PHANDLE phNewTimer, - WAITORTIMERCALLBACKFUNC Callback, - PVOID Parameter, - DWORD DueTime, - DWORD Period, - ULONG Flags) + WAITORTIMERCALLBACKFUNC Callback, + PVOID Parameter, + ULONG DueTime, + ULONG Period, + ULONG Flags) { DPRINT1("RtlCreateTimer: stub\n"); return STATUS_NOT_IMPLEMENTED;

1 0

[cwittich] 27976: fix compilation of usetup
by cwittich＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: cwittich Date: Sun Jul 29 00:32:16 2007 New Revision: 27976 URL: http://svn.reactos.org/svn/reactos?rev=27976&view=rev Log: fix compilation of usetup Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/progress.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sun Jul 29 00:32:16 2007 @@ -1543,7 +1543,7 @@ coPos, &Written); - sprintf (Buffer, "MB (max. %u MB)", MaxSize); + sprintf (Buffer, "MB (max. %lu MB)", MaxSize); coPos.X = iLeft + PARTITION_SIZE_INPUT_FIELD_LENGTH + 1; coPos.Y = iTop; WriteConsoleOutputCharacterA (StdOutput, @@ -1552,7 +1552,7 @@ coPos, &Written); - sprintf(Buffer, "%u", MaxSize); + sprintf(Buffer, "%lu", MaxSize); Index = strlen(Buffer); DrawInputField (PARTITION_SIZE_INPUT_FIELD_LENGTH, iLeft, @@ -2465,7 +2465,7 @@ { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); sprintf(Buffer, "Setup failed to verify the selected partition.\n" - "(Status 0x%08x).\n", Status); + "(Status 0x%08lx).\n", Status); PopupError(Buffer, "ENTER = Reboot computer", Ir, POPUP_WAIT_ENTER); Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sun Jul 29 00:32:16 2007 @@ -1271,7 +1271,7 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6lu %s Harddisk %u (Port=%hu, Bus=%hu, Id=%hu) on %S", + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, @@ -1283,7 +1283,7 @@ else { sprintf (LineBuffer, - "%6lu %s Harddisk %u (Port=%hu, Bus=%hu, Id=%hu)", + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c (original) +++ trunk/reactos/base/setup/usetup/progress.c Sun Jul 29 00:32:16 2007 @@ -180,7 +180,7 @@ PROGRESSBAR BarBorder = *Bar; /* Print percentage */ - sprintf(TextBuffer, "%-3u%%", Bar->Percent); + sprintf(TextBuffer, "%-3lu%%", Bar->Percent); coPos.X = Bar->Left + (Bar->Width - 2) / 2; coPos.Y = Bar->Top; @@ -310,7 +310,7 @@ { Bar->Percent = NewPercent; - sprintf(TextBuffer, "%-3u%%", Bar->Percent); + sprintf(TextBuffer, "%-3lu%%", Bar->Percent); coPos.X = Bar->Left + (Bar->Width - 2) / 2; coPos.Y = Bar->Top; @@ -385,7 +385,7 @@ { Bar->Percent = NewPercent; - sprintf(TextBuffer, "%-3u%%", Bar->Percent); + sprintf(TextBuffer, "%-3lu%%", Bar->Percent); coPos.X = Bar->Left + (Bar->Width - 2) / 2; coPos.Y = Bar->Top;

1 0

[cwittich] 27975: fix no confirmation before format See issue #2498 for more details.
by cwittich＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: cwittich Date: Sun Jul 29 00:12:31 2007 New Revision: 27975 URL: http://svn.reactos.org/svn/reactos?rev=27975&view=rev Log: fix no confirmation before format See issue #2498 for more details. Modified: trunk/reactos/base/system/format/format.c trunk/reactos/base/system/format/lang/de-DE.rc Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c (original) +++ trunk/reactos/base/system/format/format.c Sun Jul 29 00:12:31 2007 @@ -420,17 +420,15 @@ } } + LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + _tprintf(szMsg, RootDirectory[0] ); + + LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + while( 1 ) { - - LoadString( GetModuleHandle(NULL), STRING_YN_FORMAT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _tprintf(szMsg, RootDirectory[0] ); - - LoadString( GetModuleHandle(NULL), STRING_YES_NO_FAQ, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - - if(_strnicmp(&input[0],&szMsg[0],1)) break; - - if(_strnicmp(&input[0],&szMsg[1],1) ) { - + _fgetts( input, sizeof(input)/2, stdin ); + if(_strnicmp(&input[0],&szMsg[0],1) == 0) break; + if(_strnicmp(&input[0],&szMsg[1],1) == 0) { _tprintf(_T("\n")); return 0; } Modified: trunk/reactos/base/system/format/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de… ============================================================================== --- trunk/reactos/base/system/format/lang/de-DE.rc (original) +++ trunk/reactos/base/system/format/lang/de-DE.rc Sun Jul 29 00:12:31 2007 @@ -54,7 +54,7 @@ STRING_YN_FORMAT "\nACHTUNG, beim Formatieren werden ALLE Daten auf dem Datenträger %C: gelöscht!\nMit Formatierung fortfahren? (Ja/Nein)? " -STRING_YES_NO_FAQ "J/N" +STRING_YES_NO_FAQ "JN" STRING_VERIFYING "Prüfen"

1 0

[weiden] 27974: Don't redefine HRESULT if already defined
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sun Jul 29 00:09:00 2007 New Revision: 27974 URL: http://svn.reactos.org/svn/reactos?rev=27974&view=rev Log: Don't redefine HRESULT if already defined Modified: trunk/reactos/include/dxsdk/ddraw.h Modified: trunk/reactos/include/dxsdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ddraw.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/ddraw.h (original) +++ trunk/reactos/include/dxsdk/ddraw.h Sun Jul 29 00:09:00 2007 @@ -38,7 +38,10 @@ #endif #if defined(WINNT) || !defined(WIN32) +#ifndef _HRESULT_DEFINED +#define _HRESULT_DEFINED typedef long HRESULT; +#endif #endif #ifdef __cplusplus

1 0

[ekohl] 27973: Check the menu items in the view submenu according to the selected type of view.
by ekohl＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: ekohl Date: Sun Jul 29 00:03:06 2007 New Revision: 27973 URL: http://svn.reactos.org/svn/reactos?rev=27973&view=rev Log: Check the menu items in the view submenu according to the selected type of view. Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Sun Jul 29 00:03:06 2007 @@ -396,6 +396,13 @@ (void)ListView_InsertColumn(Info->hListView, 4, &lvc); + + /* check the details view menu item */ + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + ID_VIEW_LARGE, + ID_VIEW_DETAILS, + ID_VIEW_DETAILS, + MF_BYCOMMAND); return TRUE; } @@ -659,21 +666,41 @@ case ID_VIEW_LARGE: SetListViewStyle(Info->hListView, LVS_ICON); + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + ID_VIEW_LARGE, + ID_VIEW_DETAILS, + ID_VIEW_LARGE, + MF_BYCOMMAND); break; case ID_VIEW_SMALL: SetListViewStyle(Info->hListView, LVS_SMALLICON); + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + ID_VIEW_LARGE, + ID_VIEW_DETAILS, + ID_VIEW_SMALL, + MF_BYCOMMAND); break; case ID_VIEW_LIST: SetListViewStyle(Info->hListView, LVS_LIST); + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + ID_VIEW_LARGE, + ID_VIEW_DETAILS, + ID_VIEW_LIST, + MF_BYCOMMAND); break; case ID_VIEW_DETAILS: SetListViewStyle(Info->hListView, LVS_REPORT); + CheckMenuRadioItem(GetMenu(Info->hMainWnd), + ID_VIEW_LARGE, + ID_VIEW_DETAILS, + ID_VIEW_DETAILS, + MF_BYCOMMAND); break; case ID_VIEW_CUST:

1 0

[weiden] 27972: More function prototype fixes
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sun Jul 29 00:02:37 2007 New Revision: 27972 URL: http://svn.reactos.org/svn/reactos?rev=27972&view=rev Log: More function prototype fixes Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl_new/intl.c trunk/reactos/dll/cpl/main/keyboard.c trunk/reactos/dll/cpl/main/main.h trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.h trunk/reactos/dll/cpl/ncpa/ncpa.c trunk/reactos/dll/cpl/ncpa/ncpa.h trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/usrmgr/usrmgr.c 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 Sun Jul 29 00:02:37 2007 @@ -33,7 +33,7 @@ #include "resource.h" #include "hdwwiz.h" -LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); HINSTANCE hApplet = 0; /* Applets */ @@ -44,8 +44,8 @@ typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); -LONG APIENTRY -Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +static LONG APIENTRY +Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { HMODULE hNewDev = NULL; PINSTALL_NEW_DEVICE InstallNewDevice; Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=27… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c (original) +++ trunk/reactos/dll/cpl/intl/intl.c Sun Jul 29 00:02:37 2007 @@ -35,8 +35,8 @@ #define NUM_APPLETS (1) -LONG APIENTRY -Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY +Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); HINSTANCE hApplet = 0; @@ -126,8 +126,8 @@ return 0; } -LONG APIENTRY -Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +static LONG APIENTRY +Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETPAGE psp[6]; PROPSHEETHEADER psh; Modified: trunk/reactos/dll/cpl/intl_new/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/intl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/intl.c (original) +++ trunk/reactos/dll/cpl/intl_new/intl.c Sun Jul 29 00:02:37 2007 @@ -21,7 +21,7 @@ #define NUM_APPLETS (1) #define NUM_SHEETS 3 -LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); HINSTANCE hApplet; @@ -45,9 +45,9 @@ } /* Create applets */ -LONG +static LONG APIENTRY -Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETPAGE PsPage[NUM_SHEETS]; PROPSHEETHEADER psh; 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 Sun Jul 29 00:02:37 2007 @@ -294,7 +294,7 @@ LONG APIENTRY -KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETPAGE psp[2]; PROPSHEETHEADER psh; Modified: trunk/reactos/dll/cpl/main/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.h?rev=27… ============================================================================== --- trunk/reactos/dll/cpl/main/main.h (original) +++ trunk/reactos/dll/cpl/main/main.h Sun Jul 29 00:02:37 2007 @@ -30,7 +30,7 @@ /* keyboard.c */ LONG APIENTRY -KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +KeyboardApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); /* main.c */ @@ -43,7 +43,7 @@ /* mouse.c */ LONG APIENTRY -MouseApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +MouseApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); #endif /* __CPL_MAIN_H */ 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 Sun Jul 29 00:02:37 2007 @@ -1796,7 +1796,7 @@ LONG APIENTRY -MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) +MouseApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { PROPSHEETPAGE psp[5]; PROPSHEETHEADER psh; Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c Sun Jul 29 00:02:37 2007 @@ -92,8 +92,8 @@ LONG APIENTRY MmSysApplet(HWND hwnd, UINT uMsg, - LONG wParam, - LONG lParam) + LPARAM wParam, + LPARAM lParam) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh = {0}; Modified: trunk/reactos/dll/cpl/mmsys/mmsys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.h (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.h Sun Jul 29 00:02:37 2007 @@ -24,8 +24,8 @@ LONG APIENTRY MmSysApplet(HWND hwnd, UINT uMsg, - LONG wParam, - LONG lParam); + LPARAM wParam, + LPARAM lParam); #endif /* __CPL_MMSYS_H */ Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=27… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Sun Jul 29 00:02:37 2007 @@ -336,9 +336,9 @@ IP_ADAPTER_INFO Adapters[64]; IP_ADAPTER_INFO *pAdapter; TCHAR *tpszCfgInstanceID; - DWORD dwSize = sizeof(Adapters); + ULONG ulSize = sizeof(Adapters); memset(&Adapters,0x00,sizeof(Adapters)); - if(GetAdaptersInfo(Adapters,&dwSize)!=ERROR_SUCCESS) + if(GetAdaptersInfo(Adapters,&ulSize)!=ERROR_SUCCESS) break;; pAdapter = Adapters; tpszCfgInstanceID = (TCHAR*)pPage->lParam; Modified: trunk/reactos/dll/cpl/ncpa/ncpa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.h?rev=27… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.h (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.h Sun Jul 29 00:02:37 2007 @@ -13,7 +13,7 @@ extern HINSTANCE hApplet; -extern DWORD DbgPrint(PCCH Fmt, ...); +extern ULONG DbgPrint(PCCH Fmt, ...); #endif // __NCPA_H Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Sun Jul 29 00:02:37 2007 @@ -18,7 +18,7 @@ #define NUM_APPLETS (1) -LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); INT_PTR CALLBACK powershemesProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK alarmsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK advancedProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -80,8 +80,8 @@ } /* First Applet */ -LONG APIENTRY -Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +static LONG APIENTRY +Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETPAGE psp[5]; PROPSHEETHEADER psh; 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 Sun Jul 29 00:02:37 2007 @@ -12,7 +12,7 @@ #define NUM_APPLETS 1 -LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); HINSTANCE hApplet; @@ -68,8 +68,8 @@ } -LONG APIENTRY -Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +static LONG APIENTRY +Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETHEADER psh; PROPSHEETPAGE psp[3]; Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.c (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c Sun Jul 29 00:02:37 2007 @@ -12,7 +12,7 @@ #define NUM_APPLETS 1 -LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); HINSTANCE hApplet = 0; @@ -41,8 +41,8 @@ /* Display Applet */ -LONG APIENTRY -UsrmgrApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +static LONG APIENTRY +UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETPAGE psp[3]; PROPSHEETHEADER psh;

1 0

[zguo] 27971: update the bootdata readme
by zguo＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: zguo Date: Sun Jul 29 00:00:20 2007 New Revision: 27971 URL: http://svn.reactos.org/svn/reactos?rev=27971&view=rev Log: update the bootdata readme Modified: trunk/reactos/boot/bootdata/readme.txt Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt (original) +++ trunk/reactos/boot/bootdata/readme.txt Sun Jul 29 00:00:20 2007 @@ -1,6 +1,6 @@ ======================== ReactOS Version 0.3.x -Updated November 30, 2006 +Updated July 28, 2007 ======================== 1. What is ReactOS? @@ -16,20 +16,18 @@ 2. Relationship with the WINE project ------------------------------------- -ReactOS has always planned to work with the WINE project to share as much -programming effort as possible. This will mainly concern User Mode DLLs and -will happen once ReactOS's Kernel Mode areas are more complete, as those areas -form the underlying infrastructure. Other areas of cooperation lie in +ReactOS has always intended to work with the WINE project to share as much +programming effort as possible. This mainly concerns User Mode DLLs and +still happens to a degree today. Other areas of cooperation lie in applications and testing suites. 3. Future compatibility ----------------------- -The ReactOS project, although currently focused on Windows NT 4.0 +The ReactOS project, although currently focused on Windows XP compatibility, is always keeping an eye toward compatibility with -Windows 2000 (NT 5.0), Windows XP (NT 5.1), Windows Vista and future -Windows NT releases. +Windows Vista and future Windows NT releases. 4. Supporting other System Applications @@ -38,7 +36,7 @@ The Windows NT architecture allows for subsystems, as does the ReactOS architecture. A subsystem is an implementation of the APIs of another operating system, allowing ReactOS to run applications from other systems. We -are already looking at subsystems for: Java, OS/2 and DOS and possibly others +are already looking at subsystems for: Java, OS/2, and DOS and possibly others in the future. @@ -53,4 +51,4 @@ 6. Author --------- -This document was written by Jason Filby (jasonfilby(a)yahoo.com). +This document was written by Jason Filby (jasonfilby(a)yahoo.com).

1 0

[weiden] 27970: Fix the DisplayApplet function definition
by weiden＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: weiden Date: Sat Jul 28 23:56:15 2007 New Revision: 27970 URL: http://svn.reactos.org/svn/reactos?rev=27970&view=rev Log: Fix the DisplayApplet function definition Modified: trunk/reactos/dll/cpl/desk/desk.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=27… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Sat Jul 28 23:56:15 2007 @@ -13,7 +13,7 @@ #define NUM_APPLETS (1) -LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam); +static LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam); extern INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); extern INT_PTR CALLBACK ScreenSaverPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -47,8 +47,8 @@ /* Display Applet */ -LONG APIENTRY -DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +static LONG APIENTRY +DisplayApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETPAGE psp[4]; PROPSHEETHEADER psh;

1 0

[janderwald] 27969: - fix internet time update button for the languages which had it wrong - add missing internet update time dialog to spanish resource file - needs to be translated
by janderwald＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: janderwald Date: Sat Jul 28 23:48:00 2007 New Revision: 27969 URL: http://svn.reactos.org/svn/reactos?rev=27969&view=rev Log: - fix internet time update button for the languages which had it wrong - add missing internet update time dialog to spanish resource file - needs to be translated Modified: trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc trunk/reactos/dll/cpl/timedate/lang/da-DK.rc trunk/reactos/dll/cpl/timedate/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/el-GR.rc trunk/reactos/dll/cpl/timedate/lang/es-ES.rc trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc Modified: trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/cs-C… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/cs-CZ.rc Sat Jul 28 23:48:00 2007 @@ -43,7 +43,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automaticky synchronizovat èas s èasovým serverem v Internetu", IDC_AUTODAYLIGHT, + CONTROL "Automaticky synchronizovat èas s èasovým serverem v Internetu", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Aktualizovat", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/da-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/da-DK.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/da-DK.rc Sat Jul 28 23:48:00 2007 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/de-DE.rc Sat Jul 28 23:48:00 2007 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatisch mit einem Internet Zeitserver synchronisieren", IDC_AUTODAYLIGHT, + CONTROL "Automatisch mit einem Internet Zeitserver synchronisieren", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Jetzt updaten", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/el-GR.rc Sat Jul 28 23:48:00 2007 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/es-E… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/es-ES.rc Sat Jul 28 23:48:00 2007 @@ -36,6 +36,20 @@ IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, + 11 ,7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "Server:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronization can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/fr-FR.rc Sat Jul 28 23:48:00 2007 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Synchroniser automatiquement avec un serveur d'heure Internet", IDC_AUTODAYLIGHT, + CONTROL "Synchroniser automatiquement avec un serveur d'heure Internet", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Serveur:", -1, 34, 22, 28, 13 PUSHBUTTON "Mettre à jour maintenant", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/hu-H… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/hu-HU.rc Sat Jul 28 23:48:00 2007 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Szinkronizálja a számítógép óráját egy internetes kiszolgálóval", IDC_AUTODAYLIGHT, + CONTROL "Szinkronizálja a számítógép óráját egy internetes kiszolgálóval", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Kiszolgáló:", -1, 34, 22, 28, 13 PUSHBUTTON "Szinkronizáljon most", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/ja-JP.rc Sat Jul 28 23:48:00 2007 @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/nl-N… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/nl-NL.rc Sat Jul 28 23:48:00 2007 @@ -43,7 +43,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc Sat Jul 28 23:48:00 2007 @@ -49,7 +49,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatycznie synchronizuj czas z internetowym serwerem czasu", IDC_AUTODAYLIGHT, + CONTROL "Automatycznie synchronizuj czas z internetowym serwerem czasu", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Serwer:", -1, 34, 22, 28, 13 PUSHBUTTON "&Aktualizuj teraz", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sk-S… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/sk-SK.rc Sat Jul 28 23:48:00 2007 @@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automaticky &synchronizova èas s internetovým èasovým serverom", IDC_AUTODAYLIGHT, + CONTROL "Automaticky &synchronizova èas s internetovým èasovým serverom", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "&Aktualizova", IDC_UPDATEBUTTON, 187, 22, 49, 14 Modified: trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/sv-S… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/sv-SE.rc Sat Jul 28 23:48:00 2007 @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14

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