Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[fireball] 34096: - Rewrite David Welch's Ansi function wrappers to reduce their code size, improve readability, and fix a bug of freeing of a non-allocated string. Spotted by Christoph vW.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 26 06:49:47 2008 New Revision: 34096 URL: http://svn.reactos.org/svn/reactos?rev=34096&view=rev Log: - Rewrite David Welch's Ansi function wrappers to reduce their code size, improve readability, and fix a bug of freeing of a non-allocated string. Spotted by Christoph vW. Modified: trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/misc/winsta.c Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Thu Jun 26 06:49:47 2008 @@ -468,35 +468,34 @@ ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpsa) { - ANSI_STRING DesktopNameA; - UNICODE_STRING DesktopNameU; - HDESK hDesktop; - LPDEVMODEW DevmodeW = NULL; - - if (lpszDesktop != NULL) + UNICODE_STRING DesktopNameU; + HDESK hDesktop; + LPDEVMODEW DevmodeW = NULL; + + if (lpszDesktop) { - RtlInitAnsiString(&DesktopNameA, (LPSTR)lpszDesktop); - RtlAnsiStringToUnicodeString(&DesktopNameU, &DesktopNameA, TRUE); + /* After conversion, the buffer is zero-terminated */ + RtlCreateUnicodeStringFromAsciiz(&DesktopNameU, lpszDesktop); } - else + else { - RtlInitUnicodeString(&DesktopNameU, NULL); + RtlInitUnicodeString(&DesktopNameU, NULL); } - if (pDevmode) - { - DevmodeW = GdiConvertToDevmodeW(pDevmode); - } - - hDesktop = CreateDesktopW(DesktopNameU.Buffer, - NULL, - DevmodeW, - dwFlags, - dwDesiredAccess, - lpsa); - - RtlFreeUnicodeString(&DesktopNameU); - return(hDesktop); + if (pDevmode) + DevmodeW = GdiConvertToDevmodeW(pDevmode); + + hDesktop = CreateDesktopW(DesktopNameU.Buffer, + NULL, + DevmodeW, + dwFlags, + dwDesiredAccess, + lpsa); + + /* Free the string, if it was allocated */ + if (lpszDesktop) RtlFreeUnicodeString(&DesktopNameU); + + return hDesktop; } @@ -580,26 +579,28 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - ANSI_STRING DesktopNameA; - UNICODE_STRING DesktopNameU; - HDESK hDesktop; - - if (lpszDesktop != NULL) { - RtlInitAnsiString(&DesktopNameA, lpszDesktop); - RtlAnsiStringToUnicodeString(&DesktopNameU, &DesktopNameA, TRUE); - } else { - RtlInitUnicodeString(&DesktopNameU, NULL); - } - - hDesktop = OpenDesktopW( - DesktopNameU.Buffer, - dwFlags, - fInherit, - dwDesiredAccess); - - RtlFreeUnicodeString(&DesktopNameU); - - return hDesktop; + UNICODE_STRING DesktopNameU; + HDESK hDesktop; + + if (lpszDesktop) + { + /* After conversion, the buffer is zero-terminated */ + RtlCreateUnicodeStringFromAsciiz(&DesktopNameU, lpszDesktop); + } + else + { + RtlInitUnicodeString(&DesktopNameU, NULL); + } + + hDesktop = OpenDesktopW(DesktopNameU.Buffer, + dwFlags, + fInherit, + dwDesiredAccess); + + /* Free the string, if it was allocated */ + if (lpszDesktop) RtlFreeUnicodeString(&DesktopNameU); + + return hDesktop; } Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/winsta.c [iso-8859-1] Thu Jun 26 06:49:47 2008 @@ -32,29 +32,28 @@ ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpsa) { - ANSI_STRING WindowStationNameA; - UNICODE_STRING WindowStationNameU; - HWINSTA hWinSta; - - if (lpwinsta != NULL) + UNICODE_STRING WindowStationNameU; + HWINSTA hWinSta; + + if (lpwinsta) { - RtlInitAnsiString(&WindowStationNameA, lpwinsta); - RtlAnsiStringToUnicodeString(&WindowStationNameU, &WindowStationNameA, - TRUE); + /* After conversion, the buffer is zero-terminated */ + RtlCreateUnicodeStringFromAsciiz(&WindowStationNameU, lpwinsta); } - else + else { - RtlInitUnicodeString(&WindowStationNameU, NULL); + RtlInitUnicodeString(&WindowStationNameU, NULL); } - hWinSta = CreateWindowStationW(WindowStationNameU.Buffer, - dwReserved, - dwDesiredAccess, - lpsa); - - RtlFreeUnicodeString(&WindowStationNameU); - - return hWinSta; + hWinSta = CreateWindowStationW(WindowStationNameU.Buffer, + dwReserved, + dwDesiredAccess, + lpsa); + + /* Free the string, if it was allocated */ + if (lpwinsta) RtlFreeUnicodeString(&WindowStationNameU); + + return hWinSta; } @@ -291,28 +290,27 @@ BOOL fInherit, ACCESS_MASK dwDesiredAccess) { - ANSI_STRING WindowStationNameA; - UNICODE_STRING WindowStationNameU; - HWINSTA hWinSta; - - if (lpszWinSta != NULL) + UNICODE_STRING WindowStationNameU; + HWINSTA hWinSta; + + if (lpszWinSta) { - RtlInitAnsiString(&WindowStationNameA, lpszWinSta); - RtlAnsiStringToUnicodeString(&WindowStationNameU, &WindowStationNameA, - TRUE); + /* After conversion, the buffer is zero-terminated */ + RtlCreateUnicodeStringFromAsciiz(&WindowStationNameU, lpszWinSta); } - else + else { - RtlInitUnicodeString(&WindowStationNameU, NULL); + RtlInitUnicodeString(&WindowStationNameU, NULL); } - hWinSta = OpenWindowStationW(WindowStationNameU.Buffer, - fInherit, - dwDesiredAccess); - - RtlFreeUnicodeString(&WindowStationNameU); - - return hWinSta; + hWinSta = OpenWindowStationW(WindowStationNameU.Buffer, + fInherit, + dwDesiredAccess); + + /* Free the string, if it was allocated */ + if (lpszWinSta) RtlFreeUnicodeString(&WindowStationNameU); + + return hWinSta; }

16 years, 2 months

[cwittich] 34095: don't free a UNICODE_STRING which isn't allocated

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 26 06:34:56 2008 New Revision: 34095 URL: http://svn.reactos.org/svn/reactos?rev=34095&view=rev Log: don't free a UNICODE_STRING which isn't allocated Modified: trunk/reactos/dll/win32/kernel32/process/job.c Modified: trunk/reactos/dll/win32/kernel32/process/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/job.c [iso-8859-1] Thu Jun 26 06:34:56 2008 @@ -138,8 +138,6 @@ Status = NtOpenJobObject(&hJob, dwDesiredAccess, &ObjectAttributes); - - RtlFreeUnicodeString(&JobName); if(!NT_SUCCESS(Status)) {

16 years, 2 months

[cwittich] 34094: don't free a UNICODE_STRING which isn't allocated

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 26 05:22:24 2008 New Revision: 34094 URL: http://svn.reactos.org/svn/reactos?rev=34094&view=rev Log: don't free a UNICODE_STRING which isn't allocated Modified: trunk/reactos/dll/ntdll/csr/connect.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Thu Jun 26 05:22:24 2008 @@ -375,7 +375,6 @@ NULL, &CsrSrvName, &hCsrSrv); - RtlFreeUnicodeString(&CsrSrvName); /* Now get the Server to Server routine */ RtlInitAnsiString(&CsrServerRoutineName, "CsrCallServerFromServer");

16 years, 2 months

[cwittich] 34093: don't free a UNICODE_STRING which isn't allocated

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jun 26 04:35:59 2008 New Revision: 34093 URL: http://svn.reactos.org/svn/reactos?rev=34093&view=rev Log: don't free a UNICODE_STRING which isn't allocated Modified: trunk/reactos/base/system/smss/initmv.c Modified: trunk/reactos/base/system/smss/initmv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initmv.c?… ============================================================================== --- trunk/reactos/base/system/smss/initmv.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initmv.c [iso-8859-1] Thu Jun 26 04:35:59 2008 @@ -69,8 +69,6 @@ FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); - - RtlFreeUnicodeString(&FileNameU); if( !NT_SUCCESS(Status) ) { DPRINT("NtCreateFile() failed (Status %lx)\n", Status);

16 years, 2 months

[fireball] 34092: Jeffrey Morlan <mrnobo1024@yahoo.com> - Fix a major problem in pushlock implementation: if there are 2 or more threads waiting for a lock, only one of them ever gets woken. ExfWakePushLock is missing a break in its loop so it removes all the WaitBlocks instead of just the last one. - This fixes all "weird" hangs happening, including FF1.5 installer hang, VMWare Video Driver Installer hang, taskmgr tabs hang, and other similar problems. See issue #3141 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jun 26 03:26:48 2008 New Revision: 34092 URL: http://svn.reactos.org/svn/reactos?rev=34092&view=rev Log: Jeffrey Morlan <mrnobo1024(a)yahoo.com> - Fix a major problem in pushlock implementation: if there are 2 or more threads waiting for a lock, only one of them ever gets woken. ExfWakePushLock is missing a break in its loop so it removes all the WaitBlocks instead of just the last one. - This fixes all "weird" hangs happening, including FF1.5 installer hang, VMWare Video Driver Installer hang, taskmgr tabs hang, and other similar problems. See issue #3141 for more details. Modified: trunk/reactos/ntoskrnl/ex/pushlock.c Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Thu Jun 26 03:26:48 2008 @@ -155,6 +155,9 @@ /* Remove waking bit from pushlock */ InterlockedAnd((PLONG)PushLock, ~EX_PUSH_LOCK_WAKING); + + /* Leave the loop */ + break; } }

16 years, 2 months

[ros-arm-bringup] 34091: - Fix several interlocked list functions -- they should return NULL if the list is empty. - Fix a bug in FreeLDR-ARM, we forgot to set the RegistryLength, resulting in a corrupted registry. We can now load the system registry. - Enable code to handle DPC, Timer and Deferred Ready cleanup (portable code that's already written). - Enable code to handle quantum end. - We now load all the way to IoInitSystem!IopInitializeBootDrivers.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Jun 26 01:38:42 2008 New Revision: 34091 URL: http://svn.reactos.org/svn/reactos?rev=34091&view=rev Log: - Fix several interlocked list functions -- they should return NULL if the list is empty. - Fix a bug in FreeLDR-ARM, we forgot to set the RegistryLength, resulting in a corrupted registry. We can now load the system registry. - Enable code to handle DPC, Timer and Deferred Ready cleanup (portable code that's already written). - Enable code to handle quantum end. - We now load all the way to IoInitSystem!IopInitializeBootDrivers. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/config/arm/cmhardwr.c trunk/reactos/ntoskrnl/ex/fastinterlck.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Thu Jun 26 01:38:42 2008 @@ -1163,6 +1163,7 @@ // Setup registry data // ArmLoaderBlock->RegistryBase = (PVOID)((ULONG_PTR)RegistryData | KSEG0_BASE); + ArmLoaderBlock->RegistryLength = RegistrySize; // // Create an MD for it Modified: trunk/reactos/ntoskrnl/config/arm/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/arm/cmhard… ============================================================================== --- trunk/reactos/ntoskrnl/config/arm/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/arm/cmhardwr.c [iso-8859-1] Thu Jun 26 01:38:42 2008 @@ -20,6 +20,8 @@ NTAPI CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + // + // Nothing to do on ARM + // + return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Thu Jun 26 01:38:42 2008 @@ -136,7 +136,7 @@ { KIRQL OldIrql; PLIST_ENTRY OldHead = NULL; - KeAcquireSpinLock(Lock,&OldIrql); + KeAcquireSpinLock(Lock, &OldIrql); if (!IsListEmpty(ListHead)) OldHead = ListEntry->Blink; InsertTailList(ListHead, ListEntry); KeReleaseSpinLock(Lock, OldIrql); @@ -223,7 +223,7 @@ { KIRQL OldIrql; PLIST_ENTRY OldHead = NULL; - KeAcquireSpinLock(Lock,&OldIrql); + KeAcquireSpinLock(Lock, &OldIrql); if (!IsListEmpty(ListHead)) OldHead = ListEntry->Flink; InsertHeadList(ListHead, ListEntry); KeReleaseSpinLock(Lock, OldIrql); @@ -238,7 +238,7 @@ { KIRQL OldIrql; PLIST_ENTRY OldHead = NULL; - KeAcquireSpinLock(Lock,&OldIrql); + KeAcquireSpinLock(Lock, &OldIrql); if (!IsListEmpty(ListHead)) OldHead = ListEntry->Blink; InsertTailList(ListHead, ListEntry); KeReleaseSpinLock(Lock, OldIrql); @@ -252,8 +252,8 @@ { KIRQL OldIrql; PSINGLE_LIST_ENTRY OldHead = NULL; - KeAcquireSpinLock(Lock,&OldIrql); - OldHead = PopEntryList(ListHead); + KeAcquireSpinLock(Lock, &OldIrql); + if (!ListHead->Next) OldHead = PopEntryList(ListHead); KeReleaseSpinLock(Lock, OldIrql); return OldHead; } @@ -266,8 +266,8 @@ { KIRQL OldIrql; PSINGLE_LIST_ENTRY OldHead = NULL; - KeAcquireSpinLock(Lock,&OldIrql); - OldHead = PushEntryList(ListHead, ListEntry); + KeAcquireSpinLock(Lock, &OldIrql); + if (!ListHead->Next) OldHead = PushEntryList(ListHead, ListEntry); KeReleaseSpinLock(Lock, OldIrql); return OldHead; } @@ -279,8 +279,8 @@ { KIRQL OldIrql; PLIST_ENTRY OldHead = NULL; - KeAcquireSpinLock(Lock,&OldIrql); - OldHead = RemoveHeadList(ListHead); + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead = RemoveHeadList(ListHead); KeReleaseSpinLock(Lock, OldIrql); return OldHead; } Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Thu Jun 26 01:38:42 2008 @@ -25,6 +25,18 @@ IN ULONG ArgumentCount ); +VOID +FASTCALL +KiRetireDpcList( + IN PKPRCB Prcb +); + +VOID +FASTCALL +KiQuantumEnd( + VOID +); + /* FUNCTIONS ******************************************************************/ VOID @@ -58,10 +70,9 @@ HalClearSoftwareInterrupt(DISPATCH_LEVEL); // - // FIXME: TODO - // - DPRINT1("DPC/Timer Delivery!\n"); - while (TRUE); + // Retire DPCs + // + KiRetireDpcList(Prcb); } // @@ -242,10 +253,9 @@ (Prcb->DeferredReadyListHead.Next)) { // - // FIXME: TODO - // - DPRINT1("DPC/Timer Delivery!\n"); - while (TRUE); + // Retire DPCs + // + KiRetireDpcList(Prcb); } // @@ -259,10 +269,10 @@ if (Prcb->QuantumEnd) { // - // FIXME: TODO - // - DPRINT1("Quantum End!\n"); - while (TRUE); + // Handle quantum end + // + Prcb->QuantumEnd = FALSE; + KiQuantumEnd(); return; }

16 years, 2 months

[dreimer] 34090: Update xcopy, winhlp32 and wordpad to Wine HEAD. I kept Fireball's changes, but plz send them to Wine, too. The Lithuan, Ukrainian and Greek Translators of winhlp32 should do the same.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 26 01:12:44 2008 New Revision: 34090 URL: http://svn.reactos.org/svn/reactos?rev=34090&view=rev Log: Update xcopy, winhlp32 and wordpad to Wine HEAD. I kept Fireball's changes, but plz send them to Wine, too. The Lithuan, Ukrainian and Greek Translators of winhlp32 should do the same. Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc trunk/reactos/base/applications/cmdutils/xcopy/De.rc trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc trunk/reactos/base/applications/cmdutils/xcopy/No.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/Si.rc trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc trunk/reactos/base/applications/winhlp32/lang/da-DK.rc trunk/reactos/base/applications/winhlp32/lang/de-DE.rc trunk/reactos/base/applications/winhlp32/lang/el-GR.rc trunk/reactos/base/applications/winhlp32/lang/en-US.rc trunk/reactos/base/applications/winhlp32/lang/eo-EO.rc trunk/reactos/base/applications/winhlp32/lang/es-ES.rc trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc trunk/reactos/base/applications/winhlp32/lang/it-IT.rc trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc trunk/reactos/base/applications/winhlp32/lang/wa-WA.rc trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/winhlp32/winhelp_res.h trunk/reactos/base/applications/wordpad/Da.rc 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/Si.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/registry.c trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -47,7 +47,7 @@ "XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ \n\ Syntaks:\n\ -XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ hvor:\n\ @@ -69,7 +69,7 @@ [/H] Kopier skjulte filer og systemfiler\n\ [/C] Fortsæt selv om det opstår fejl under kopieringen\n\ [/A] Kopier ikke filer som er markeret som arkiv\n\ -[/M] Kopier kun filer som er markeret som akriv; fjerner denne markering \n\ +[/M] Kopier kun filer som er markeret som akriv; fjerner denne markering\n\ [/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ \t\tden opgivne dato.\n\ \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/De.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -48,7 +48,7 @@ "XCOPY - Kopiert Dateien oder Verzeichnisse an einen Zielort\n\ \n\ Syntax:\n\ -XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Mit:\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -47,12 +47,12 @@ "XCOPY - Copies source files or directory trees to a destination\n\ \n\ Syntax:\n\ -XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Where:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or \n\ +[/I] Assume directory if destination does not exist and copying 2 or\n\ \tmore files\n\ [/S] Copy directories and subdirectories\n\ [/E] Copy directories and subdirectories, including any empty ones\n\ @@ -70,7 +70,7 @@ [/H] Include hidden and system files in the copy\n\ [/C] Continue even if an error occurs during the copy\n\ [/A] Only copy files with archive attribute set\n\ -[/M] Only copy files with archive attribute set, removes \n\ +[/M] Only copy files with archive attribute set, removes\n\ \tarchive attribute\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Fr.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -48,7 +48,7 @@ "XCOPY - Copie les fichiers ou rÃ©pertoires source vers une destination\n\ \n\ SyntaxeÂ :\n\ -XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ OÃ¹Â :\n\ @@ -71,7 +71,7 @@ [/H] Inclure les fichiers cachÃ©s et systÃ¨me dans la copie\n\ [/C] Continue mÃªme si une erreur survient pendant la copie\n\ [/A] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini\n\ -[/M] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini, supprime \n\ +[/M] Copie uniquement les fichiers qui ont l'attribut archive dÃ©fini, supprime\n\ \tensuite l'attribut\n\ [/D | /D:m-d-y] Copie uniquement les fichiers nouveaux ou ceux modifiÃ©s aprÃ¨s la date spÃ©cifiÃ©e.\n\ \t\tSi aucune date n'est spÃ©cifiÃ©e, copie uniquement lorsque le fichier de destination est plus vieux\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -48,12 +48,12 @@ "XCOPY - ¿øº» ÆÄÀÏÀÌ³ª µð·ºÅä¸® ±¸Á¶¸¦ ¸ñÀûÁö·Î º¹»ç\n\ \n\ ¹®¹ý:\n\ -XCOPY ¿øº» [´ë»ó] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY ¿øº» [´ë»ó] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Where:\n\ \n\ -[/I] Assume directory if destination does not exist and copying 2 or \n\ +[/I] Assume directory if destination does not exist and copying 2 or\n\ \tmore files\n\ [/S] µð·ºÅä¸®ÇÏ°í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ [/E] ºó µð·ºÅä¸®¸¦ Æ÷ÇÔÇØ¼ µð·ºÅä¸®¿Í ÇÏÀ§ µð·ºÅä¸® º¹»ç\n\ @@ -71,10 +71,10 @@ [/H] ¼ûÀº ÆÄÀÏÀÌ³ª ½Ã½ºÅÛ ÆÄÀÏµµ Æ÷ÇÔÇØ¼ º¹»ç\n\ [/C] º¹»çÇÏ´Â µ¿¾È¿¡ ¿¡·¯°¡ ¹ß»ýÇØµµ °è¼Ó ÁøÇà\n\ [/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ -[/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â \n\ -\ÆÄÀÏ¸¸ º¹»ç \n\ +[/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â\n\ +\ÆÄÀÏ¸¸ º¹»ç\n\ [/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\ -\t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù \n\ +\t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù\n\ \t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n" } Modified: trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Nl.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -47,7 +47,7 @@ "XCOPY - CopiÃ«erd bron bestanden of directory bomen naar een bestemming\n\ \n\ Gebruik:\n\ -XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Parameters:\n\ @@ -70,7 +70,7 @@ [/H] Inclusief verborgen en systeem bestanden\n\ [/C] Ga door zelfs als er een fout optreed tijdens het copiÃ«ren\n\ [/A] CopiÃ«er alleen bestanden met archiverings attribuut aan\n\ -[/M] CopiÃ«er alleen bestanden met archiverings attribuut aan, verwijderd \n\ +[/M] CopiÃ«er alleen bestanden met archiverings attribuut aan, verwijderd\n\ \tdit archiverings attribuut\n\ [/D | /D:m-d-y] CopiÃ«er nieuwe bestanden of die gewijzigd zijn na de opgegeven\n\ \t\tdatum. Als geen detum wordt gegeven, copiÃ«er alleen als bron nieuwer is.\n\n" Modified: trunk/reactos/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -47,7 +47,7 @@ "XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ \n\ Syntax:\n\ -XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Where:\n\ @@ -70,7 +70,7 @@ [/H] Kopier skjulte filer og systemfiler\n\ [/C] Fortsett selv om det oppstår feil under kopieringen\n\ [/A] Ikke kopier filer som er markert som arkiv\n\ -[/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\ +[/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\ [/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ \t\tden oppgitte datoen.\n\ \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -48,7 +48,7 @@ "XCOPY - kopiuje pliki lub drzewa katalogów\n\ \n\ Sk³adnia:\n\ -XCOPY ród³o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY ród³o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Gdzie:\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -51,12 +51,12 @@ "XCOPY - Êîïèðóåò ôàéëû è äåðåâüÿ ïàïîê\n\ \n\ Ñèíòàêñèñ:\n\ -XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Ãäå:\n\ \n\ -[/I] Åñëè êîíå÷íàÿ ïàïêà îòñóòñòâóåò è êîïèðóåòñÿ áîëåå îäíîãî ôàéëà, \n\ +[/I] Åñëè êîíå÷íàÿ ïàïêà îòñóòñòâóåò è êîïèðóåòñÿ áîëåå îäíîãî ôàéëà,\n\ òî ïðåäïîëàãàåòñÿ ïàïêà â êà÷åñòâå ìåñòà íàçíà÷åíèÿ.\n\ [/S] Êîïèðóåò ïàïêè è ïîäïàïêè.\n\ [/E] Êîïèðóåò ïàïêè è ïîäïàïêè, âêëþ÷àÿ ïóñòûå.\n\ @@ -73,7 +73,7 @@ [/R] Ïåðåçàïèñûâàåò ôàéëû, äîñòóïíûå òîëüêî äëÿ ÷òåíèÿ.\n\ [/H] Êîïèðóåò ñêðûòûå è ñèñòåìíûå ôàéëû.\n\ [/C] Ïðîäîëæàåò ðàáîòó, äàæå åñëè ïðîèçîøëà îøèáêà.\n\ -[/A] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\". \n\ +[/A] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\".\n\ [/M] Êîïèðóåò òîëüêî òå ôàéëû, äëÿ êîòîðûõ óñòàíîâëåí àòðèáóò \"àðõèâíûé\",\n\ ïðè ýòîì àòðèáóò óäàëÿåòñÿ.\n\ [/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\ Modified: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -30,7 +30,7 @@ STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n" STRING_SIMCOPY, "Prekopiral bom %d datotek\n" STRING_COPY, "Prekopiral sem %d datotek\n" - STRING_QISDIR, "Ali je '%s' ime ciljne datoteke \n" \ + STRING_QISDIR, "Ali je '%s' ime ciljne datoteke\n" \ "ali mape?\n" \ "(D - Datoteka, M - Mapa)\n" STRING_SRCPROMPT,"%s? (Da|Ne)\n" @@ -48,12 +48,12 @@ "XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\ \n\ Sintaksa:\n\ -XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ Where:\n\ \n\ -[/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi, \n\ +[/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi,\n\ \da je cilj mapa\n\ [/S] Kopiraj mape in podmape\n\ [/E] Kopiraj mape in podmape, vkljuÄno s praznimi mapami\n\ Modified: trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/bg-BG.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -38,6 +38,22 @@ POPUP "&Îòìåòêè" { MENUITEM "&Çàäàé...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Ïîìîù" { MENUITEM "Ïîìîù &çà ïîìîùòà", MNID_HELP_HELPON MENUITEM "Âèíàãè îò&ãîðå", MNID_HELP_HELPTOP @@ -61,7 +77,6 @@ STID_CONTENTS, "&Ñúäúðæàíèå" STID_SEARCH, "&Òúðñè" STID_BACK, "&Íàçàä" -STID_HISTORY, "&Èñòîðèÿ" STID_TOPICS, "&Òåìè" STID_ALL_FILES, "Âñè÷êè ôàéëîâå (*.*)" STID_HELP_FILES_HLP, "Ïîìîùíè ôàéëîâå (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/cs-CZ.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -43,6 +43,22 @@ POPUP "&Záloka" { MENUITEM "Pøi&dat...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Nápovìda" { MENUITEM "Náp&ovìda k nápovìdì", MNID_HELP_HELPON MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP @@ -66,7 +82,6 @@ STID_CONTENTS, "&Obsah" STID_SEARCH, "&Hledat" STID_BACK, "&Zpìt" -STID_HISTORY, "&Historie" STID_TOPICS, "&Témata" STID_ALL_FILES, "Vechny soubory (*.*)" STID_HELP_FILES_HLP, "Soubory nápovìdy (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/da-DK.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -40,6 +40,22 @@ POPUP "Bog&mærke" { MENUITEM "&Definer...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Hjælp" { MENUITEM "&Brug af Hjælp", MNID_HELP_HELPON MENUITEM "Altid &øverst", MNID_HELP_HELPTOP @@ -73,7 +89,6 @@ STID_CONTENTS, "&Indhold" STID_SEARCH, "&Søg" STID_BACK, "&Tilbage" -STID_HISTORY, "&Oversigt" STID_TOPICS, "&Emner" STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjælpe filer (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/de-DE.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -39,6 +39,22 @@ POPUP "&Lesezeichen" { MENUITEM "&Definieren...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Hilfe" { MENUITEM "&Hilfe benutzen", MNID_HELP_HELPON MENUITEM "Immer im &Vordergrund", MNID_HELP_HELPTOP @@ -73,7 +89,6 @@ STID_CONTENTS, "&Inhalt" STID_SEARCH, "&Suchen" STID_BACK, "&Zurück" -STID_HISTORY, "&Chronik" STID_TOPICS, "&Themen" STID_ALL_FILES, "Alle Dateien (*.*)" STID_HELP_FILES_HLP, "Hilfe-Dateien (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/el-GR.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -69,7 +69,6 @@ STID_CONTENTS, "&Ðåñéå÷üìåíá" STID_SEARCH, "&ÁíáæÞôçóç" STID_BACK, "&Ðñïçãïýìåíï" -STID_HISTORY, "&Éóôïñéêü" STID_TOPICS, "&ÈÝìáôá" STID_ALL_FILES, "¼ëá ôá áñ÷åßá (*.*)" STID_HELP_FILES_HLP, "Áñ÷åßá âïÞèåéáò (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/en-US.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -39,6 +39,22 @@ POPUP "&Bookmark" { MENUITEM "&Define...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Help" { MENUITEM "Help &on help", MNID_HELP_HELPON MENUITEM "Always on &top", MNID_HELP_HELPTOP @@ -72,7 +88,6 @@ STID_CONTENTS, "&Contents" STID_SEARCH, "&Search" STID_BACK, "&Back" -STID_HISTORY, "&History" STID_TOPICS, "&Topics" STID_ALL_FILES, "All files (*.*)" STID_HELP_FILES_HLP, "Help files (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/eo-EO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/eo-EO.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -41,6 +41,22 @@ POPUP "&Legosigno" { MENUITEM "&Difinu...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Helpo" { MENUITEM "&Helpu pri helpo", MNID_HELP_HELPON MENUITEM "Æiam &supre", MNID_HELP_HELPTOP @@ -64,7 +80,6 @@ STID_CONTENTS, "&Enhavo" STID_SEARCH, "&Seræu" STID_BACK, "&Retro" -STID_HISTORY, "Krono&logio" STID_TOPICS, "&Temoj" STID_ALL_FILES, "Tutaj dosieroj (*.*)" STID_HELP_FILES_HLP, "Helpaj dosieroj (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/es-ES.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -40,6 +40,22 @@ POPUP "&Marcador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "A&yuda" { MENUITEM "&Ayuda sobre la ayuda", MNID_HELP_HELPON MENUITEM "&Siempre visible", MNID_HELP_HELPTOP @@ -63,7 +79,6 @@ STID_CONTENTS, "&Índice" STID_SEARCH, "&Buscar" STID_BACK, "&Anterior" -STID_HISTORY, "&Historial" STID_TOPICS, "&Temas" STID_ALL_FILES, "Todos los archivos (*.*)" STID_HELP_FILES_HLP, "Archivos de ayuda (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/fi-FI.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -40,6 +40,22 @@ POPUP "&Kirjanmerkki" { MENUITEM "&Aseta...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Ohje" { MENUITEM "&Ohjeen käyttö", MNID_HELP_HELPON MENUITEM "&Aina päällimmäisenä", MNID_HELP_HELPTOP @@ -64,7 +80,6 @@ STID_CONTENTS, "&Sisällys" STID_SEARCH, "&Etsi" STID_BACK, "&Takaisin" -STID_HISTORY, "&Luetut" STID_TOPICS, "T&opics" STID_ALL_FILES, "Kaikki tiedostot (*.*)" STID_HELP_FILES_HLP, "Ohjetiedostot (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/fr-FR.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -42,6 +42,22 @@ POPUP "&Signet" { MENUITEM "&Définir...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Aide toujours visible" + BEGIN + MENUITEM "Par défaut", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "Historique", MNID_OPTS_HISTORY + POPUP "Polices" + BEGIN + MENUITEM "Petite", MNID_OPTS_FONTS_SMALL + MENUITEM "Normale", MNID_OPTS_FONTS_NORMAL + MENUITEM "Grande", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Utiliser les couleurs système", MNID_OPTS_SYSTEM_COLORS +} POPUP "Aid&e" { MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON MENUITEM "&Toujours visible", MNID_HELP_HELPTOP @@ -75,7 +91,6 @@ STID_CONTENTS, "&Index" STID_SEARCH, "&Rechercher" STID_BACK, "&Précédent" -STID_HISTORY, "&Historique" STID_TOPICS, "&Sujets" STID_ALL_FILES, "Tous fichiers (*.*)" STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/hu-HU.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -40,6 +40,22 @@ POPUP "&Könyvjelzõ" { MENUITEM "&Definiálás...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Súgó" { MENUITEM "&Használat", MNID_HELP_HELPON MENUITEM "Mindig &legfelül", MNID_HELP_HELPTOP @@ -64,7 +80,6 @@ STID_CONTENTS, "&Tartalom" STID_SEARCH, "&Keresés" STID_BACK, "&Vissza" -STID_HISTORY, "&Elõzmény" STID_TOPICS, "&Témakörök" STID_ALL_FILES, "Minden fájl (*.*)" STID_HELP_FILES_HLP, "Súgó fájlok (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/it-IT.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -39,6 +39,22 @@ POPUP "&Segnalibro" { MENUITEM "&Definisci...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&?" { MENUITEM "&Aiuto sulla guida", MNID_HELP_HELPON MENUITEM "Sempre in primo &piano", MNID_HELP_HELPTOP @@ -63,7 +79,6 @@ STID_CONTENTS, "&Sommario" STID_SEARCH, "&Trova" STID_BACK, "&Precedente" -STID_HISTORY, "&Cronologia" STID_TOPICS, "&Argomenti" STID_ALL_FILES, "Tutti i file (*.*)" STID_HELP_FILES_HLP, "File della Guida (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ko-KR.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -39,6 +39,22 @@ POPUP "Ã¥°¥ÇÇ(&B)" { MENUITEM "Á¤ÀÇ(&D)...", MNID_BKMK_DEFINE } + POPUP "¿É¼Ç(&O)" { + POPUP "°¡´ÉÇÑ µµ¿ò¸» º¸ÀÌ±â" + BEGIN + MENUITEM "±âº»", MNID_OPTS_HELP_DEFAULT + MENUITEM "º¸ÀÌ±â", MNID_OPTS_HELP_VISIBLE + MENUITEM "º¸¿©ÁÖÁö ¾Ê±â", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "±â·Ï", MNID_OPTS_HISTORY + POPUP "±Û²Ã" + BEGIN + MENUITEM "ÀÛ°Ô", MNID_OPTS_FONTS_SMALL + MENUITEM "º¸Åë", MNID_OPTS_FONTS_NORMAL + MENUITEM "Å©°Ô", MNID_OPTS_FONTS_LARGE + END + MENUITEM "½Ã½ºÅÛ »ö»ó »ç¿ë", MNID_OPTS_SYSTEM_COLORS + } POPUP "µµ¿ò¸»(&H)" { MENUITEM "µµ¿ò¸» »ç¿ë¹ý(&O)", MNID_HELP_HELPON MENUITEM "Ç×»ó À§(&T)", MNID_HELP_HELPTOP @@ -75,7 +91,6 @@ STID_CONTENTS, "¸ñÂ÷(&C)" STID_SEARCH, "Ã£±â(&S)" STID_BACK, "µÚ·Î(&B)" -STID_HISTORY, "È÷½ºÅä¸®(&H)" STID_TOPICS, "¸ñÂ÷(&T)" STID_ALL_FILES, "¸ðµç ÆÄÀÏ (*.*)" STID_HELP_FILES_HLP, "µµ¿ò¸» ÆÄÀÏ (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/lt-LT.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -71,7 +71,6 @@ STID_CONTENTS, "&Turinys" STID_SEARCH, "&Paieðka" STID_BACK, "&Atgal" -STID_HISTORY, "&Istorija" STID_TOPICS, "&Temos" STID_ALL_FILES, "Visos bylos (*.*)" STID_HELP_FILES_HLP, "Pagalbos bylos (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/nb-NO.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -38,6 +38,22 @@ POPUP "&Bokmerke" { MENUITEM "&Definer...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Hjelp" { MENUITEM "&Hjelp til Hjelp", MNID_HELP_HELPON MENUITEM "All&tid øverst", MNID_HELP_HELPTOP @@ -71,7 +87,6 @@ STID_CONTENTS, "&Innhold" STID_SEARCH, "&Søk" STID_BACK, "Til&bake" -STID_HISTORY, "&Historikk" STID_TOPICS, "&Emner" STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hjelp-filer (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/nl-NL.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -39,6 +39,22 @@ POPUP "&Favorieten" { MENUITEM "&Aanmaken...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Help" { MENUITEM "Hulp &bij help", MNID_HELP_HELPON MENUITEM "Altijd &zichtbaar", MNID_HELP_HELPTOP @@ -72,7 +88,6 @@ STID_CONTENTS, "&Inhoud" STID_SEARCH, "&Zoeken" STID_BACK, "&Terug" -STID_HISTORY, "&Geschiedenis" STID_TOPICS, "&Onderwerpen" STID_ALL_FILES, "Alle bestanden (*.*)" STID_HELP_FILES_HLP, "Helpbestanden (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/pl-PL.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -40,6 +40,22 @@ POPUP "&Zak³adka" { MENUITEM "&Zdefiniuj...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "Pomo&c" { MENUITEM "&Pomoc", MNID_HELP_HELPON MENUITEM "&Zawsze na wierzchu", MNID_HELP_HELPTOP @@ -73,12 +89,11 @@ STID_CONTENTS, "&Zawartoæ" STID_SEARCH, "&Szukaj" STID_BACK, "&Wstecz" -STID_HISTORY, "&Historia" STID_TOPICS, "&Tematy" STID_ALL_FILES, "Wszystkie pliki (*.*)" STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_FILE_NOT_FOUND_s "Nie znaleziono pliku '%s'. Czy chcesz poszukaæ tego pliku samodzielnie?" +STID_NO_RICHEDIT "Nie uda³o siê znaleæ modu³u richedit... Wywietlenie pomocy nie jest mo¿liwe" } Modified: trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/pt-BR.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -45,6 +45,22 @@ POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON MENUITEM "Sempre &visível", MNID_HELP_HELPTOP @@ -76,6 +92,22 @@ POPUP "In&dicador" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "Aj&uda" { MENUITEM "Ajuda &na ajuda", MNID_HELP_HELPON MENUITEM "Sempre &visível", MNID_HELP_HELPTOP @@ -102,7 +134,6 @@ STID_CONTENTS, "&Conteúdo" STID_SEARCH, "&Procurar" STID_BACK, "&Voltar" -STID_HISTORY, "&Histórico" STID_TOPICS, "&Tópicos" STID_ALL_FILES, "Todos os arquivos (*.*)" STID_HELP_FILES_HLP, "Arquivos de ajuda (*.hlp)" @@ -123,7 +154,6 @@ STID_CONTENTS, "&Conteúdo" STID_SEARCH, "&Procurar" STID_BACK, "&Voltar" -STID_HISTORY, "&Histórico" STID_TOPICS, "&Tópicos" STID_ALL_FILES, "Todos os ficheiros (*.*)" STID_HELP_FILES_HLP, "Ficheiros de ajuda (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/rm-RM.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -43,6 +43,22 @@ POPUP "&Marca" { MENUITEM "&Definir...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Agï¿½d" { MENUITEM "&Douvrar l'agï¿½d", MNID_HELP_HELPON MENUITEM "Adï¿½na da&vant", MNID_HELP_HELPTOP @@ -66,7 +82,6 @@ STID_CONTENTS, "&Cuntgnï¿½" STID_SEARCH, "&Tscherchar" STID_BACK, "&Inavo" -STID_HISTORY, "&Fin qua" STID_TOPICS, "T&opics" STID_ALL_FILES, "Tuot las datotecas (*.*)" STID_HELP_FILES_HLP, "Datotecas d'agï¿½d (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/ru-RU.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -38,6 +38,22 @@ POPUP "&Çàêëàäêà" { MENUITEM "&Îïðåäåëèòü...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Ñïðàâêà" { MENUITEM "Ïîìîùü &ïî ïîìîùè", MNID_HELP_HELPON MENUITEM "Âñåãäà &ñâåðõó", MNID_HELP_HELPTOP @@ -71,7 +87,6 @@ STID_CONTENTS, "&Ñîäåðæàíèå" STID_SEARCH, "&Íàéòè" STID_BACK, "&Íàçàä" -STID_HISTORY, "&Èñòîðèÿ" STID_TOPICS, "&Óêàçàòåëü" STID_ALL_FILES, "Âñå ôàéëû (*.*)" STID_HELP_FILES_HLP, "Ôàéëû ñïðàâêè (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sk-SK.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -36,6 +36,22 @@ POPUP "&Záloka" { MENUITEM "&Definova...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Pomoc" { MENUITEM "Pomoc &na pomoci", MNID_HELP_HELPON MENUITEM "Vdy na &vrchu", MNID_HELP_HELPTOP @@ -59,7 +75,6 @@ STID_CONTENTS, "&Obsah" STID_SEARCH, "&H¾ada" STID_BACK, "&Spä" -STID_HISTORY, "&História" STID_TOPICS, "&Topics" STID_ALL_FILES, "Vetky súbory (*.*)" STID_HELP_FILES_HLP, "Súbory pomoci (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sl-SI.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -40,7 +40,23 @@ POPUP "&Zaznamki" { MENUITEM "Do&loÄi ...", MNID_BKMK_DEFINE } - POPUP "&PomoÄ" { + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } + POPUP "&PomoÄ" { MENUITEM "&O pomoÄi", MNID_HELP_HELPON MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP MENUITEM SEPARATOR @@ -73,7 +89,6 @@ STID_CONTENTS, "&Teme pomoÄi" STID_SEARCH, "&Iskanje" STID_BACK, "&Nazaj" -STID_HISTORY, "&Zgodovina" STID_TOPICS, "&Vsebina" STID_ALL_FILES, "Vse datoteke (*.*)" STID_HELP_FILES_HLP, "Datoteke s pomoÄjo (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/sv-SE.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -41,6 +41,22 @@ POPUP "&BokmÃ¤rke" { MENUITEM "&Definiera...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&HjÃ¤lp" { MENUITEM "HjÃ¤lp &fÃ¶r hjÃ¤lp", MNID_HELP_HELPON MENUITEM "Alltid &Ã¶verst", MNID_HELP_HELPTOP @@ -64,7 +80,6 @@ STID_CONTENTS, "&InnehÃ¥ll" STID_SEARCH, "&SÃ¶k" STID_BACK, "&BakÃ¥t" -STID_HISTORY, "&Historik" STID_TOPICS, "&Ãmnen" STID_ALL_FILES, "Alla filer (*.*)" STID_HELP_FILES_HLP, "HjÃ¤lpfiler (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/tr-TR.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -38,6 +38,22 @@ POPUP "Yer Ý&mleri" { MENUITEM "&Tanýmla...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Yardým" { MENUITEM "&Yardým Kullanýmý", MNID_HELP_HELPON MENUITEM "&Her Zaman Üstte", MNID_HELP_HELPTOP @@ -61,7 +77,6 @@ STID_CONTENTS, "&Ýçindekiler" STID_SEARCH, "&Ara" STID_BACK, "&Geri" -STID_HISTORY, "Ge&çmiþ" STID_TOPICS, "&Konular" STID_ALL_FILES, "Tüm dosyalar (*.*)" STID_HELP_FILES_HLP, "Yardým dosyalarý (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/uk-UA.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -56,7 +56,6 @@ STID_CONTENTS, "&Çì³ñò" STID_SEARCH, "&Ïîøóê" STID_BACK, "&Íàçàä" -STID_HISTORY, "&²ñòîð³ÿ" STID_TOPICS, "&Ðîçä³ëè" STID_ALL_FILES, "Âñ³ ôàéëè (*.*)" STID_HELP_FILES_HLP, "Ôàéëè äîïîìîãè (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/wa-WA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/wa-WA.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -42,6 +42,22 @@ POPUP "&Rimårkes" { MENUITEM "&Defini...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "&Aide" { MENUITEM "&Aide so l' Aide", MNID_HELP_HELPON MENUITEM "Todi &Visibe", MNID_HELP_HELPTOP @@ -66,7 +82,6 @@ STID_CONTENTS, "Å&dvins" STID_SEARCH, "C&werî" STID_BACK, "Èn &Erî" -STID_HISTORY, "&Istwere" STID_TOPICS, "&Topics" STID_ALL_FILES, "Tos les fitchîs (*.*)" STID_HELP_FILES_HLP, "Fitchîs d' aide (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/zh-CN.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -39,6 +39,22 @@ POPUP "ÊéÇ©£¨&B£©" { MENUITEM "¶¨Òå£¨&D£©...", MNID_BKMK_DEFINE } + POPUP "&Options" { + POPUP "Help always visible" + BEGIN + MENUITEM "Default", MNID_OPTS_HELP_DEFAULT + MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE + MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + END + MENUITEM "History", MNID_OPTS_HISTORY + POPUP "Fonts" + BEGIN + MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL + MENUITEM "Large", MNID_OPTS_FONTS_LARGE + END + MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + } POPUP "°ïÖú£¨&H£©" { MENUITEM "ÈçºÎÊ¹ÓÃ°ïÖú£¨&O£©", MNID_HELP_HELPON MENUITEM "×ÜÊÇÔÚ×îÇ°Ãæ£¨&T£©", MNID_HELP_HELPTOP @@ -62,7 +78,6 @@ STID_CONTENTS, "ÄÚÈÝ£¨&C£©" STID_SEARCH, "ËÑË÷£¨&S£©" STID_BACK, "·µ»Ø£¨&B£©" -STID_HISTORY, "ÀúÊ·£¨&H£©" STID_TOPICS, "Ö÷Ìâ£¨&T£©" STID_ALL_FILES, "ËùÓÐÎÄ¼þ (*.*)" STID_HELP_FILES_HLP, "°ïÖúÎÄ¼þ (*.hlp)" Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -376,6 +376,13 @@ WORD ofsData; } WINHELP,*LPWINHELP; +static BOOL WINHELP_HasWorkingWindow(void) +{ + if (!Globals.active_win) return FALSE; + if (Globals.active_win->next || Globals.win_list != Globals.active_win) return TRUE; + return Globals.active_win->page != NULL && Globals.active_win->page->file != NULL; +} + /****************************************************************** * WINHELP_HandleCommand * @@ -407,6 +414,7 @@ { MACRO_JumpContext(ptr, "main", wh->data); } + if (!WINHELP_HasWorkingWindow()) MACRO_Exit(); break; case HELP_QUIT: MACRO_Exit(); @@ -416,9 +424,11 @@ { MACRO_JumpContents(ptr, "main"); } + if (!WINHELP_HasWorkingWindow()) MACRO_Exit(); break; case HELP_HELPONHELP: MACRO_HelpOn(); + if (!WINHELP_HasWorkingWindow()) MACRO_Exit(); break; /* case HELP_SETINDEX: */ case HELP_SETCONTENTS: @@ -618,8 +628,6 @@ LoadString(Globals.hInstance, STID_BACK, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_BACK", buffer, "Back()"); if (win->back.index <= 1) MACRO_DisableButton("BTN_BACK"); - LoadString(Globals.hInstance, STID_HISTORY, buffer, sizeof(buffer)); - MACRO_CreateButton("BTN_HISTORY", buffer, "History()"); LoadString(Globals.hInstance, STID_TOPICS, buffer, sizeof(buffer)); MACRO_CreateButton("BTN_TOPICS", buffer, "Finder()"); } @@ -868,6 +876,8 @@ case MNID_CTXT_ANNOTATE:MACRO_Annotate(); break; case MNID_CTXT_COPY: MACRO_CopyDialog(); break; case MNID_CTXT_PRINT: MACRO_Print(); break; + case MNID_OPTS_HISTORY: MACRO_History(); break; + case MNID_OPTS_FONTS_SMALL: case MNID_CTXT_FONTS_SMALL: win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); if (win->font_scale != 0) @@ -876,6 +886,7 @@ WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */); } break; + case MNID_OPTS_FONTS_NORMAL: case MNID_CTXT_FONTS_NORMAL: win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); if (win->font_scale != 1) @@ -884,6 +895,7 @@ WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */); } break; + case MNID_OPTS_FONTS_LARGE: case MNID_CTXT_FONTS_LARGE: win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); if (win->font_scale != 2) @@ -892,6 +904,10 @@ WINHELP_SetupText(GetDlgItem(hWnd, CTL_ID_TEXT), win, 0 /* FIXME */); } break; + case MNID_OPTS_HELP_DEFAULT: + case MNID_OPTS_HELP_VISIBLE: + case MNID_OPTS_HELP_NONVISIBLE: + case MNID_OPTS_SYSTEM_COLORS: case MNID_CTXT_HELP_DEFAULT: case MNID_CTXT_HELP_VISIBLE: case MNID_CTXT_HELP_NONVISIBLE: @@ -1028,6 +1044,16 @@ } break; + case WM_INITMENUPOPUP: + win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL, + MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0); + CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL, + MF_BYCOMMAND | (win->font_scale == 1) ? MF_CHECKED : 0); + CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_LARGE, + MF_BYCOMMAND | (win->font_scale == 2) ? MF_CHECKED : 0); + break; + case WM_NCDESTROY: { BOOL bExit; Modified: trunk/reactos/base/applications/winhlp32/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp_res.h [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -8,10 +8,19 @@ #define MNID_BKMK_DEFINE 0x121 -#define MNID_HELP_HELPON 0x131 -#define MNID_HELP_HELPTOP 0x132 -#define MNID_HELP_ABOUT 0x141 -#define MNID_HELP_WINE 0x142 +#define MNID_OPTS_HELP_DEFAULT 0x131 +#define MNID_OPTS_HELP_VISIBLE 0x132 +#define MNID_OPTS_HELP_NONVISIBLE 0x133 +#define MNID_OPTS_HISTORY 0x134 +#define MNID_OPTS_FONTS_SMALL 0x135 +#define MNID_OPTS_FONTS_NORMAL 0x136 +#define MNID_OPTS_FONTS_LARGE 0x137 +#define MNID_OPTS_SYSTEM_COLORS 0x138 + +#define MNID_HELP_HELPON 0x141 +#define MNID_HELP_HELPTOP 0x142 +#define MNID_HELP_ABOUT 0x143 +#define MNID_HELP_WINE 0x144 #define MNID_CTXT_ANNOTATE 0x200 #define MNID_CTXT_COPY 0x201 @@ -36,7 +45,6 @@ #define STID_CONTENTS 0x126 #define STID_SEARCH 0x127 #define STID_BACK 0x128 -#define STID_HISTORY 0x129 #define STID_TOPICS 0x12A #define STID_ALL_FILES 0x12B #define STID_HELP_FILES_HLP 0x12C Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -23,13 +23,13 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW - MENUITEM "&Åben ...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Åben...\tCtrl+O", ID_FILE_OPEN MENUITEM "&Gemme\tCtrl+S", ID_FILE_SAVE - MENUITEM "Gemme &som ...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Udskriv ...\tCtrl+P", ID_PRINT - MENUITEM "&Forhåndsvisning ...", ID_PREVIEW - MENUITEM "&Side indstillinger ...", ID_PRINTSETUP + MENUITEM "Gemme &som...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Udskriv...\tCtrl+P", ID_PRINT + MENUITEM "&Forhåndsvisning...", ID_PREVIEW + MENUITEM "&Side indstillinger...", ID_PRINTSETUP MENUITEM SEPARATOR MENUITEM "&Afslut", ID_FILE_EXIT END @@ -44,9 +44,9 @@ MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR MENUITEM "&Marker alt\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Søg efter ...\tCrtl+F", ID_FIND + MENUITEM "&Søg efter...\tCrtl+F", ID_FIND MENUITEM "Søg efter &næste\tF3", ID_FIND_NEXT - MENUITEM "E&rstat ...\tCtrl+H", ID_REPLACE + MENUITEM "E&rstat...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY MENUITEM "Æ&ndret", ID_EDIT_MODIFIED @@ -67,18 +67,18 @@ MENUITEM "&Lineal", ID_TOGGLE_RULER MENUITEM "&Statuslinie", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&Alternativer ...", ID_VIEWPROPERTIES + MENUITEM "&Alternativer...", ID_VIEWPROPERTIES END POPUP "&Indsæt" BEGIN - MENUITEM "&Dato og tid ...", ID_DATETIME + MENUITEM "&Dato og tid...", ID_DATETIME END POPUP "F&ormat" BEGIN - MENUITEM "&Skrifttype ...", ID_FONTSETTINGS + MENUITEM "&Skrifttype...", ID_FONTSETTINGS MENUITEM "&Bullets" ID_BULLET - MENUITEM "&Afsnit ..." ID_PARAFORMAT - MENUITEM "&Tabulatorer ..." ID_TABSTOPS + MENUITEM "&Afsnit..." ID_PARAFORMAT + MENUITEM "&Tabulatorer..." ID_TABSTOPS POPUP "&Baggrund" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -100,7 +100,7 @@ MENUITEM "&Indsæt" ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "&Bullets" ID_BULLET - MENUITEM "&Afsnit ..." ID_PARAFORMAT + MENUITEM "&Afsnit..." ID_PARAFORMAT END END @@ -139,7 +139,7 @@ LTEXT "Første linie", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 END 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "Erste Zeile", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Ausrichtung", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "A&bbrechen", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Annuler", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -141,7 +141,7 @@ LTEXT "Ã¹Â° ÁÙ", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Á¤·Ä", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "È®ÀÎ(&O)", IDOK, 137, 15, 50, 15 PUSHBUTTON "Ãë¼Ò(&C)", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "Første linje", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Justering", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -140,7 +140,7 @@ LTEXT "Pierwszy wiersz", 0, 15, 55, 40, 19 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Wyrównanie", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Anuluj", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -139,7 +139,7 @@ LTEXT "Ïåðâàÿ ñòðîêà", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Âûðàâíèâàíèå", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15 PUSHBUTTON "Î&òìåíà", IDCANCEL, 137, 33, 50, 15 END Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -141,7 +141,7 @@ LTEXT "Prva vrstica", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Poravnava", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15 PUSHBUTTON "&PrekliÄi", IDCANCEL, 137, 33, 50, 15 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 Jun 26 01:12:44 2008 @@ -141,7 +141,7 @@ LTEXT "First line", 0, 15, 58, 40, 13 EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 LTEXT "Alignment", 0, 15, 87, 40, 13 - COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 PUSHBUTTON "&Cancel", IDCANCEL, 137, 33, 50, 15 END Modified: trunk/reactos/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Thu Jun 26 01:12:44 2008 @@ -285,7 +285,7 @@ pFiles[0] = newFile; } else { - for(i = 0; pFiles[i] && i < FILELIST_ENTRIES-1; i++) + for(i = 0; i < FILELIST_ENTRIES-1; i++) pFiles[FILELIST_ENTRIES-1-i] = pFiles[FILELIST_ENTRIES-2-i]; pFiles[0] = newFile; 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 Jun 26 01:12:44 2008 @@ -219,20 +219,22 @@ static BOOL validate_endptr(LPCSTR endptr, BOOL units) { - if(!endptr || !*endptr) + if(!endptr) + return FALSE; + if(!*endptr) return TRUE; while(*endptr == ' ') endptr++; if(!units) - return *endptr != '\0'; + return *endptr == '\0'; /* FIXME: Allow other units and convert between them */ if(!lstrcmpA(endptr, units_cmA)) endptr += 2; - return *endptr != '\0'; + return *endptr == '\0'; } static BOOL number_from_string(LPCWSTR string, float *num, BOOL units) @@ -246,7 +248,7 @@ errno = 0; ret = strtod(buffer, &endptr); - if((ret == 0 && errno != 0) || endptr == buffer || validate_endptr(endptr, units)) + if((ret == 0 && errno != 0) || endptr == buffer || !validate_endptr(endptr, units)) { return FALSE; } else @@ -265,6 +267,32 @@ fmt.dwMask = CFM_SIZE; fmt.yHeight = (int)(size * 20.0); SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); +} + +static void on_sizelist_modified(HWND hwndSizeList, LPWSTR wszNewFontSize) +{ + WCHAR sizeBuffer[MAX_STRING_LEN]; + CHARFORMAT2W format; + + ZeroMemory(&format, sizeof(format)); + format.cbSize = sizeof(format); + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); + + wsprintfW(sizeBuffer, stringFormat, format.yHeight / 20); + if(lstrcmpW(sizeBuffer, wszNewFontSize)) + { + float size = 0; + if(number_from_string((LPCWSTR) wszNewFontSize, &size, FALSE) + && size > 0) + { + set_size(size); + } else + { + SetWindowTextW(hwndSizeList, sizeBuffer); + MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), + wszAppTitle, MB_OK | MB_ICONINFORMATION); + } + } } static void add_size(HWND hSizeListWnd, unsigned size) @@ -437,6 +465,17 @@ lstrcpyW(fmt.szFaceName, font); SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); +} + +static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName) +{ + CHARFORMAT2W format; + ZeroMemory(&format, sizeof(format)); + format.cbSize = sizeof(format); + SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); + + if(lstrcmpW(format.szFaceName, wszNewFaceName)) + set_font((LPCWSTR) wszNewFaceName); } static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, NEWTEXTMETRICEXW *ntmc) @@ -1215,6 +1254,45 @@ MultiByteToWideChar(CP_ACP, 0, string, -1, buffer, MAX_STRING_LEN); } +static BOOL get_comboexlist_selection(HWND hComboEx, LPWSTR wszBuffer, UINT bufferLength) +{ + HANDLE hHeap; + COMBOBOXEXITEM cbItem; + COMBOBOXINFO cbInfo; + HWND hCombo, hList; + int idx, result; + char *szBuffer; + hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + if (!hCombo) + return FALSE; + cbInfo.cbSize = sizeof(COMBOBOXINFO); + result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + if (!result) + return FALSE; + hList = cbInfo.hwndList; + idx = SendMessage(hList, LB_GETCURSEL, 0, 0); + if (idx < 0) + return FALSE; + + hHeap = GetProcessHeap(); + szBuffer = HeapAlloc(hHeap, HEAP_ZERO_MEMORY, bufferLength); + ZeroMemory(&cbItem, sizeof(cbItem)); + cbItem.mask = CBEIF_TEXT; + cbItem.iItem = idx; + cbItem.pszText = szBuffer; + cbItem.cchTextMax = bufferLength-1; + result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); + if (!result) + { + HeapFree(hHeap, 0, szBuffer); + return FALSE; + } + + result = MultiByteToWideChar(CP_ACP, 0, szBuffer, -1, wszBuffer, bufferLength); + HeapFree(hHeap, 0, szBuffer); + return result != 0; +} + static INT_PTR CALLBACK datetime_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch(message) @@ -1311,6 +1389,8 @@ static INT_PTR CALLBACK paraformat_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { + static const WORD ALIGNMENT_VALUES[] = {PFA_LEFT, PFA_RIGHT, PFA_CENTER}; + switch(message) { case WM_INITDIALOG: @@ -1337,7 +1417,7 @@ pf.cbSize = sizeof(pf); pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | - PFM_OFFSETINDENT; + PFM_STARTINDENT; SendMessageW(hEditorWnd, EM_GETPARAFORMAT, 0, (LPARAM)&pf); if(pf.wAlignment == PFA_RIGHT) @@ -1347,11 +1427,11 @@ SendMessageW(hListWnd, CB_SETCURSEL, index, 0); - number_with_units(buffer, pf.dxOffset); + number_with_units(buffer, pf.dxStartIndent + pf.dxOffset); SetWindowTextW(hLeftWnd, buffer); number_with_units(buffer, pf.dxRightIndent); SetWindowTextW(hRightWnd, buffer); - number_with_units(buffer, pf.dxStartIndent - pf.dxOffset); + number_with_units(buffer, -pf.dxOffset); SetWindowTextW(hFirstWnd, buffer); } break; @@ -1361,13 +1441,18 @@ { case IDOK: { + HWND hListWnd = GetDlgItem(hWnd, IDC_PARA_ALIGN); HWND hLeftWnd = GetDlgItem(hWnd, IDC_PARA_LEFT); HWND hRightWnd = GetDlgItem(hWnd, IDC_PARA_RIGHT); HWND hFirstWnd = GetDlgItem(hWnd, IDC_PARA_FIRST); WCHAR buffer[MAX_STRING_LEN]; + int index; float num; int ret = 0; PARAFORMAT pf; + + index = SendMessageW(hListWnd, CB_GETCURSEL, 0, 0); + pf.wAlignment = ALIGNMENT_VALUES[index]; GetWindowTextW(hLeftWnd, buffer, MAX_STRING_LEN); if(number_from_string(buffer, &num, TRUE)) @@ -1389,9 +1474,31 @@ return FALSE; } else { + if (pf.dxOffset + pf.dxStartIndent < 0 + && pf.dxStartIndent < 0) + { + /* The first line is before the left edge, so + * make sure it is at the left edge. */ + pf.dxOffset = -pf.dxStartIndent; + } else if (pf.dxOffset < 0) { + /* The second and following lines are before + * the left edge, so set it to be at the left + * edge, and adjust the first line since it + * is relative to it. */ + pf.dxStartIndent = max(pf.dxStartIndent + pf.dxOffset, 0); + pf.dxOffset = 0; + } + /* Internally the dxStartIndent is the absolute + * offset for the first line and dxOffset is + * to it value as opposed how it is displayed with + * the first line being the relative value. + * These two lines make the adjustments. */ pf.dxStartIndent = pf.dxStartIndent + pf.dxOffset; + pf.dxOffset = pf.dxOffset - pf.dxStartIndent; + pf.cbSize = sizeof(pf); - pf.dwMask = PFM_OFFSET | PFM_OFFSETINDENT | PFM_RIGHTINDENT; + pf.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_RIGHTINDENT | + PFM_STARTINDENT; SendMessageW(hEditorWnd, EM_SETPARAFORMAT, 0, (LPARAM)&pf); } } @@ -1682,7 +1789,8 @@ } hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, - WS_CHILD|WS_VISIBLE|ECO_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN|WS_VSCROLL, + WS_CHILD|WS_VISIBLE|ES_SELECTIONBAR|ES_MULTILINE|ES_AUTOVSCROLL + |ES_WANTRETURN|WS_VSCROLL|ES_NOHIDESEL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL); if (!hEditorWnd) @@ -1771,38 +1879,18 @@ NMHDR *pHdr = (NMHDR *)lParam; HWND hwndFontList = GetDlgItem(hwndReBar, IDC_FONTLIST); HWND hwndSizeList = GetDlgItem(hwndReBar, IDC_SIZELIST); - WCHAR sizeBuffer[MAX_PATH]; if (pHdr->hwndFrom == hwndFontList || pHdr->hwndFrom == hwndSizeList) { if (pHdr->code == CBEN_ENDEDITW) { - CHARFORMAT2W format; NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; - - ZeroMemory(&format, sizeof(format)); - format.cbSize = sizeof(format); - SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&format); - if(pHdr->hwndFrom == hwndFontList) { - if(lstrcmpW(format.szFaceName, (LPWSTR)endEdit->szText)) - set_font((LPCWSTR) endEdit->szText); + on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - wsprintfW(sizeBuffer, stringFormat, format.yHeight / 20); - if(lstrcmpW(sizeBuffer, (LPWSTR)endEdit->szText)) - { - float size = 0; - if(number_from_string((LPWSTR)endEdit->szText, &size, FALSE)) - { - set_size(size); - } else - { - SetWindowTextW(hwndSizeList, sizeBuffer); - MessageBoxW(hMainWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER), wszAppTitle, MB_OK | MB_ICONINFORMATION); - } - } + on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText); } } return 0; @@ -2188,6 +2276,26 @@ case ID_VIEWPROPERTIES: dialog_viewproperties(); + break; + + case IDC_FONTLIST: + if (HIWORD(wParam) == CBN_SELENDOK) + { + WCHAR buffer[LF_FACESIZE]; + HWND hwndFontList = (HWND)lParam; + get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE); + on_fontlist_modified(hwndFontList, buffer); + } + break; + + case IDC_SIZELIST: + if (HIWORD(wParam) == CBN_SELENDOK) + { + WCHAR buffer[MAX_STRING_LEN+1]; + HWND hwndSizeList = (HWND)lParam; + get_comboexlist_selection(hwndSizeList, buffer, MAX_STRING_LEN+1); + on_sizelist_modified(hwndSizeList, buffer); + } break; default:

16 years, 2 months

[dreimer] 34089: Update write and winfile to wine 1.0 This gives us new Translations for write. (Norway, Netherlands, Russia, Slovak) and a updated Danish one for winfile.

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 26 01:10:28 2008 New Revision: 34089 URL: http://svn.reactos.org/svn/reactos?rev=34089&view=rev Log: Update write and winfile to wine 1.0 This gives us new Translations for write. (Norway, Netherlands, Russia, Slovak) and a updated Danish one for winfile. Added: trunk/rosapps/write/lang/nb-NO.rc (with props) trunk/rosapps/write/lang/nl-NL.rc (with props) trunk/rosapps/write/lang/ru-RU.rc (with props) trunk/rosapps/write/lang/sl-SI.rc (with props) Modified: trunk/rosapps/imagesoft/lang/sk-SK.rc trunk/rosapps/winfile/lang/da-DK.rc trunk/rosapps/winfile/winefile.c trunk/rosapps/write/lang/de-DE.rc trunk/rosapps/write/lang/en-US.rc trunk/rosapps/write/lang/fr-FR.rc trunk/rosapps/write/lang/ko-KR.rc trunk/rosapps/write/lang/pl-PL.rc trunk/rosapps/write/rsrc.rc Modified: trunk/rosapps/imagesoft/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/sk-SK.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/imagesoft/lang/sk-SK.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,5 +1,6 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 02-02-2008 +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 02-02-2008 + * LAST CHANGE: 21-06-2008 * ______________________________________________ * NOTE: this file is not fully translated */ @@ -16,79 +17,79 @@ BEGIN POPUP "&Súbor" BEGIN - MENUITEM "&Nový...", ID_NEW - MENUITEM "&Otvori...", ID_OPEN - MENUITEM SEPARATOR - MENUITEM "&Zatvori\tCtrl+F4", ID_CLOSE, GRAYED - MENUITEM "Zatvori &vetky", ID_CLOSEALL,GRAYED + MENUITEM "&Nový...", ID_NEW + MENUITEM "&Otvori...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Zatvori\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Zatvori &vetky", ID_CLOSEALL,GRAYED MENUITEM SEPARATOR MENUITEM "&Uloi", ID_SAVE, GRAYED - MENUITEM "Uloi &ako...", ID_SAVEAS, GRAYED - MENUITEM SEPARATOR - MENUITEM "Náh¾a&d pred tlaèou", ID_PRINTPRE,GRAYED - MENUITEM "&Tlaèi...", ID_PRINT, GRAYED - MENUITEM SEPARATOR - MENUITEM "V&lastnosti...", ID_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Skonèi\tAlt+F4", ID_EXIT + MENUITEM "Uloi &ako...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Náh¾a&d pred tlaèou", ID_PRINTPRE,GRAYED + MENUITEM "&Tlaèi...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "V&lastnosti...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Skonèi\tAlt+F4", ID_EXIT END POPUP "&Úpravy" BEGIN - MENUITEM "&Spä", ID_UNDO, GRAYED - MENUITEM "&Znova", ID_REDO, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Vystrihnú", ID_CUT, GRAYED - MENUITEM "&Kopírova", ID_COPY, GRAYED - MENUITEM "&Paste", ID_PASTE, GRAYED - MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Vy&bra vetko", ID_SELALL, GRAYED + MENUITEM "&Spä", ID_UNDO, GRAYED + MENUITEM "&Znova", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Vystrihnú", ID_CUT, GRAYED + MENUITEM "&Kopírova", ID_COPY, GRAYED + MENUITEM "&Paste", ID_PASTE, GRAYED + MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Vy&bra vetko", ID_SELALL, GRAYED END POPUP "&Zobrazi" BEGIN - MENUITEM "&Nástroje", ID_TOOLS - MENUITEM "&Farby", ID_COLOR - MENUITEM "&História", ID_HISTORY - MENUITEM "Stavový &riadok", ID_STATUSBAR + MENUITEM "&Nástroje", ID_TOOLS + MENUITEM "&Farby", ID_COLOR + MENUITEM "&História", ID_HISTORY + MENUITEM "Stavový &riadok", ID_STATUSBAR END POPUP "&Adjust" BEGIN - MENUITEM "Jas...", ID_BRIGHTNESS - MENUITEM "Kontrast...", ID_CONTRAST + MENUITEM "Jas...", ID_BRIGHTNESS + MENUITEM "Kontrast...", ID_CONTRAST MENUITEM "Odtieò/Nasýtenie...", -1, GRAYED POPUP "Color" BEGIN - MENUITEM "Èierna a biela" ID_BLACKANDWHITE - MENUITEM "Invertova farby" ID_INVERTCOLORS + MENUITEM "Èierna a biela" ID_BLACKANDWHITE + MENUITEM "Invertova farby" ID_INVERTCOLORS END MENUITEM SEPARATOR - MENUITEM "Rozmaza", ID_BLUR - MENUITEM "Zaostri", ID_SHARPEN + MENUITEM "Rozmaza", ID_BLUR + MENUITEM "Zaostri", ID_SHARPEN MENUITEM "Vyhladi hrany", -1, GRAYED - MENUITEM "Prida tieò", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "Image Size...", -1, GRAYED - MENUITEM "Preklopi", -1, GRAYED + MENUITEM "Prida tieò", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Image Size...", -1, GRAYED + MENUITEM "Preklopi", -1, GRAYED MENUITEM "Zrkadli", -1, GRAYED - MENUITEM "Otoèi", -1, GRAYED + MENUITEM "Otoèi", -1, GRAYED END POPUP "&Farby" BEGIN - MENUITEM "&Upravi farby...", ID_EDITCOLOURS + MENUITEM "&Upravi farby...", ID_EDITCOLOURS END POPUP "&Okná" BEGIN - MENUITEM "&Cascade", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT - MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE - MENUITEM SEPARATOR - MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT + MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT END POPUP "&Pomocník" BEGIN - MENUITEM "È&o je...", ID_ABOUT + MENUITEM "È&o je...", ID_ABOUT END END @@ -181,10 +182,10 @@ IDS_IMAGE_PALETTE "Paleta alebo 256 farieb (8 bitov)" IDS_IMAGE_TRUECOLOR "Pravé farby (24 bitov)" - IDS_UNIT_PIXELS "Pixels" - IDS_UNIT_CM "Cm" - IDS_UNIT_INCHES "Inches" - IDS_UNIT_DOTSCM "Dots / Cm" + IDS_UNIT_PIXELS "Pixely" + IDS_UNIT_CM "Centimetre" + IDS_UNIT_INCHES "Palce" + IDS_UNIT_DOTSCM "Body na cm" IDS_UNIT_DPI "DPI" IDS_UNIT_KB "%d KB" IDS_UNIT_MB "%d MB" @@ -221,20 +222,20 @@ IDS_HINT_PROP " Zobrazí vlastnosti aktívneho obrázka." IDS_HINT_EXIT " Ukonèí program." - IDS_HINT_TOOLS " Shows or hides the tools floating window." - IDS_HINT_COLORS " Shows or hides the colors floating window." - IDS_HINT_HISTORY " Shows or hides the history floating window." - IDS_HINT_STATUS " Shows or hides the status bar." + IDS_HINT_TOOLS " Zobrazí alebo skryje plávajúce okno nástrojov." + IDS_HINT_COLORS " Zobrazí alebo skryje plávajúce okno farieb." + IDS_HINT_HISTORY " Zobrazí alebo skryje plávajúce okno histórie." + IDS_HINT_STATUS " Zobrazí alebo skryje stavový riadok." IDS_HINT_CASCADE " Arrange windows so they overlap." IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." - IDS_HINT_NEXT " Activates the next window." - - IDS_HINT_SYS_RESTORE " Restores this window to normal size." - IDS_HINT_SYS_MOVE " Moves this window." - IDS_HINT_SYS_SIZE " Resizes this window." - IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." - IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." -END + IDS_HINT_NEXT " Aktivuje ïalie okno v poradí." + + IDS_HINT_SYS_RESTORE " Obnoví okno na normálnu ve¾kos." + IDS_HINT_SYS_MOVE " Premiestni okno." + IDS_HINT_SYS_SIZE " Zmení ve¾kos okna." + IDS_HINT_SYS_MINIMIZE " Zbalí okno do ve¾kosti ikony." + IDS_HINT_SYS_MAXIMIZE " Zväèsí okno tak, aby zaplnilo obrazovku." +END Modified: trunk/rosapps/winfile/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/lang/da-DK.rc?rev=… ============================================================================== --- trunk/rosapps/winfile/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/rosapps/winfile/lang/da-DK.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -27,23 +27,23 @@ { POPUP "&Fil" { MENUITEM "&Åben\tEnter", ID_ACTIVATE - MENUITEM "&Flyt ...\tF7", ID_FILE_MOVE - MENUITEM "&Kopier ...\tF8", ID_FILE_COPY - MENUITEM "&På klippebordet ...\tF9", 118 + MENUITEM "&Flyt...\tF7", ID_FILE_MOVE + MENUITEM "&Kopier...\tF8", ID_FILE_COPY + MENUITEM "&På klippebordet...\tF9", 118 MENUITEM "&Slet\tDel", ID_FILE_DELETE - MENUITEM "Omdøb ...", 109 - MENUITEM "&Egenskaper ...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "K&omprimer ...", 119 - MENUITEM "De&komprimer ...", 120 - MENUITEM SEPARATOR - MENUITEM "Kø&r ...", ID_EXECUTE - MENUITEM "&Udskriv ...", 102 - MENUITEM "Associer ...", 103 - MENUITEM SEPARATOR - MENUITEM "Opr&et folder ...", 111 - MENUITEM "S&øg ...", 104 - MENUITEM "&Vælg filer ...", 116 + MENUITEM "Omdøb...", 109 + MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "K&omprimer...", 119 + MENUITEM "De&komprimer...", 120 + MENUITEM SEPARATOR + MENUITEM "Kø&r...", ID_EXECUTE + MENUITEM "&Udskriv...", 102 + MENUITEM "Associer...", 103 + MENUITEM SEPARATOR + MENUITEM "Opr&et folder...", 111 + MENUITEM "S&øg...", 104 + MENUITEM "&Vælg filer...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "&Afslut\tAlt+X", ID_FILE_EXIT @@ -53,21 +53,21 @@ } POPUP "&Diskette" { - MENUITEM "&Kopier diskette ...", 201 - MENUITEM "Sæt vol&umenavn ...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formater diskette ...", ID_FORMAT_DISK + MENUITEM "&Kopier diskette...", 201 + MENUITEM "Sæt vol&umenavn...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formater diskette...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Opret syste&mdiskette ...", -1 /*TODO*/ + MENUITEM "Opret syste&mdiskette...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "&Tilslut netværksdrev", ID_CONNECT_NETWORK_DRIVE MENUITEM "Frakobl &netværksdrev", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "Del som ...", 254 - MENUITEM "Fje&rn delt resourse ...", 255 - MENUITEM SEPARATOR - MENUITEM "Vælg &enhed ...", 251 + MENUITEM "Del som...", 254 + MENUITEM "Fje&rn delt resourse...", 255 + MENUITEM SEPARATOR + MENUITEM "Vælg &enhed...", 251 } POPUP "Kataloge&r" { @@ -88,20 +88,20 @@ MENUITEM SEPARATOR MENUITEM "&Navn", ID_VIEW_NAME MENUITEM "&Alle fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "Del&vise detaljer ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "Del&vise detaljer...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR MENUITEM "&Sorter efter navn", ID_VIEW_SORT_NAME MENUITEM "Sorter efter &type", ID_VIEW_SORT_TYPE MENUITEM "Sorter efter st&ørrelse", ID_VIEW_SORT_SIZE MENUITEM "Sorter efter &dato", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Filtrer med '&' ...", ID_VIEW_FILTER + MENUITEM "Filtrer med '&'...", ID_VIEW_FILTER } POPUP "&Indstillinger" { - MENUITEM "&Bekræftelse ...", 501 - MENUITEM "Skri&fttype ...", ID_SELECT_FONT - MENUITEM "Tilpas &værktøjslinien ...", 512 + MENUITEM "&Bekræftelse...", 501 + MENUITEM "Skri&fttype...", ID_SELECT_FONT + MENUITEM "Tilpas &værktøjslinien...", 512 MENUITEM SEPARATOR MENUITEM "Værk&tøjlinie", ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Enhedslinie", ID_VIEW_DRIVE_BAR, CHECKED @@ -116,9 +116,9 @@ POPUP "&Sikkerhed" { - MENUITEM "Tilg&ang ...", 605 - MENUITEM "&Logføring ...", 606 - MENUITEM "&Ejer ...", 607 + MENUITEM "Tilg&ang...", 605 + MENUITEM "&Logføring...", 606 + MENUITEM "&Ejer...", 607 } POPUP "Vind&ue" { @@ -135,10 +135,10 @@ POPUP "&Hjælp" { MENUITEM "Emner i &hjælp\tF1", ID_HELP - MENUITEM "&Søg i hjælp ...\tF1", ID_HELP + MENUITEM "&Søg i hjælp...\tF1", ID_HELP MENUITEM "Br&ug af hjælp\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&Information om Filbehandling ...",ID_ABOUT + MENUITEM "&Information om Filbehandling...",ID_ABOUT } } Modified: trunk/rosapps/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winfile/winefile.c?rev=340… ============================================================================== --- trunk/rosapps/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/winfile/winefile.c [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -4720,11 +4720,7 @@ CoInitialize(NULL); CoGetMalloc(MEMCTX_TASK, &Globals.iMalloc); SHGetDesktopFolder(&Globals.iDesktop); -#ifdef __WINE__ - Globals.cfStrFName = RegisterClipboardFormatA(CFSTR_FILENAME); -#else Globals.cfStrFName = RegisterClipboardFormat(CFSTR_FILENAME); -#endif #endif /* load column strings */ Modified: trunk/rosapps/write/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/de-DE.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/write/lang/de-DE.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,8 +1,6 @@ /* - * German language support - * * Copyright (C) 2007 Mikolaj Zalewski - * Copyright (C) 2007 Daniel Reimer + * Copyright (C) 2008 Michael Stefaniuc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +20,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - IDS_FAILED, "Wordpad konnte nicht gestartet werden" -END +{ + IDS_FAILED, "Der Start von Wordpad ist fehlgeschlagen" +} Modified: trunk/rosapps/write/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/en-US.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/write/lang/en-US.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ IDS_FAILED, "Starting Wordpad failed" -END +} Modified: trunk/rosapps/write/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/fr-FR.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/write/lang/fr-FR.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,7 +1,7 @@ /* - * English language support + * French language support * - * Copyright (C) 2007 Mikolaj Zalewski + * Copyright (C) 2007 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,10 +17,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE -BEGIN - IDS_FAILED, "Le lancement de Wordpad a échoué" -END +{ + IDS_FAILED, "Wordpad n'a pas pu Ãªtre dÃ©marrÃ©" +} + +#pragma code_page(default) Modified: trunk/rosapps/write/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/ko-KR.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/rosapps/write/lang/ko-KR.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -22,6 +22,6 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ IDS_FAILED, "¿öµåÆÐµå ½ÃÀÛ ½ÇÆÐÇÔ" -END +} Added: trunk/rosapps/write/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/nb-NO.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/nb-NO.rc (added) +++ trunk/rosapps/write/lang/nb-NO.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,0 +1,26 @@ +/* + * Norwegian Bokmål language support + * + * Copyright (C) 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_FAILED, "Klarte ikke starte Wordpad" +} Propchange: trunk/rosapps/write/lang/nb-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/nl-NL.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/nl-NL.rc (added) +++ trunk/rosapps/write/lang/nl-NL.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,0 +1,26 @@ +/* + * Dutch language support + * + * Copyright (C) 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Starten van Wordpad mislukt" +} Propchange: trunk/rosapps/write/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/write/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/pl-PL.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/write/lang/pl-PL.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,4 +1,6 @@ /* + * Polish language support + * * Copyright (C) 2007 Mikolaj Zalewski * * This library is free software; you can redistribute it and/or @@ -14,16 +16,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * translated by Caemyr - Olaf Siejka (Feb, 2008) - * Use ReactOS forum PM or IRC to contact me - * http://www.reactos.org - * IRC: irc.freenode.net #reactos-pl; */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN - IDS_FAILED, "B³¹d podczas uruchamiania Wordpad" -END +{ + IDS_FAILED, "Nie uda³o siê uruchomiæ programu Wordpad" +} Added: trunk/rosapps/write/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/ru-RU.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/ru-RU.rc (added) +++ trunk/rosapps/write/lang/ru-RU.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,0 +1,26 @@ +/* + * Russian language support + * + * Copyright 2008 Andrey Esin <andrey(a)esin.name> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Íå óäàëîñü çàïóñòèòü Wordpad" +} Propchange: trunk/rosapps/write/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/write/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/lang/sl-SI.rc?rev=34… ============================================================================== --- trunk/rosapps/write/lang/sl-SI.rc (added) +++ trunk/rosapps/write/lang/sl-SI.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -1,0 +1,30 @@ +/* + * Slovenian language support + * + * Copyright (C) 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +#pragma code_page(65001) + +STRINGTABLE +{ + IDS_FAILED, "Zagon programa Wordpad ni uspel" +} + +#pragma code_page(default) Propchange: trunk/rosapps/write/lang/sl-SI.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=34089&r1… ============================================================================== --- trunk/rosapps/write/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/write/rsrc.rc [iso-8859-1] Thu Jun 26 01:10:28 2008 @@ -28,6 +28,10 @@ #include "lang/en-US.rc" #include "lang/fr-FR.rc" #include "lang/ko-KR.rc" +#include "lang/nb-NO.rc" +#include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sl-SI.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc"

16 years, 2 months

[ros-arm-bringup] 34088: - Save and restore the trap frame for the current thread when we take an interrupt, so that ISRs can read it. - We use this in the clock ISR, that can now actually send the trap frame to KeUpdateSystemTime. - Implement KeUpdateRunTime to handle time accounting and DPC rescheduling as well as Quantum End. - Ignore quantum end for now. - We now have a working timebase, and we're back to our earlier checkpoint around CmInitSystem1!.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Jun 26 00:56:35 2008 New Revision: 34088 URL: http://svn.reactos.org/svn/reactos?rev=34088&view=rev Log: - Save and restore the trap frame for the current thread when we take an interrupt, so that ISRs can read it. - We use this in the clock ISR, that can now actually send the trap frame to KeUpdateSystemTime. - Implement KeUpdateRunTime to handle time accounting and DPC rescheduling as well as Quantum End. - Ignore quantum end for now. - We now have a working timebase, and we're back to our earlier checkpoint around CmInitSystem1!. Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/ntoskrnl/ke/arm/stubs.c trunk/reactos/ntoskrnl/ke/arm/trapc.c Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/hal.c?r… ============================================================================== --- trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/generic/hal.c [iso-8859-1] Thu Jun 26 00:56:35 2008 @@ -485,7 +485,9 @@ // // Call the kernel // - KeUpdateSystemTime(NULL, CLOCK2_LEVEL, HalpCurrentTimeIncrement); + KeUpdateSystemTime(KeGetCurrentThread()->TrapFrame, + CLOCK2_LEVEL, + HalpCurrentTimeIncrement); // // We're done Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Thu Jun 26 00:56:35 2008 @@ -39,10 +39,6 @@ PKPRCB Prcb = KeGetPcr()->Prcb; ULARGE_INTEGER SystemTime, InterruptTime; ULONG Hand; - DPRINT1("TIMEBASE: %I64d %I64d %I64d\n", - *(PLARGE_INTEGER)&SharedUserData->InterruptTime, - *(PLARGE_INTEGER)&SharedUserData->SystemTime, - *(PLARGE_INTEGER)&SharedUserData->TickCount); // // Do nothing if this tick is being skipped @@ -143,7 +139,7 @@ // // Update system runtime // - KeUpdateRunTime(NULL, CLOCK2_LEVEL); + KeUpdateRunTime(TrapFrame, CLOCK2_LEVEL); } else { @@ -159,6 +155,138 @@ KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, IN KIRQL Irql) { - UNIMPLEMENTED; - while (TRUE); + PKTHREAD Thread = KeGetCurrentThread(); + PKPROCESS Process = Thread->ApcState.Process; + PKPRCB Prcb = KeGetCurrentPrcb(); + + // + // Do nothing if this tick is being skipped + // + if (Prcb->SkipTick) + { + // + // Handle it next time + // + Prcb->SkipTick = FALSE; + return; + } + + // + // Increase interrupt count + // + Prcb->InterruptCount++; + + // + // Check if we came from user mode + // + if (0) //(TrapFrame->PreviousMode != KernelMode) + { + // + // Increase process user time + // + InterlockedIncrement((PLONG)&Process->UserTime); + Prcb->UserTime++; + Thread->UserTime++; + } + else + { + // + // See if we were in an ISR + // + if (TrapFrame->OldIrql > DISPATCH_LEVEL) + { + // + // Handle that + // + Prcb->InterruptTime++; + } + else if ((TrapFrame->OldIrql < DISPATCH_LEVEL) || + !(Prcb->DpcRoutineActive)) + { + // + // Handle being in kernel mode + // + Thread->KernelTime++; + InterlockedIncrement((PLONG)&Process->KernelTime); + } + else + { + // + // Handle being in a DPC + // + Prcb->DpcTime++; + + // + // FIXME: Handle DPC checks + // + } + } + + // + // Update DPC rates + // + Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + + Prcb->DpcRequestRate) >> 1; + Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; + + // + // Check if the queue is large enough + // + if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + { + // + // Request a DPC + // + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + // + // Fix the maximum queue depth + // + if ((Prcb->DpcRequestRate < KiIdealDpcRate) && + (Prcb->MaximumDpcQueueDepth > 1)) + { + // + // Make it smaller + // + Prcb->MaximumDpcQueueDepth--; + } + } + else + { + // + // Check if we've reached the adjustment limit + // + if (!(--Prcb->AdjustDpcThreshold)) + { + // + // Reset it, and check the queue maximum + // + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) + { + // + // Increase it + // + Prcb->MaximumDpcQueueDepth++; + } + } + } + + // + // Decrement the thread quantum + // + Thread->Quantum -= CLOCK_QUANTUM_DECREMENT; + + // + // Check if the time expired + // + if ((Thread->Quantum <= 0) && (Thread != Prcb->IdleThread)) + { + // + // Schedule a quantum end + // + Prcb->QuantumEnd = 1; + //HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } } Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c [iso-8859-1] Thu Jun 26 00:56:35 2008 @@ -310,6 +310,7 @@ KIRQL OldIrql, Irql; ULONG InterruptCause, InterruptMask; PKPCR Pcr; + PKTRAP_FRAME OldTrapFrame; // // Increment interrupt count @@ -339,12 +340,18 @@ // Raise to the new IRQL // KfRaiseIrql(Irql); + + // + // The clock ISR wants the trap frame as a parameter + // + OldTrapFrame = KeGetCurrentThread()->TrapFrame; + KeGetCurrentThread()->TrapFrame = TrapFrame; // // Check if this interrupt is at DISPATCH or higher // if (Irql > DISPATCH_LEVEL) - { + { // // FIXME: Switch to interrupt stack // @@ -358,11 +365,13 @@ //DPRINT1("[DPC/APC]\n"); HalClearSoftwareInterrupt(Irql); } - + // // Call the registered interrupt routine // Pcr->InterruptRoutine[Irql](); + ASSERT(KeGetCurrentThread()->TrapFrame == TrapFrame); + KeGetCurrentThread()->TrapFrame = OldTrapFrame; // DPRINT1("[ISR RETURN]\n"); //

16 years, 2 months

[ros-arm-bringup] 34087: - Fix totally broken KeUpdateSystemRuntime code... please at least read your code once before committing.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Jun 26 00:26:10 2008 New Revision: 34087 URL: http://svn.reactos.org/svn/reactos?rev=34087&view=rev Log: - Fix totally broken KeUpdateSystemRuntime code... please at least read your code once before committing. Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c Modified: trunk/reactos/ntoskrnl/ke/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs.c [iso-8859-1] Thu Jun 26 00:26:10 2008 @@ -37,8 +37,12 @@ IN ULONG Increment) { PKPRCB Prcb = KeGetPcr()->Prcb; - LARGE_INTEGER SystemTime, InterruptTime; + ULARGE_INTEGER SystemTime, InterruptTime; ULONG Hand; + DPRINT1("TIMEBASE: %I64d %I64d %I64d\n", + *(PLARGE_INTEGER)&SharedUserData->InterruptTime, + *(PLARGE_INTEGER)&SharedUserData->SystemTime, + *(PLARGE_INTEGER)&SharedUserData->TickCount); // // Do nothing if this tick is being skipped @@ -70,11 +74,7 @@ // // Check for incomplete tick // - if (KiTickOffset > 0) - { - - } - else + if (KiTickOffset <= 0) { // // Update the system time @@ -107,14 +107,15 @@ // // Check for timer expiration // - Hand = KeTickCount.LowPart & (TIMER_TABLE_SIZE - 1); - Hand <<= 4; - if (KiTimerTableListHead[Hand].Time.QuadPart > InterruptTime.QuadPart) + Hand = KeTickCount.LowPart % TIMER_TABLE_SIZE; + if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) { // // Timer has expired! // - DPRINT1("TIMER EXPIRATION!!!\n"); + DPRINT1("hand: %d\n", Hand); + DPRINT1("Interrupt time: %I64x\n", InterruptTime.QuadPart); + DPRINT1("TIMER EXPIRATION: %I64x!!!\n", KiTimerTableListHead[Hand].Time.QuadPart); while (TRUE); }

16 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008