Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[jimtabor] 32779: Phase 2: - Implement RtlRegisterWait and RtlDeregisterWait/Ex. Move the function to new file wait.c. Ported from Wine source. - Completely untested. - good luck!
by jimtabor＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: jimtabor Date: Sat Mar 29 01:41:30 2008 New Revision: 32779 URL: http://svn.reactos.org/svn/reactos?rev=32779&view=rev Log: Phase 2: - Implement RtlRegisterWait and RtlDeregisterWait/Ex. Move the function to new file wait.c. Ported from Wine source. - Completely untested. - good luck! Added: trunk/reactos/lib/rtl/wait.c - copied, changed from r32778, trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=327… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Sat Mar 29 01:41:30 2008 @@ -91,6 +91,7 @@ <file>unicodeprefix.c</file> <file>vectoreh.c</file> <file>version.c</file> + <file>wait.c</file> <file>workitem.c</file> <pch>rtl.h</pch> </module> Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=32779… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Sat Mar 29 01:41:30 2008 @@ -275,82 +275,4 @@ } -/*********************************************************************** - * RtlRegisterWait - * - * Registers a wait for a handle to become signaled. - * - * PARAMS - * NewWaitObject [I] Handle to the new wait object. Use RtlDeregisterWait() to free it. - * Object [I] Object to wait to become signaled. - * Callback [I] Callback function to execute when the wait times out or the handle is signaled. - * Context [I] Context to pass to the callback function when it is executed. - * Milliseconds [I] Number of milliseconds to wait before timing out. - * Flags [I] Flags. See notes. - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any NTSTATUS code. - * - * NOTES - * Flags can be one or more of the following: - *|WT_EXECUTEDEFAULT - Executes the work item in a non-I/O worker thread. - *|WT_EXECUTEINIOTHREAD - Executes the work item in an I/O worker thread. - *|WT_EXECUTEINPERSISTENTTHREAD - Executes the work item in a thread that is persistent. - *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. - *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. - */ -NTSTATUS -NTAPI -RtlRegisterWait(PHANDLE NewWaitObject, - HANDLE Object, - WAITORTIMERCALLBACKFUNC Callback, - PVOID Context, - ULONG Milliseconds, - ULONG Flags) -{ - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlDeregisterWaitEx - * - * Cancels a wait operation and frees the resources associated with calling - * RtlRegisterWait(). - * - * PARAMS - * WaitObject [I] Handle to the wait object to free. - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any NTSTATUS code. - */ -NTSTATUS -NTAPI -RtlDeregisterWaitEx(HANDLE WaitHandle, - HANDLE CompletionEvent) -{ - return STATUS_SUCCESS; -} - -/*********************************************************************** - * RtlDeregisterWait - * - * Cancels a wait operation and frees the resources associated with calling - * RtlRegisterWait(). - * - * PARAMS - * WaitObject [I] Handle to the wait object to free. - * - * RETURNS - * Success: STATUS_SUCCESS. - * Failure: Any NTSTATUS code. - */ -NTSTATUS -NTAPI -RtlDeregisterWait(HANDLE WaitHandle) -{ - return RtlDeregisterWaitEx(WaitHandle, NULL); -} - /* EOF */ Copied: trunk/reactos/lib/rtl/wait.c (from r32778, trunk/reactos/lib/rtl/thread.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/wait.c?p2=trunk/re… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/wait.c [iso-8859-1] Sat Mar 29 01:41:30 2008 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * PURPOSE: Rtl user thread functions - * FILE: lib/rtl/thread.c + * PURPOSE: Rtl user wait functions + * FILE: lib/rtl/wait.c * PROGRAMERS: * Alex Ionescu (alex(a)relsoft.net) * Eric Kohl @@ -16,263 +16,90 @@ #define NDEBUG #include <debug.h> +typedef struct _RTLP_WAIT +{ + HANDLE Object; + BOOLEAN CallbackInProgress; + HANDLE CancelEvent; + LONG DeleteCount; + HANDLE CompletionEvent; + ULONG Flags; + WAITORTIMERCALLBACKFUNC Callback; + PVOID Context; + ULONG Milliseconds; +} RTLP_WAIT, *PRTLP_WAIT; + /* PRIVATE FUNCTIONS *******************************************************/ -NTSTATUS +static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, ULONG timeout ) +{ + if (timeout == INFINITE) return NULL; + pTime->QuadPart = (ULONGLONG)timeout * -10000; + return pTime; +} + +static VOID NTAPI -RtlpCreateUserStack(IN HANDLE hProcess, - IN SIZE_T StackReserve OPTIONAL, - IN SIZE_T StackCommit OPTIONAL, - IN ULONG StackZeroBits OPTIONAL, - OUT PINITIAL_TEB InitialTeb) -{ +Wait_thread_proc(LPVOID Arg) +{ + PRTLP_WAIT Wait = (PRTLP_WAIT) Arg; NTSTATUS Status; - SYSTEM_BASIC_INFORMATION SystemBasicInfo; - PIMAGE_NT_HEADERS Headers; - ULONG_PTR Stack = 0; - BOOLEAN UseGuard = FALSE; - ULONG Dummy, GuardPageSize; - - /* Get some memory information */ - Status = ZwQuerySystemInformation(SystemBasicInformation, - &SystemBasicInfo, - sizeof(SYSTEM_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Use the Image Settings if we are dealing with the current Process */ - if (hProcess == NtCurrentProcess()) - { - /* Get the Image Headers */ - Headers = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress); - - /* If we didn't get the parameters, find them ourselves */ - if (!StackReserve) StackReserve = Headers->OptionalHeader. - SizeOfStackReserve; - if (!StackCommit) StackCommit = Headers->OptionalHeader. - SizeOfStackCommit; - } - else - { - /* Use the System Settings if needed */ - if (!StackReserve) StackReserve = SystemBasicInfo.AllocationGranularity; - if (!StackCommit) StackCommit = SystemBasicInfo.PageSize; - } - - /* Align everything to Page Size */ - StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); - StackCommit = ROUND_UP(StackCommit, SystemBasicInfo.PageSize); - - // FIXME: Remove once Guard Page support is here - #if 1 - StackCommit = StackReserve; - #endif - - /* Reserve memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, - (PVOID*)&Stack, - StackZeroBits, - &StackReserve, - MEM_RESERVE, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; - - /* Now set up some basic Initial TEB Parameters */ - InitialTeb->PreviousStackBase = NULL; - InitialTeb->PreviousStackLimit = NULL; - InitialTeb->AllocatedStackBase = (PVOID)Stack; - InitialTeb->StackBase = (PVOID)(Stack + StackReserve); - - /* Update the Stack Position */ - Stack += StackReserve - StackCommit; - - /* Check if we will need a guard page */ - if (StackReserve > StackCommit) - { - /* Remove a page to set as guard page */ - Stack -= SystemBasicInfo.PageSize; - StackCommit += SystemBasicInfo.PageSize; - UseGuard = TRUE; - } - - /* Allocate memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, - (PVOID*)&Stack, - 0, - &StackCommit, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; - - /* Now set the current Stack Limit */ - InitialTeb->StackLimit = (PVOID)Stack; - - /* Create a guard page */ - if (UseGuard) - { - /* Attempt maximum space possible */ - GuardPageSize = SystemBasicInfo.PageSize; - Status = ZwProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) return Status; - - /* Update the Stack Limit keeping in mind the Guard Page */ - InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit - - GuardPageSize); - } - - /* We are done! */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -RtlpFreeUserStack(IN HANDLE Process, - IN PINITIAL_TEB InitialTeb) -{ - SIZE_T Dummy = 0; - NTSTATUS Status; - - /* Free the Stack */ - Status = ZwFreeVirtualMemory(Process, - &InitialTeb->AllocatedStackBase, - &Dummy, - MEM_RELEASE); - - /* Clear the initial TEB */ - RtlZeroMemory(InitialTeb, sizeof(INITIAL_TEB)); - return Status; -} + BOOLEAN alertable = (Wait->Flags & WT_EXECUTEINIOTHREAD) ? TRUE : FALSE; + HANDLE handles[2] = { Wait->Object, Wait->CancelEvent }; + LARGE_INTEGER timeout; + HANDLE completion_event; + +// TRACE("\n"); + + while (TRUE) + { + Status = NtWaitForMultipleObjects( 2, + handles, + FALSE, + alertable, + get_nt_timeout( &timeout, Wait->Milliseconds ) ); + + if (Status == STATUS_WAIT_0 || Status == STATUS_TIMEOUT) + { + BOOLEAN TimerOrWaitFired; + + if (Status == STATUS_WAIT_0) + { + // TRACE( "object %p signaled, calling callback %p with context %p\n", + // Wait->Object, Wait->Callback, + // Wait->Context ); + TimerOrWaitFired = FALSE; + } + else + { + // TRACE( "wait for object %p timed out, calling callback %p with context %p\n", + // Wait->Object, Wait->Callback, + // Wait->Context ); + TimerOrWaitFired = TRUE; + } + Wait->CallbackInProgress = TRUE; + Wait->Callback( Wait->Context, TimerOrWaitFired ); + Wait->CallbackInProgress = FALSE; + + if (Wait->Flags & WT_EXECUTEONLYONCE) + break; + } + else + break; + } + + completion_event = Wait->CompletionEvent; + if (completion_event) NtSetEvent( completion_event, NULL ); + + if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + { + NtClose( Wait->CancelEvent ); + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + } +} + /* FUNCTIONS ***************************************************************/ - -/* - @implemented -*/ -NTSTATUS -NTAPI -RtlCreateUserThread(IN HANDLE ProcessHandle, - IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, - IN BOOLEAN CreateSuspended, - IN ULONG StackZeroBits OPTIONAL, - IN SIZE_T StackReserve OPTIONAL, - IN SIZE_T StackCommit OPTIONAL, - IN PTHREAD_START_ROUTINE StartAddress, - IN PVOID Parameter OPTIONAL, - OUT PHANDLE ThreadHandle OPTIONAL, - OUT PCLIENT_ID ClientId OPTIONAL) -{ - NTSTATUS Status; - HANDLE Handle; - CLIENT_ID ThreadCid; - INITIAL_TEB InitialTeb; - OBJECT_ATTRIBUTES ObjectAttributes; - CONTEXT Context; - - /* First, we'll create the Stack */ - Status = RtlpCreateUserStack(ProcessHandle, - StackReserve, - StackCommit, - StackZeroBits, - &InitialTeb); - if (!NT_SUCCESS(Status)) return Status; - - /* Next, we'll set up the Initial Context */ - RtlInitializeContext(ProcessHandle, - &Context, - Parameter, - StartAddress, - InitialTeb.StackBase); - - /* We are now ready to create the Kernel Thread Object */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - SecurityDescriptor); - Status = ZwCreateThread(&Handle, - THREAD_ALL_ACCESS, - &ObjectAttributes, - ProcessHandle, - &ThreadCid, - &Context, - &InitialTeb, - CreateSuspended); - if (!NT_SUCCESS(Status)) - { - /* Free the stack */ - RtlpFreeUserStack(ProcessHandle, &InitialTeb); - } - else - { - /* Return thread data */ - if (ThreadHandle) *ThreadHandle = Handle; - if (ClientId) *ClientId = ThreadCid; - } - - /* Return success or the previous failure */ - return Status; -} - -/* - * @implemented - */ -VOID -NTAPI -RtlExitUserThread(NTSTATUS Status) -{ - /* Call the Loader and tell him to notify the DLLs */ - LdrShutdownThread(); - - /* Shut us down */ - NtCurrentTeb()->FreeStackOnTermination = TRUE; - NtTerminateThread(NtCurrentThread(), Status); -} - -/* - @implemented -*/ -VOID -NTAPI -RtlFreeUserThreadStack(HANDLE ProcessHandle, - HANDLE ThreadHandle) -{ - NTSTATUS Status; - THREAD_BASIC_INFORMATION ThreadBasicInfo; - SIZE_T Dummy, Size = 0; - PVOID StackLocation; - - /* Query the Basic Info */ - Status = NtQueryInformationThread(ThreadHandle, - ThreadBasicInformation, - &ThreadBasicInfo, - sizeof(THREAD_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status) || !ThreadBasicInfo.TebBaseAddress) return; - - /* Get the deallocation stack */ - Status = NtReadVirtualMemory(ProcessHandle, - &((PTEB)ThreadBasicInfo.TebBaseAddress)-> - DeallocationStack, - &StackLocation, - sizeof(PVOID), - &Dummy); - if (!NT_SUCCESS(Status) || !StackLocation) return; - - /* Free it */ - NtFreeVirtualMemory(ProcessHandle, &StackLocation, &Size, MEM_RELEASE); -} - -PTEB -NTAPI -_NtCurrentTeb(VOID) -{ - /* Return the TEB */ - return NtCurrentTeb(); -} /*********************************************************************** @@ -309,7 +136,49 @@ ULONG Milliseconds, ULONG Flags) { - return STATUS_SUCCESS; + PRTLP_WAIT Wait; + NTSTATUS Status; + + //TRACE( "(%p, %p, %p, %p, %d, 0x%x)\n", NewWaitObject, Object, Callback, Context, Milliseconds, Flags ); + + Wait = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(RTLP_WAIT) ); + if (!Wait) + return STATUS_NO_MEMORY; + + Wait->Object = Object; + Wait->Callback = Callback; + Wait->Context = Context; + Wait->Milliseconds = Milliseconds; + Wait->Flags = Flags; + Wait->CallbackInProgress = FALSE; + Wait->DeleteCount = 0; + Wait->CompletionEvent = NULL; + + Status = NtCreateEvent( &Wait->CancelEvent, + EVENT_ALL_ACCESS, + NULL, + TRUE, + FALSE ); + + if (Status != STATUS_SUCCESS) + { + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + return Status; + } + + Status = RtlQueueWorkItem( Wait_thread_proc, + Wait, + Flags & ~WT_EXECUTEONLYONCE ); + + if (Status != STATUS_SUCCESS) + { + NtClose( Wait->CancelEvent ); + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + return Status; + } + + *NewWaitObject = Wait; + return Status; } /*********************************************************************** @@ -330,7 +199,54 @@ RtlDeregisterWaitEx(HANDLE WaitHandle, HANDLE CompletionEvent) { - return STATUS_SUCCESS; + PRTLP_WAIT Wait = (PRTLP_WAIT) WaitHandle; + NTSTATUS Status = STATUS_SUCCESS; + + //TRACE( "(%p)\n", WaitHandle ); + + NtSetEvent( Wait->CancelEvent, NULL ); + if (Wait->CallbackInProgress) + { + if (CompletionEvent != NULL) + { + if (CompletionEvent == INVALID_HANDLE_VALUE) + { + Status = NtCreateEvent( &CompletionEvent, + EVENT_ALL_ACCESS, + NULL, + TRUE, + FALSE ); + + if (Status != STATUS_SUCCESS) + return Status; + + (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + + if (Wait->CallbackInProgress) + NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); + + NtClose( CompletionEvent ); + } + else + { + (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + + if (Wait->CallbackInProgress) + Status = STATUS_PENDING; + } + } + else + Status = STATUS_PENDING; + } + + if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + { + Status = STATUS_SUCCESS; + NtClose( Wait->CancelEvent ); + RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); + } + + return Status; } /***********************************************************************

1 0

[jimtabor] 32778: Phase 1: - Implement RegisterWaitForSingleObject/Ex and UnregisterWait/Ex in stubs.c. I'm not sure where to place the exports. So ATM it is here. - Stub RtlRegisterWait and RtlDeregisterWait/Ex. - Import from Wine source and is LGPL. - Ref: http://source.winehq.org/WineAPI/RtlRegisterWait.html http://source.winehq.org/WineAPI/RtlDeregisterWait.html
by jimtabor＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: jimtabor Date: Fri Mar 28 22:46:17 2008 New Revision: 32778 URL: http://svn.reactos.org/svn/reactos?rev=32778&view=rev Log: Phase 1: - Implement RegisterWaitForSingleObject/Ex and UnregisterWait/Ex in stubs.c. I'm not sure where to place the exports. So ATM it is here. - Stub RtlRegisterWait and RtlDeregisterWait/Ex. - Import from Wine source and is LGPL. - Ref: http://source.winehq.org/WineAPI/RtlRegisterWait.html http://source.winehq.org/WineAPI/RtlDeregisterWait.html Modified: trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/kernel32/misc/stubs.c trunk/reactos/lib/rtl/thread.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 [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def [iso-8859-1] Fri Mar 28 22:46:17 2008 @@ -404,6 +404,8 @@ RtlDeleteTimer@12 RtlDeleteTimerQueue@4 RtlDeleteTimerQueueEx@8 +RtlDeregisterWait@4 +RtlDeregisterWaitEx@8 RtlDestroyAtomTable@4 RtlDestroyEnvironment@4 RtlDestroyHandleTable@4 @@ -622,6 +624,7 @@ RtlReAllocateHeap@16 RtlRealPredecessor@4 RtlRealSuccessor@4 +RtlRegisterWait@24 RtlReleasePebLock@0 RtlReleaseRelativeName@4 RtlReleaseResource@4 Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Fri Mar 28 22:46:17 2008 @@ -7,6 +7,10 @@ #define NDEBUG #include <debug.h> + +NTSTATUS NTAPI RtlRegisterWait(PHANDLE, HANDLE, WAITORTIMERCALLBACKFUNC, PVOID, ULONG, ULONG); +NTSTATUS NTAPI RtlDeregisterWaitEx(HANDLE, HANDLE); +NTSTATUS NTAPI RtlDeregisterWait(HANDLE); #define STUB \ @@ -657,8 +661,18 @@ ULONG dwFlags ) { - STUB; - return 0; + NTSTATUS status; + +// TRACE("%p %p %p %p %d %d\n", +// phNewWaitObject,hObject,Callback,Context,dwMilliseconds,dwFlags); + + status = RtlRegisterWait( phNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /* @@ -674,8 +688,19 @@ ULONG dwFlags ) { - STUB; - return 0; + NTSTATUS status; + HANDLE hNewWaitObject; + +// TRACE("%p %p %p %d %d\n", +// hObject,Callback,Context,dwMilliseconds,dwFlags); + + status = RtlRegisterWait( &hNewWaitObject, hObject, Callback, Context, dwMilliseconds, dwFlags ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + return hNewWaitObject; } /* @@ -794,8 +819,17 @@ HANDLE WaitHandle ) { - STUB; - return 0; + NTSTATUS status; + +// TRACE("%p\n",WaitHandle); + + status = RtlDeregisterWaitEx( WaitHandle, NULL ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /* @@ -808,8 +842,17 @@ HANDLE CompletionEvent ) { - STUB; - return 0; + NTSTATUS status; + +// TRACE("%p\n",WaitHandle); + + status = RtlDeregisterWaitEx( WaitHandle, CompletionEvent ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } /* Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=32778… ============================================================================== --- trunk/reactos/lib/rtl/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/thread.c [iso-8859-1] Fri Mar 28 22:46:17 2008 @@ -274,4 +274,83 @@ return NtCurrentTeb(); } + +/*********************************************************************** + * RtlRegisterWait + * + * Registers a wait for a handle to become signaled. + * + * PARAMS + * NewWaitObject [I] Handle to the new wait object. Use RtlDeregisterWait() to free it. + * Object [I] Object to wait to become signaled. + * Callback [I] Callback function to execute when the wait times out or the handle is signaled. + * Context [I] Context to pass to the callback function when it is executed. + * Milliseconds [I] Number of milliseconds to wait before timing out. + * Flags [I] Flags. See notes. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + * + * NOTES + * Flags can be one or more of the following: + *|WT_EXECUTEDEFAULT - Executes the work item in a non-I/O worker thread. + *|WT_EXECUTEINIOTHREAD - Executes the work item in an I/O worker thread. + *|WT_EXECUTEINPERSISTENTTHREAD - Executes the work item in a thread that is persistent. + *|WT_EXECUTELONGFUNCTION - Hints that the execution can take a long time. + *|WT_TRANSFER_IMPERSONATION - Executes the function with the current access token. + */ +NTSTATUS +NTAPI +RtlRegisterWait(PHANDLE NewWaitObject, + HANDLE Object, + WAITORTIMERCALLBACKFUNC Callback, + PVOID Context, + ULONG Milliseconds, + ULONG Flags) +{ + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeregisterWaitEx + * + * Cancels a wait operation and frees the resources associated with calling + * RtlRegisterWait(). + * + * PARAMS + * WaitObject [I] Handle to the wait object to free. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS +NTAPI +RtlDeregisterWaitEx(HANDLE WaitHandle, + HANDLE CompletionEvent) +{ + return STATUS_SUCCESS; +} + +/*********************************************************************** + * RtlDeregisterWait + * + * Cancels a wait operation and frees the resources associated with calling + * RtlRegisterWait(). + * + * PARAMS + * WaitObject [I] Handle to the wait object to free. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS +NTAPI +RtlDeregisterWait(HANDLE WaitHandle) +{ + return RtlDeregisterWaitEx(WaitHandle, NULL); +} + /* EOF */

1 0

[weiden] 32777: Fix difference in signedness warning
by weiden＠svn.reactos.org 29 Mar '08

29 Mar '08

Author: weiden Date: Fri Mar 28 20:04:33 2008 New Revision: 32777 URL: http://svn.reactos.org/svn/reactos?rev=32777&view=rev Log: Fix difference in signedness warning Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Fri Mar 28 20:04:33 2008 @@ -999,7 +999,7 @@ LONG res; HKEY hKey; DWORD RegSerial, dwNukeOnDelete, dwType; - LONG dwLength; + DWORD dwLength; static WCHAR szKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\c";

1 0

[dreimer] 32776: Clean Up WineFile Folder. The MSVC Files are autogenerated anyway and these ones are rather old. Synched WineFile to recent Wine CVS.
by dreimer＠svn.reactos.org 28 Mar '08

28 Mar '08

Author: dreimer Date: Fri Mar 28 09:40:37 2008 New Revision: 32776 URL: http://svn.reactos.org/svn/reactos?rev=32776&view=rev Log: Clean Up WineFile Folder. The MSVC Files are autogenerated anyway and these ones are rather old. Synched WineFile to recent Wine CVS. Added: trunk/rosapps/winefile/rsrc.rc (with props) Removed: trunk/rosapps/winefile/Doxyfile trunk/rosapps/winefile/Makefile-MinGW trunk/rosapps/winefile/doxy-footer.html trunk/rosapps/winefile/doxy-footer.htmt trunk/rosapps/winefile/make-docu.sh trunk/rosapps/winefile/make_winefile.dsp trunk/rosapps/winefile/make_winefile.vcproj trunk/rosapps/winefile/makel-docu.bat trunk/rosapps/winefile/winefile.dsp trunk/rosapps/winefile/winefile.dsw trunk/rosapps/winefile/winefile.rc trunk/rosapps/winefile/winefile.sln trunk/rosapps/winefile/winefile.vcproj Modified: trunk/rosapps/winefile/Makefile.in trunk/rosapps/winefile/lang/cs-CZ.rc trunk/rosapps/winefile/lang/de-DE.rc trunk/rosapps/winefile/lang/en-US.rc trunk/rosapps/winefile/lang/es-ES.rc trunk/rosapps/winefile/lang/fr-FR.rc trunk/rosapps/winefile/lang/hu-HU.rc trunk/rosapps/winefile/lang/it-IT.rc trunk/rosapps/winefile/lang/ko-KO.rc trunk/rosapps/winefile/lang/nb-NO.rc trunk/rosapps/winefile/lang/nl-NL.rc trunk/rosapps/winefile/lang/pl-PL.rc trunk/rosapps/winefile/lang/pt-PT.rc trunk/rosapps/winefile/lang/ru-RU.rc trunk/rosapps/winefile/lang/sl-SI.rc trunk/rosapps/winefile/lang/sv-SE.rc trunk/rosapps/winefile/lang/tr-TR.rc trunk/rosapps/winefile/lang/zh-CN.rc trunk/rosapps/winefile/resource.h trunk/rosapps/winefile/winefile.c trunk/rosapps/winefile/winefile.h trunk/rosapps/winefile/winefile.ico trunk/rosapps/winefile/winefile.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/rosapps/winefile/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Doxyfile?rev=3277… Removed: trunk/rosapps/winefile/Makefile-MinGW URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Makefile-MinGW?re… Modified: trunk/rosapps/winefile/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/Makefile.in?rev=3… Removed: trunk/rosapps/winefile/doxy-footer.html URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/doxy-footer.html?… Removed: trunk/rosapps/winefile/doxy-footer.htmt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/doxy-footer.htmt?… Modified: trunk/rosapps/winefile/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/cs-CZ.rc?rev… Modified: trunk/rosapps/winefile/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/de-DE.rc?rev… Modified: trunk/rosapps/winefile/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/en-US.rc?rev… Modified: trunk/rosapps/winefile/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/es-ES.rc?rev… Modified: trunk/rosapps/winefile/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/fr-FR.rc?rev… Modified: trunk/rosapps/winefile/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/hu-HU.rc?rev… Modified: trunk/rosapps/winefile/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/it-IT.rc?rev… Modified: trunk/rosapps/winefile/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/ko-KO.rc?rev… Modified: trunk/rosapps/winefile/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/nb-NO.rc?rev… Modified: trunk/rosapps/winefile/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/nl-NL.rc?rev… Modified: trunk/rosapps/winefile/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pl-PL.rc?rev… Modified: trunk/rosapps/winefile/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/pt-PT.rc?rev… Modified: trunk/rosapps/winefile/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/ru-RU.rc?rev… Modified: trunk/rosapps/winefile/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sl-SI.rc?rev… Modified: trunk/rosapps/winefile/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/sv-SE.rc?rev… Modified: trunk/rosapps/winefile/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/tr-TR.rc?rev… Modified: trunk/rosapps/winefile/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/lang/zh-CN.rc?rev… Removed: trunk/rosapps/winefile/make-docu.sh URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/make-docu.sh?rev=… Removed: trunk/rosapps/winefile/make_winefile.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/make_winefile.dsp… Removed: trunk/rosapps/winefile/make_winefile.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/make_winefile.vcp… Removed: trunk/rosapps/winefile/makel-docu.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/makel-docu.bat?re… Modified: trunk/rosapps/winefile/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/resource.h?rev=32… Added: trunk/rosapps/winefile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/rsrc.rc?rev=32776… Modified: trunk/rosapps/winefile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.c?rev=32… Removed: trunk/rosapps/winefile/winefile.dsp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.dsp?rev=… Removed: trunk/rosapps/winefile/winefile.dsw URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.dsw?rev=… Modified: trunk/rosapps/winefile/winefile.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.h?rev=32… Modified: trunk/rosapps/winefile/winefile.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.ico?rev=… Modified: trunk/rosapps/winefile/winefile.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.rbuild?r… Removed: trunk/rosapps/winefile/winefile.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.rc?rev=3… Removed: trunk/rosapps/winefile/winefile.sln URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.sln?rev=… Removed: trunk/rosapps/winefile/winefile.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winefile/winefile.vcproj?r…

1 0

[dreimer] 32775: Bug 3153, 3154, 3155, 3156, 3157 Korean translations Update by Manatails (admin@manateeshome.com)
by dreimer＠svn.reactos.org 28 Mar '08

28 Mar '08

Author: dreimer Date: Fri Mar 28 09:35:51 2008 New Revision: 32775 URL: http://svn.reactos.org/svn/reactos?rev=32775&view=rev Log: Bug 3153, 3154, 3155, 3156, 3157 Korean translations Update by Manatails (admin(a)manateeshome.com) Added: trunk/reactos/base/applications/control/lang/ko-KO.rc (with props) trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc (with props) trunk/reactos/base/applications/logoff/lang/ko-KO.rc (with props) trunk/reactos/base/applications/mmc/lang/ko-KO.rc (with props) trunk/reactos/base/applications/msconfig/lang/ko-KO.rc (with props) Modified: trunk/reactos/base/applications/control/rsrc.rc trunk/reactos/base/applications/games/winemine/rsrc.rc trunk/reactos/base/applications/logoff/rsrc.rc trunk/reactos/base/applications/mmc/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/wordpad/print.c Added: trunk/reactos/base/applications/control/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/control/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,39 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "ÆÄÀÏ(&F)" + BEGIN + MENUITEM "´Ý±â(&C)", IDM_CLOSE + END + POPUP "º¸±â(&V)" + BEGIN + MENUITEM "Å« ¾ÆÀÌÄÜ", IDM_LARGEICONS + MENUITEM "ÀÛÀº ¾ÆÀÌÄÜ", IDM_SMALLICONS + MENUITEM "¸®½ºÆ®", IDM_LIST + MENUITEM "ÀÚ¼¼È÷", IDM_DETAILS + END + POPUP "µµ¿ò¸»" + BEGIN + MENUITEM "Á¤º¸", IDM_ABOUT + END +END + +STRINGTABLE +BEGIN + IDS_WINDOW_TITLE "Á¦¾îÆÇ" + IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" + IDS_ABOUT_TITLE "Á¦¾îÆÇ¿¡ ´ëÇÏ¿©" + IDS_NO_ITEMS "¸®½ºÆ® ºä¿¡ ¾ÆÀÌÅÛ ¾øÀ½" + IDS_NAME "ÀÌ¸§" + IDS_COMMENT "ÄÚ¸àÆ®" +END Propchange: trunk/reactos/base/applications/control/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/control/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/control/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -22,6 +22,7 @@ #include "lang/id-ID.rc" #include "lang/it-IT.rc" #include "lang/ja-JP.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,80 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +#include "resource.h" + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_SECONDS, "ÃÊ" + IDS_NOBODY, "ÀÍ¸í" + IDS_ABOUT, "by Joshua Thielen and ReactOS developers" +END + +IDM_WINEMINE MENU DISCARDABLE +BEGIN + POPUP "°ÔÀÓ(&G)" + BEGIN + MENUITEM "»õ °ÔÀÓ(&N)\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "? Ç¥½Ã(&M)", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "ÃÊ±Þ(&B)", IDM_BEGINNER + MENUITEM "Áß±Þ(&I)", IDM_ADVANCED + MENUITEM "°í±Þ(&E)", IDM_EXPERT + MENUITEM "Ä¿½ºÅÒ(&C)", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "ÃÖ°í ±â·Ï(&B)", IDM_TIMES + MENUITEM SEPARATOR + MENUITEM "Á¾·á(&E)", IDM_EXIT + END + POPUP "µµ¿ò¸»(&H)" + BEGIN + MENUITEM "Á¤º¸(&A)", IDM_ABOUT + END +END + +IDD_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Fastest Times" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÃÖ°í ±â·Ï", IDNONE, 10, 10, 182, 45 + LTEXT "ÃÊ±Þ:", IDNONE, 20, 20, 58, 8 + LTEXT "Áß±Þ:", IDNONE, 20, 30, 58, 8 + LTEXT "°í±Þ:", IDNONE, 20, 40, 58, 8 + LTEXT "", IDC_TIME1, 80, 20, 50, 8 + LTEXT "", IDC_TIME2, 80, 30, 50, 8 + LTEXT "", IDC_TIME3, 80, 40, 50, 8 + LTEXT "", IDC_NAME1, 132, 20, 55, 8 + LTEXT "", IDC_NAME2, 132, 30, 55, 8 + LTEXT "", IDC_NAME3, 132, 40, 55, 8 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 127, 57, 50, 15 + PUSHBUTTON "Á¡¼ö ÃÊ±âÈ(&R)", IDRESET, 18, 57, 67, 15 +END + +IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "ÃàÇÏÇÕ´Ï´Ù!" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÀÌ¸§À» ÀÔ·ÂÇÏ¼¼¿ä", IDIGNORE, 25, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 60, 40, 40, 15 +END + +IDD_CUSTOM DIALOGEX DISCARDABLE 0, 0, 139, 80 +STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT +CAPTION "Ä¿½ºÅÒ °ÔÀÓ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "³ôÀÌ:", IDNONE, 5, 15, 43, 10 + LTEXT "³Êºñ:", IDNONE, 5, 35, 43, 10 + LTEXT "Áö·Ú:", IDNONE, 5, 55, 43, 10 + EDITTEXT IDC_EDITROWS, 49, 15, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER + DEFPUSHBUTTON "È®ÀÎ", IDOK, 86, 32, 45, 15 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 86, 52, 45, 15 +END Propchange: trunk/reactos/base/applications/games/winemine/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/winemine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -25,6 +25,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" Added: trunk/reactos/base/applications/logoff/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… ============================================================================== --- trunk/reactos/base/applications/logoff/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/logoff/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,19 @@ +/* + *Korean translation by manatails007 + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "¼¼¼ÇÀ» Á¾·áÇÕ´Ï´Ù\n\n\ + /v\t\t½ÇÇàµÈ ¾×¼Ç¿¡ ´ëÇÑ Á¤º¸¸¦ º¸¿©ÁÝ´Ï´Ù\n\ + /?\t\tÀÌ Á¤º¸¸¦ º¸¿© ÁÝ´Ï´Ù\n\n" + +IDS_LOGOFF_REMOTE, "¿ø°ÝÁöÀÇ ¼¼¼Ç Á¾·á" +IDS_LOGOFF_LOCAL, "ÇöÀç ¼¼¼Ç Á¾·á" + +IDS_ILLEGAL_PARAM, "Àß¸øµÈ ÆÄ¶ó¹ÌÅÍ\n" +END +/* EOF */ Propchange: trunk/reactos/base/applications/logoff/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/logoff/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/r… ============================================================================== --- trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -10,6 +10,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/mmc/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/mmc/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,24 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDM_CONSOLEROOT MENU DISCARDABLE +BEGIN + POPUP "ÆÄÀÏ(&F)" + BEGIN + MENUITEM SEPARATOR + MENUITEM "Á¾·á(&E)\tAlt+F4", ID_FILE_EXIT + END + + POPUP "µµ¿ò¸»(&H)" + BEGIN + MENUITEM "ReactOS °ü¸® ÄÜ¼Ö¿¡ ´ëÇÏ¿©...(&A)", ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS °ü¸® ÄÜ¼Ö" + IDS_CONSOLETITLE "Console%1!u!" +END Propchange: trunk/reactos/base/applications/mmc/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mmc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/rsrc… ============================================================================== --- trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -10,6 +10,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" Added: trunk/reactos/base/applications/msconfig/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/ko-KO.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -1,0 +1,177 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_MSCONFIG_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "½Ã½ºÅÛ ¼³Á¤ ÇÁ·Î±×·¥" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "µµ¿ò¸»(&H)", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Àû¿ë", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "¸ðµÎ È°¼ºÈ(&A)",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "¸ðµÎ ºñÈ°¼ºÈ(&D)",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_SYSTEM_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 + PUSHBUTTON "À§·Î ¿òÁ÷ÀÓ(&U)", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "¹ØÀ¸·Î ¿òÁ÷ÀÓ(&D)", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + + PUSHBUTTON "È°¼ºÈ(&E)", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "ºñÈ°¼ºÈ(&D)", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + + PUSHBUTTON "°Ë»ö(&F)", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "»õ Ç×¸ñ(&N)", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "ÆíÁý(&T)", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + + PUSHBUTTON "¸ðµÎ È°¼ºÈ(&B)", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "¸ðµÎ ºñÈ°¼ºÈ(&A)",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 +END + +IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",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 "½ÇÇà(&R)", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "¸ðµÎ È°¼ºÈ(&A)",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "¸ðµÎ ºñÈ°¼ºÈ(&D)",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "»çÀÛ ¿É¼Ç", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "º¸Åë ½ÃÀÛ(&N) - ¸ðµç µå¶óÀÌ¹ö¿Í ¼ºñ½º ·Îµå", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "Áø´Ü ½ÃÀÛ(&D) - ±âº»Àû µå¶óÀÌ¹ö¿Í ¼ºñ½º¸¸ ·Îµå", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "¼±ÅÃÀû ½ÃÀÛ(&S)", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "SYSTEM.INI ÆÄÀÏ Ã³¸®(&P)", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "½Ã½ºÅÛ ¼ºñ½º ·Îµå(&L)", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "½ÃÀÛÇÁ·Î±×·¥ ·Îµå(&O)", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "¸ðµç ºÎÆÃ°æ·Î Á¡°Ë(&C)", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "±âº»°ªÀ¸·Î ¼³Á¤(&S)", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "À§·Î ¿òÁ÷ÀÌ±â(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "¹ØÀ¸·Î ¿òÁ÷ÀÌ±â(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "ºÎÆ® ¿É¼Ç", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 + CHECKBOX "/&BOOTLOG", 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 "´õ ¸¹Àº ¿É¼Ç...(&V)", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "½Ã°£Á¦ÇÑ(&T)", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "ÃÊ", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +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&ROFILE", 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 "È®ÀÎ", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Ãë¼Ò", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "System ¼³Á¤ ÇÁ·Î±×·¥" + IDS_TAB_GENERAL "ÀÏ¹Ý" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "¼ºñ½º" + IDS_TAB_STARTUP "½ÃÀÛÇÁ·Î±×·¥" + IDS_TAB_TOOLS "µµ±¸" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "¼ºñ½º" + IDS_SERVICES_COLUMN_REQ "¿ä±¸µÊ" + IDS_SERVICES_COLUMN_VENDOR "º¥´õ" + IDS_SERVICES_COLUMN_STATUS "»óÅÂ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "ÀÌ¸§" + IDS_TOOLS_COLUMN_DESCR "¼³¸í" + + IDS_TOOLS_CMD_NAME "ÄÜ¼Ö" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "¹öÁ¯" + IDS_TOOLS_INFO_DESCR "¹öÁ¯ Á¤º¸ Ç¥½Ã" + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "·¹Áö½ºÆ®¸® ÆíÁý±â" + IDS_TOOLS_REGEDIT_DESCR "·¹Áö½ºÆ®¸® ÆíÁý±â ¿±â" + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "½Ã½ºÅÛ Á¤º¸" + IDS_TOOLS_SYSDM_DESCR "ÄÄÇ»ÅÍ Á¤º¸ º¸±â" + IDS_TOOLS_SYSDM_CMD "control.exe" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "Command" + IDS_STARTUP_COLUMN_PATH "Path" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "½ÇÇàÁß" + IDS_SERVICES_STATUS_STOPPED "Á¤ÁöµÊ" + IDS_SERVICES_YES "¿¹" + IDS_SERVICES_UNKNOWN "Unknown" +END Propchange: trunk/reactos/base/applications/msconfig/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -20,6 +20,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Fri Mar 28 09:35:51 2008 @@ -629,7 +629,7 @@ int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - if(*hdcSized); + if(*hdcSized) DeleteDC(*hdcSized); *hdcSized = CreateCompatibleDC(hdc); SelectObject(*hdcSized, hBitmapScaled);

1 0

[tkreuzer] 32774: sorry forgot to commit this one.
by tkreuzer＠svn.reactos.org 28 Mar '08

28 Mar '08

Author: tkreuzer Date: Thu Mar 27 22:44:49 2008 New Revision: 32774 URL: http://svn.reactos.org/svn/reactos?rev=32774&view=rev Log: sorry forgot to commit this one. Added: trunk/rostests/apitests/w32knapi/osver.c (with props) Added: trunk/rostests/apitests/w32knapi/osver.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/osver.c… ============================================================================== --- trunk/rostests/apitests/w32knapi/osver.c (added) +++ trunk/rostests/apitests/w32knapi/osver.c [iso-8859-1] Thu Mar 27 22:44:49 2008 @@ -1,0 +1,49 @@ +#include "w32knapi.h" + +OSVERSIONINFOW g_OsVer; +UINT g_OsIdx; + +ASPI gNOPARAM_ROUTINE_CREATEMENU = {-1,-1,0x00,-1,0x00}; +ASPI gNOPARAM_ROUTINE_CREATEMENUPOPUP = {-1,-1,0x01,-1,0x01}; +ASPI gNOPARAM_ROUTINE_LOADUSERAPIHOOK = {-1,-1,0x1d,-1,0x0e}; +ASPI gONEPARAM_ROUTINE_MAPDEKTOPOBJECT = {-1,-1,0x30,-1,0x31}; +ASPI gONEPARAM_ROUTINE_SWAPMOUSEBUTTON = {-1,-1,0x42,-1,0x44}; + +ASPI gHWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW = {-1,-1,0x45,-1,0x46}; +ASPI gHWND_ROUTINE_GETWNDCONTEXTHLPID = {-1,-1,0x47,-1,0x48}; +ASPI gHWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID = {-1,-1,0x51,-1,0x52}; + +BOOL InitOsVersion() +{ + g_OsVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + GetVersionExW((LPOSVERSIONINFOW)&g_OsVer); + if (g_OsVer.dwMajorVersion == 4) + { + g_OsIdx = 0; + return TRUE; + } + else if (g_OsVer.dwMajorVersion == 5) + { + if (g_OsVer.dwMinorVersion == 0) + { + g_OsIdx = 1; + return TRUE; + } + else if (g_OsVer.dwMinorVersion == 1) + { + g_OsIdx = 2; + return TRUE; + } + else if (g_OsVer.dwMinorVersion == 2) + { + g_OsIdx = 3; + return TRUE; + } + } + else if (g_OsVer.dwMajorVersion == 6) + { + g_OsIdx = 4; + return TRUE; + } + return FALSE; +} Propchange: trunk/rostests/apitests/w32knapi/osver.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 32773: - display properties title for recycle bin folder See issue #3140 for more details.
by janderwald＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: janderwald Date: Thu Mar 27 16:02:33 2008 New Revision: 32773 URL: http://svn.reactos.org/svn/reactos?rev=32773&view=rev Log: - display properties title for recycle bin folder See issue #3140 for more details. Modified: trunk/reactos/dll/win32/shell32/recyclebin.c Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c [iso-8859-1] Thu Mar 27 16:02:33 2008 @@ -970,8 +970,11 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); psh.dwSize = sizeof(PROPSHEETHEADERW); + psh.dwFlags = PSP_DEFAULT | PSH_PROPTITLE; + psh.pszCaption = MAKEINTRESOURCEW(IDS_RECYCLEBIN_FOLDER_NAME); psh.hwndParent = NULL; psh.u3.phpage = hpsp; + psh.hInstance = shell32_hInstance; hprop = SH_CreatePropertySheetPage("BITBUCKET_PROPERTIES_DLG", BitBucketDlg, (LPARAM)sDrive, NULL); if (!hprop)

1 0

[dreimer] 32772: Once more update WinHelp and wordpad. Seems like we have a problem with wordpad, even on windows. Try open it and goto the options dialog and close it again. Then you will see. Can someone investigate in it?
by dreimer＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: dreimer Date: Thu Mar 27 08:13:54 2008 New Revision: 32772 URL: http://svn.reactos.org/svn/reactos?rev=32772&view=rev Log: Once more update WinHelp and wordpad. Seems like we have a problem with wordpad, even on windows. Try open it and goto the options dialog and close it again. Then you will see. Can someone investigate in it? Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc trunk/reactos/base/applications/winhelp/winhelp.rbuild trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h trunk/reactos/base/applications/wordpad/wordpad.rbuild Modified: trunk/reactos/base/applications/winhelp/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/lang/de-DE.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -50,6 +50,16 @@ } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Abbrechen", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -64,8 +74,8 @@ STID_SEARCH, "&Suchen" STID_BACK, "&Zurück" STID_HISTORY, "&Bisher" -STID_TOPICS, "&Topics" +STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "'%s' konnte nicht gefunden werden. Wollen Sie selber nach dieser Datei suchen?" } Modified: trunk/reactos/base/applications/winhelp/winhelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/winhelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhelp/winhelp.rbuild [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -5,14 +5,11 @@ <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>wine</library> - <library>kernel32</library> + <library>comdlg32</library> + <library>shell32</library> <library>user32</library> <library>gdi32</library> - <library>ntdll</library> - <library>comdlg32</library> - <library>advapi32</library> - <library>shell32</library> - <library>comctl32</library> + <library>kernel32</library> <file>callback.c</file> <file>hlpfile.c</file> <file>macro.c</file> Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "&Drucken" STRING_PREVIEW_NEXTPAGE, "&Nächste" STRING_PREVIEW_PREVPAGE, "&Vorherige" + STRING_PREVIEW_TWOPAGES, "Zwei Seiten" + STRING_PREVIEW_ONEPAGE, "Eine Seite" STRING_PREVIEW_CLOSE, "&Schließen" END Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Imprimer" STRING_PREVIEW_NEXTPAGE, "Page suivante" STRING_PREVIEW_PREVPAGE, "Page précédente" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Fermer" END Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -208,6 +208,8 @@ STRING_PREVIEW_PRINT, "ÀÎ¼â" STRING_PREVIEW_NEXTPAGE, "´ÙÀ½ ÆäÀÌÁö" STRING_PREVIEW_PREVPAGE, "ÀÌÀü ÆäÀÌÁö" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "´Ý±â" END Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -213,6 +213,8 @@ STRING_PREVIEW_PRINT, "Skriv ut" STRING_PREVIEW_NEXTPAGE, "Neste side" STRING_PREVIEW_PREVPAGE, "Forrige side" + STRING_PREVIEW_TWOPAGES, "To sider" + STRING_PREVIEW_ONEPAGE, "Én side" STRING_PREVIEW_CLOSE, "Lukk" END Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -214,6 +214,8 @@ STRING_PREVIEW_PRINT, "Drukuj" STRING_PREVIEW_NEXTPAGE, "Nast. strona" STRING_PREVIEW_PREVPAGE, "Poprz. strona" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Zamknij" END Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -212,6 +212,8 @@ STRING_PREVIEW_PRINT, "Ïå÷àòü" STRING_PREVIEW_NEXTPAGE, "Ñëåäóþùàÿ ñòðàíèöà" STRING_PREVIEW_PREVPAGE, "Ïðåäûäóùàÿ ñòðàíèöà" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Çàêðûòü" END Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -216,6 +216,8 @@ STRING_PREVIEW_PRINT, "Print" STRING_PREVIEW_NEXTPAGE, "Next page" STRING_PREVIEW_PREVPAGE, "Previous page" + STRING_PREVIEW_TWOPAGES, "Two pages" + STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" END Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -29,7 +29,9 @@ int page; int pages; HDC hdc; + HDC hdc2; HDC hdcSized; + HDC hdcSized2; RECT window; LPWSTR wszFileName; } previewinfo, *ppreviewinfo; @@ -229,6 +231,7 @@ static int get_num_pages(HWND hEditorWnd, FORMATRANGE fr) { int page = 0; + fr.chrg.cpMin = 0; do { @@ -245,11 +248,10 @@ { int i; - for(i = 1; i <= page; i++) - { - if(i == page) - break; - + fr->chrg.cpMin = 0; + + for(i = 1; i < page; i++) + { fr->chrg.cpMin = SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)fr); } } @@ -431,7 +433,8 @@ AddTextButton(hReBar, STRING_PREVIEW_PRINT, ID_PRINT, BANDID_PREVIEW_BTN1); AddTextButton(hReBar, STRING_PREVIEW_NEXTPAGE, ID_PREVIEW_NEXTPAGE, BANDID_PREVIEW_BTN2); AddTextButton(hReBar, STRING_PREVIEW_PREVPAGE, ID_PREVIEW_PREVPAGE, BANDID_PREVIEW_BTN3); - AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN4); + AddTextButton(hReBar, STRING_PREVIEW_TWOPAGES, ID_PREVIEW_NUMPAGES, BANDID_PREVIEW_BTN4); + AddTextButton(hReBar, STRING_PREVIEW_CLOSE, ID_FILE_EXIT, BANDID_PREVIEW_BTN5); hStatic = CreateWindowW(WC_STATICW, NULL, WS_VISIBLE | WS_CHILD, 0, 0, 0, 0, @@ -458,6 +461,7 @@ { preview.page = 1; preview.hdc = 0; + preview.hdc2 = 0; preview.wszFileName = wszFileName; preview_bar_show(hMainWnd, TRUE); } @@ -616,17 +620,63 @@ return 0; } +void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, int bmNewWidth, int bmNewHeight, int bmWidth, int bmHeight) +{ + HBITMAP hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); + HPEN hPen; + int TopMargin = (int)((float)twips_to_pixels(lpFr->rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); + int BottomMargin = (int)((float)twips_to_pixels(lpFr->rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); + int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); + + if(*hdcSized); + DeleteDC(*hdcSized); + *hdcSized = CreateCompatibleDC(hdc); + SelectObject(*hdcSized, hBitmapScaled); + + StretchBlt(*hdcSized, 0, 0, bmNewWidth, bmNewHeight, hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); + + /* Draw margin lines */ + hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); + SelectObject(*hdcSized, hPen); + + MoveToEx(*hdcSized, 0, TopMargin, NULL); + LineTo(*hdcSized, bmNewWidth, TopMargin); + MoveToEx(*hdcSized, 0, BottomMargin, NULL); + LineTo(*hdcSized, bmNewWidth, BottomMargin); + + MoveToEx(*hdcSized, LeftMargin, 0, NULL); + LineTo(*hdcSized, LeftMargin, bmNewHeight); + MoveToEx(*hdcSized, RightMargin, 0, NULL); + LineTo(*hdcSized, RightMargin, bmNewHeight); + +} + +static void draw_preview(HWND hEditorWnd, FORMATRANGE* lpFr, int bmWidth, int bmHeight, RECT* paper, int page) +{ + HBITMAP hBitmapCapture = CreateCompatibleBitmap(lpFr->hdc, bmWidth, bmHeight); + + char_from_pagenum(hEditorWnd, lpFr, page); + SelectObject(lpFr->hdc, hBitmapCapture); + FillRect(lpFr->hdc, paper, GetStockObject(WHITE_BRUSH)); + SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)lpFr); + /* EM_FORMATRANGE sets fr.rc to indicate the area printed in, but we want to + keep the original for drawing margins */ + lpFr->rc = get_print_rect(lpFr->hdcTarget); + SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); +} + LRESULT print_preview(HWND hMainWnd) { FORMATRANGE fr; GETTEXTLENGTHEX gt; HDC hdc; RECT window, background; - HBITMAP hBitmapCapture, hBitmapScaled; int bmWidth, bmHeight, bmNewWidth, bmNewHeight; float ratioWidth, ratioHeight, ratio; int xOffset, yOffset; int barheight; + float spacing = 20.0; HWND hReBar = GetDlgItem(hMainWnd, IDC_REBAR); PAINTSTRUCT ps; @@ -643,14 +693,20 @@ bmWidth = twips_to_pixels(fr.rcPage.right, GetDeviceCaps(hdc, LOGPIXELSX)); bmHeight = twips_to_pixels(fr.rcPage.bottom, GetDeviceCaps(hdc, LOGPIXELSY)); - hBitmapCapture = CreateCompatibleBitmap(hdc, bmWidth, bmHeight); - if(!preview.hdc) { RECT paper; HWND hEditorWnd = GetDlgItem(hMainWnd, IDC_EDITOR); preview.hdc = CreateCompatibleDC(hdc); + + if(preview.hdc2) + { + if((int)preview.hdc2 != -1) + DeleteDC(preview.hdc2); + preview.hdc2 = CreateCompatibleDC(hdc); + } + fr.hdc = preview.hdc; gt.flags = GTL_DEFAULT; gt.codepage = 1200; @@ -665,21 +721,29 @@ if(!preview.pages) preview.pages = get_num_pages(hEditorWnd, fr); - SelectObject(preview.hdc, hBitmapCapture); - - char_from_pagenum(hEditorWnd, &fr, preview.page); - - FillRect(preview.hdc, &paper, GetStockObject(WHITE_BRUSH)); - SendMessageW(hEditorWnd, EM_FORMATRANGE, TRUE, (LPARAM)&fr); - SendMessageW(hEditorWnd, EM_FORMATRANGE, FALSE, 0); + fr.hdc = preview.hdc; + draw_preview(hEditorWnd, &fr, bmWidth, bmHeight, &paper, preview.page); + + if(preview.hdc2) + { + fr.hdc = preview.hdc2; + draw_preview(hEditorWnd, &fr, bmWidth, bmHeight, &paper, preview.page + 1); + } EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_PREVPAGE), preview.page > 1); - EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.page < preview.pages); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NEXTPAGE), preview.hdc2 ? + (preview.page + 1) < preview.pages : + preview.page < preview.pages); + EnableWindow(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), preview.pages > 1); } barheight = SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - ratioWidth = ((float)window.right - 20.0) / (float)bmHeight; - ratioHeight = ((float)window.bottom - 20.0 - (float)barheight) / (float)bmHeight; + ratioHeight = ((float)window.bottom - spacing - (float)barheight) / (float)bmHeight; + + if(preview.hdc2) + ratioWidth = ((float)window.right / 2.0 - spacing * 2.0) / (float)bmWidth; + else + ratioWidth = ((float)window.right - spacing * 3.0) / (float)bmWidth; if(ratioWidth > ratioHeight) ratio = ratioHeight; @@ -688,44 +752,16 @@ bmNewWidth = (int)((float)bmWidth * ratio); bmNewHeight = (int)((float)bmHeight * ratio); - hBitmapScaled = CreateCompatibleBitmap(hdc, bmNewWidth, bmNewHeight); - - xOffset = ((window.right - bmNewWidth) / 2); + yOffset = ((window.bottom - bmNewHeight + barheight) / 2); - if(window.right != preview.window.right || window.bottom != preview.window.bottom) - { - HPEN hPen; - int TopMargin = (int)((float)twips_to_pixels(fr.rc.top, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int BottomMargin = (int)((float)twips_to_pixels(fr.rc.bottom, GetDeviceCaps(hdc, LOGPIXELSX)) * ratio); - int LeftMargin = (int)((float)twips_to_pixels(fr.rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - int RightMargin = (int)((float)twips_to_pixels(fr.rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - - DeleteDC(preview.hdcSized); - preview.hdcSized = CreateCompatibleDC(hdc); - SelectObject(preview.hdcSized, hBitmapScaled); - - StretchBlt(preview.hdcSized, 0, 0, bmNewWidth, bmNewHeight, preview.hdc, 0, 0, bmWidth, bmHeight, SRCCOPY); - - /* Draw margin lines */ - hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); - SelectObject(preview.hdcSized, hPen); - - MoveToEx(preview.hdcSized, 0, TopMargin, NULL); - LineTo(preview.hdcSized, bmNewWidth, TopMargin); - MoveToEx(preview.hdcSized, 0, BottomMargin, NULL); - LineTo(preview.hdcSized, bmNewWidth, BottomMargin); - - MoveToEx(preview.hdcSized, LeftMargin, 0, NULL); - LineTo(preview.hdcSized, LeftMargin, bmNewHeight); - MoveToEx(preview.hdcSized, RightMargin, 0, NULL); - LineTo(preview.hdcSized, RightMargin, bmNewHeight); - } + if(!preview.hdc2) + xOffset = (window.right - bmNewWidth) / 2; + else + xOffset = (window.right - bmNewWidth * 2) / 2; window.top = barheight; FillRect(hdc, &window, GetStockObject(GRAY_BRUSH)); - - SelectObject(hdc, hBitmapScaled); background.left = xOffset - 2; background.right = xOffset + bmNewWidth + 2; @@ -734,7 +770,27 @@ FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + if(window.right != preview.window.right || window.bottom != preview.window.bottom) + { + draw_preview_page(preview.hdc, &preview.hdcSized, &fr, ratio, bmNewWidth, bmNewHeight, bmWidth, bmHeight); + + if(preview.hdc2) + { + background.left += bmNewWidth + spacing; + background.right += bmNewWidth + spacing; + + FillRect(hdc, &background, GetStockObject(BLACK_BRUSH)); + + draw_preview_page(preview.hdc2, &preview.hdcSized2, &fr, ratio, bmNewWidth, bmNewHeight, bmWidth, bmHeight); + } + } + BitBlt(hdc, xOffset, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized, 0, 0, SRCCOPY); + + if(preview.hdc2) + { + BitBlt(hdc, xOffset + bmNewWidth + spacing, yOffset, bmNewWidth, bmNewHeight, preview.hdcSized2, 0, 0, SRCCOPY); + } DeleteDC(fr.hdcTarget); preview.window = window; @@ -742,6 +798,20 @@ EndPaint(hMainWnd, &ps); return 0; +} + +void update_preview(HWND hWnd) +{ + RECT rc; + + DeleteDC(preview.hdc); + preview.hdc = 0; + + preview.window.right = 0; + + GetClientRect(hWnd, &rc); + rc.top += SendMessageW(GetDlgItem(hWnd, IDC_REBAR), RB_GETBARHEIGHT, 0, 0); + InvalidateRect(hWnd, &rc, TRUE); } LRESULT preview_command(HWND hWnd, WPARAM wParam, LPARAM lParam) @@ -755,20 +825,37 @@ case ID_PREVIEW_NEXTPAGE: case ID_PREVIEW_PREVPAGE: { - HWND hReBar = GetDlgItem(hWnd, IDC_REBAR); - RECT rc; - if(LOWORD(wParam) == ID_PREVIEW_NEXTPAGE) preview.page++; else preview.page--; - preview.hdc = 0; - preview.window.right = 0; - - GetClientRect(hWnd, &rc); - rc.top += SendMessageW(hReBar, RB_GETBARHEIGHT, 0, 0); - InvalidateRect(hWnd, &rc, TRUE); + update_preview(hWnd); + } + break; + + case ID_PREVIEW_NUMPAGES: + { + HWND hReBar = GetDlgItem(hWnd, IDC_REBAR); + WCHAR name[MAX_STRING_LEN]; + HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE); + + if(preview.hdc2) + { + DeleteDC(preview.hdc2); + preview.hdc2 = 0; + } else + { + if(preview.page == preview.pages) + preview.page--; + preview.hdc2 = (HDC)-1; + } + + LoadStringW(hInst, preview.hdc2 ? STRING_PREVIEW_ONEPAGE : STRING_PREVIEW_TWOPAGES, + name, MAX_STRING_LEN); + + SetWindowTextW(GetDlgItem(hReBar, ID_PREVIEW_NUMPAGES), name); + update_preview(hWnd); } break; Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -20,7 +20,7 @@ */ #define WIN32_LEAN_AND_MEAN -//#define _WIN32_IE 0x0400 +#define _WIN32_IE 0x0400 #include <stdarg.h> #include <stdlib.h> Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -44,6 +44,7 @@ #define ID_PREVIEW_NEXTPAGE 1017 #define ID_PREVIEW_PREVPAGE 1018 +#define ID_PREVIEW_NUMPAGES 1019 #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 @@ -79,7 +80,7 @@ #define ID_TOGGLE_STATUSBAR 1502 #define ID_TOGGLE_RULER 1503 -#define PREVIEW_BUTTONS 4 +#define PREVIEW_BUTTONS 5 #define FILELIST_ENTRIES 4 #define FILELIST_ENTRY_LENGTH 33 @@ -95,7 +96,8 @@ #define BANDID_PREVIEW_BTN2 7 #define BANDID_PREVIEW_BTN3 8 #define BANDID_PREVIEW_BTN4 9 -#define BANDID_PREVIEW_BUFFER 10 +#define BANDID_PREVIEW_BTN5 10 +#define BANDID_PREVIEW_BUFFER 11 #define ID_WORDWRAP_NONE 0 #define ID_WORDWRAP_WINDOW 1 @@ -178,9 +180,11 @@ #define STRING_PREVIEW_PRINT 1414 #define STRING_PREVIEW_NEXTPAGE 1415 #define STRING_PREVIEW_PREVPAGE 1416 -#define STRING_PREVIEW_CLOSE 1417 - -#define STRING_UNITS_CM 1418 +#define STRING_PREVIEW_TWOPAGES 1417 +#define STRING_PREVIEW_ONEPAGE 1418 +#define STRING_PREVIEW_CLOSE 1419 + +#define STRING_UNITS_CM 1420 #define STRING_DEFAULT_FILENAME 1700 #define STRING_PROMPT_SAVE_CHANGES 1701 Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Thu Mar 27 08:13:54 2008 @@ -4,12 +4,13 @@ <include base="wordpad">.</include> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> + <library>comdlg32</library> + <library>shell32</library> <library>user32</library> <library>gdi32</library> - <library>comdlg32</library> + <library>msvcrt</library> <library>advapi32</library> - <library>shell32</library> + <library>kernel32</library> <library>comctl32</library> <compilationunit name="unit.c"> <file>print.c</file>

1 0

[fireball] 32540: - The bootloader must zero user shared data page before passing control to the kernel. This fixes the "invalid timer state", "assert(SharedUserData->NumberOfPages == 0" family of bugs after warm reboot. See issue #3085 for more details.
by fireball＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: fireball Date: Sun Mar 2 04:26:59 2008 New Revision: 32540 URL: http://svn.reactos.org/svn/reactos?rev=3D32540&view=3Drev Log: - The bootloader must zero user shared data page before passing control to = the kernel. This fixes the "invalid timer state", "assert(SharedUserData->N= umberOfPages =3D=3D 0" family of bugs after warm reboot. See issue #3085 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/= arch/i386/loader.c?rev=3D32540&r1=3D32539&r2=3D32540&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sun Mar 2 04:26:= 59 2008 @@ -202,5 +202,8 @@ PageDir->Pde[0x1FF].Valid =3D 1; PageDir->Pde[0x1FF].Write =3D 1; PageDir->Pde[0x1FF].PageFrameNumber =3D 1; + + /* Zero shared data */ + RtlZeroMemory((PVOID)(2 << MM_PAGE_SHIFT), PAGE_SIZE); } =

1 0

[greatlrd] 32544: small change in DdCreateSurface. now we pass down all usermode surface data to win32k. left todo is translate back all surface data.
by greatlrd＠svn.reactos.org 27 Mar '08

27 Mar '08

Author: greatlrd Date: Sun Mar 2 11:50:11 2008 New Revision: 32544 URL: http://svn.reactos.org/svn/reactos?rev=3D32544&view=3Drev Log: small change in DdCreateSurface. now we pass down all usermode surface dat= a to win32k. left todo is translate back all surface data. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32544&r1=3D32543&r2=3D32544&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 11:50:11 2008 @@ -409,13 +409,10 @@ ptmpDdSurfaceMore->dwSurfaceHandle =3D (DWORD) pCreateSurf= ace->lplpSList[i]->dbnOverlayNode.object_int; } = - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - - we only support one surface create at moment - */ + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008