Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65636: [NTFS] Stub FSCTL_GET_VOLUME_BITMAP which is required by NFI. CORE-8725
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 10:54:20 2014 New Revision: 65636 URL: http://svn.reactos.org/svn/reactos?rev=65636&view=rev Log: [NTFS] Stub FSCTL_GET_VOLUME_BITMAP which is required by NFI. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 10:54:20 2014 @@ -658,6 +658,18 @@ static NTSTATUS +GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt, + PIRP Irp) +{ + DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +static +NTSTATUS NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -679,6 +691,10 @@ Status = GetNtfsFileRecord(DeviceExt, Irp); break; + case FSCTL_GET_VOLUME_BITMAP: + Status = GetVolumeBitmap(DeviceExt, Irp); + break; + default: DPRINT1("Invalid user request: %x\n", Stack->Parameters.FileSystemControl.FsControlCode); Status = STATUS_INVALID_DEVICE_REQUEST;

1 0

[cgutman] 65635: [CDFS] - Fix CD-ROM disc change handling - Fixes CORE-6119
by cgutman＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: cgutman Date: Sun Dec 14 09:27:11 2014 New Revision: 65635 URL: http://svn.reactos.org/svn/reactos?rev=65635&view=rev Log: [CDFS] - Fix CD-ROM disc change handling - Fixes CORE-6119 Modified: trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Sun Dec 14 09:27:11 2014 @@ -140,10 +140,6 @@ DPRINT ("Status %lx\n", Status); if (!NT_SUCCESS(Status)) { - if (Status == STATUS_NO_MEDIA_IN_DEVICE || Status == STATUS_VERIFY_REQUIRED) - { - DeviceExt->VolumeDevice->Flags |= DO_VERIFY_VOLUME; - } DPRINT1 ("Status %lx\n", Status); return Status; } Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun Dec 14 09:27:11 2014 @@ -453,34 +453,25 @@ PIRP Irp) { PDEVICE_EXTENSION DeviceExt; - PDEVICE_OBJECT DeviceToVerify; PIO_STACK_LOCATION Stack; NTSTATUS Status; CDINFO CdInfo; - PLIST_ENTRY Entry; PFCB Fcb; + PVPB VpbToVerify; DPRINT1 ("CdfsVerifyVolume() called\n"); -#if 0 - if (DeviceObject != CdfsGlobalData->DeviceObject) - { - DPRINT1("DeviceObject != CdfsGlobalData->DeviceObject\n"); - return(STATUS_INVALID_DEVICE_REQUEST); - } -#endif - DeviceExt = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation (Irp); - DeviceToVerify = Stack->Parameters.VerifyVolume.DeviceObject; + VpbToVerify = Stack->Parameters.VerifyVolume.Vpb; FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite (&DeviceExt->VcbResource, TRUE); - if (!(DeviceToVerify->Flags & DO_VERIFY_VOLUME)) + if (!(VpbToVerify->RealDevice->Flags & DO_VERIFY_VOLUME)) { DPRINT1 ("Volume has been verified!\n"); ExReleaseResourceLite (&DeviceExt->VcbResource); @@ -488,14 +479,14 @@ return STATUS_SUCCESS; } - DPRINT1 ("Device object %p Device to verify %p\n", DeviceObject, DeviceToVerify); - - Status = CdfsGetVolumeData (DeviceToVerify, + DPRINT1("Device object %p Device to verify %p\n", DeviceObject, VpbToVerify->RealDevice); + + Status = CdfsGetVolumeData(VpbToVerify->RealDevice, &CdInfo); if (NT_SUCCESS(Status) && - CdInfo.SerialNumber == DeviceToVerify->Vpb->SerialNumber && - CdInfo.VolumeLabelLength == DeviceToVerify->Vpb->VolumeLabelLength && - !wcsncmp (CdInfo.VolumeLabel, DeviceToVerify->Vpb->VolumeLabel, CdInfo.VolumeLabelLength)) + CdInfo.SerialNumber == VpbToVerify->SerialNumber && + CdInfo.VolumeLabelLength == VpbToVerify->VolumeLabelLength && + !wcsncmp(CdInfo.VolumeLabel, VpbToVerify->VolumeLabel, CdInfo.VolumeLabelLength)) { DPRINT1 ("Same volume!\n"); @@ -520,7 +511,7 @@ Status = STATUS_WRONG_VOLUME; } - DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; + VpbToVerify->RealDevice->Flags &= ~DO_VERIFY_VOLUME; ExReleaseResourceLite (&DeviceExt->VcbResource); FsRtlExitFileSystem();

1 0

[pschweitzer] 65634: [CALC] Apply r65633 to all the language files. CORE-7746
by pschweitzer＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: pschweitzer Date: Sun Dec 14 09:18:47 2014 New Revision: 65634 URL: http://svn.reactos.org/svn/reactos?rev=65634&view=rev Log: [CALC] Apply r65633 to all the language files. CORE-7746 Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/he-IL.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sq-AL.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -336,8 +336,8 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "ÐÐ±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½aÐ´ÐµÑÐµÑÐ¸ÑÐµÐ½\tF5", IDM_VIEW_HEX, CHECKED @@ -368,8 +368,8 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½aÐ´ÐµÑÐµÑÐ¸ÑÐµÐ½\tF5", IDM_VIEW_HEX, CHECKED @@ -401,8 +401,8 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð Ð°Ð·Ð´ÐµÐ»ÑÐ½Ðµ Ð½Ð° ÑÐ¸Ð»ÑÐ´Ð¸ÑÐµ", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -335,8 +335,8 @@ END POPUP "Zobrazit" BEGIN - MENUITEM "StandardnÃ", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "StandardnÃ", IDM_VIEW_STANDARD + MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "PÅevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡ctkovÄ\tF5", IDM_VIEW_HEX, CHECKED @@ -367,8 +367,8 @@ END POPUP "Zobrazit" BEGIN - MENUITEM "StandardnÃ", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "StandardnÃ", IDM_VIEW_STANDARD + MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "PÅevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡ctkovÄ\tF5", IDM_VIEW_HEX, CHECKED @@ -400,8 +400,8 @@ END POPUP "Zobrazit" BEGIN - MENUITEM "StandardnÃ", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "StandardnÃ", IDM_VIEW_STANDARD + MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "PÅevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "SeskupovÃ¡nÃ ÄÃslic", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC MENUITEM "Konversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC MENUITEM "Konversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC MENUITEM "Konversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "View" BEGIN - MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD + MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC MENUITEM "ÎÎµÏÎ±ÏÏÎ¿ÏÎ®", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "View" BEGIN - MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD + MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC MENUITEM "ÎÎµÏÎ±ÏÏÎ¿ÏÎ®", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÎÎµÎºÎ±ÎµÎ¾Î±Î´Î¹ÎºÏ\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "View" BEGIN - MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD + MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC MENUITEM "ÎÎµÏÎ±ÏÏÎ¿ÏÎ®", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÎÎ¼Î±Î´Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·ÏÎ¯ÏÎ½", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -336,8 +336,8 @@ END POPUP "Ver" BEGIN - MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversiÃ³n", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -368,8 +368,8 @@ END POPUP "Ver" BEGIN - MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversiÃ³n", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -401,8 +401,8 @@ END POPUP "Ver" BEGIN - MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversiÃ³n", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Agrupar dÃgitos", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Affichage" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "HexadÃ©cimal\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Affichage" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "HexadÃ©cimal\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Affichage" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Grouper les chiffres", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "×ª×¦×××" BEGIN - MENUITEM "×¨××××", IDM_VIEW_STANDARD, CHECKED - MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "×¨××××", IDM_VIEW_STANDARD + MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC MENUITEM "×××¨×", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "××§×¡\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "×ª×¦×××" BEGIN - MENUITEM "×¨××××", IDM_VIEW_STANDARD, CHECKED - MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "×¨××××", IDM_VIEW_STANDARD + MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC MENUITEM "×××¨×", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "××§×¡\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "×ª×¦×××" BEGIN - MENUITEM "×¨××××", IDM_VIEW_STANDARD, CHECKED - MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "×¨××××", IDM_VIEW_STANDARD + MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC MENUITEM "×××¨×", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "×§××××¥ ×¡×¤×¨××ª", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -338,8 +338,8 @@ END POPUP "&NÃ©zet" BEGIN - MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD + MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC MENUITEM "Ãt&vÃ¡ltÃ¡s", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&HexadecimÃ¡lis\tF5", IDM_VIEW_HEX, CHECKED @@ -370,8 +370,8 @@ END POPUP "&NÃ©zet" BEGIN - MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD + MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC MENUITEM "Ãt&vÃ¡ltÃ¡s", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&HexadecimÃ¡lis\tF5", IDM_VIEW_HEX, CHECKED @@ -403,8 +403,8 @@ END POPUP "&NÃ©zet" BEGIN - MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD + MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC MENUITEM "Ãt&vÃ¡ltÃ¡s", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "SzÃ¡mjegyek &csoportosÃtÃ¡sa", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC MENUITEM "Conversione", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC MENUITEM "Conversione", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC MENUITEM "Conversione", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Raggruppamento cifre", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "è¡¨ç¤º(&V)" BEGIN - MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "è¡¨ç¤º(&V)" BEGIN - MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "è¡¨ç¤º" BEGIN - MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "ì¼ë°", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ì¼ë°", IDM_VIEW_STANDARD + MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC MENUITEM "ì í", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "ì¼ë°", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ì¼ë°", IDM_VIEW_STANDARD + MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC MENUITEM "ì í", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "ì¼ë°", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ì¼ë°", IDM_VIEW_STANDARD + MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC MENUITEM "ì í", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ìë¦¿ì êµ¬ë¶ ë¨ì", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Beeld" BEGIN - MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standaard", IDM_VIEW_STANDARD + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Beeld" BEGIN - MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standaard", IDM_VIEW_STANDARD + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "View" BEGIN - MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standaard", IDM_VIEW_STANDARD + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Cijfergroeperingen", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -339,8 +339,8 @@ END POPUP "WyglÄd" BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standardowy", IDM_VIEW_STANDARD + MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Szesnastkowy\tF5", IDM_VIEW_HEX, CHECKED @@ -371,8 +371,8 @@ END POPUP "WyglÄd" BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standardowy", IDM_VIEW_STANDARD + MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Szesnastkowo\tF5", IDM_VIEW_HEX, CHECKED @@ -404,8 +404,8 @@ END POPUP "WyglÄd" BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standardowy", IDM_VIEW_STANDARD + MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "Visualizar" BEGIN - MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversÃ£o", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "Visualizar" BEGIN - MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversÃ£o", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "Visualizar" BEGIN - MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversÃ£o", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Agrupar dÃgitos", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -331,8 +331,8 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Mod st&andard", IDM_VIEW_STANDARD + MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC MENUITEM "Con&versie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -363,8 +363,8 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Mod st&andard", IDM_VIEW_STANDARD + MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC MENUITEM "Con&versie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -396,8 +396,8 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Mod st&andard", IDM_VIEW_STANDARD + MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC MENUITEM "Con&versie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "GrupeazÄ &cifre", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐ¹\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐ¹\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸ÑÑ Ð² Ð³ÑÑÐ¿Ð¿Ðµ", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -337,8 +337,8 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD + MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "Prevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡stkovÃ¡\tF5", IDM_VIEW_HEX, CHECKED @@ -369,8 +369,8 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD + MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "Prevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡stkovÃ¡\tF5", IDM_VIEW_HEX, CHECKED @@ -402,8 +402,8 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD + MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "Prevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ZoskupovaÅ¥ ÄÃslice", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -334,8 +334,8 @@ END POPUP "Modifko" BEGIN - MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standart", IDM_VIEW_STANDARD + MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertim", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -366,8 +366,8 @@ END POPUP "VÃ«zhgo" BEGIN - MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standart", IDM_VIEW_STANDARD + MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC MENUITEM "Konverto", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -399,8 +399,8 @@ END POPUP "VÃ«zhgo" BEGIN - MENUITEM "Standar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standar", IDM_VIEW_STANDARD + MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC MENUITEM "Konverto", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Grupim numeror", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -337,8 +337,8 @@ END POPUP "Visa" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -369,8 +369,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -402,8 +402,8 @@ END POPUP "Visa" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "&à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD, CHECKED - MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD + MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC MENUITEM "à¸à¸§à¸²à¸¡à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "à¸à¸²à¸à¸ªà¸´à¸à¸«à¸\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "&à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD, CHECKED - MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD + MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC MENUITEM "à¸à¸§à¸²à¸¡à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "à¸à¸²à¸à¸ªà¸´à¸à¸«à¸\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "&à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD, CHECKED - MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD + MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC MENUITEM "à¸à¸§à¸²à¸¡à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "à¹à¸ªà¸à¸à¸«à¸¥à¸±à¸à¸à¸±à¸§à¹à¸¥à¸", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD + MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD + MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD + MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "B&asamaklarÄ± TakÄ±mla", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -338,8 +338,8 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÑÑÑÐ½Ð°Ð´ÑÑÑÐºÐ¾Ð²Ð¸Ð¹\tF5", IDM_VIEW_HEX, CHECKED @@ -370,8 +370,8 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÑÑÑÐ½Ð°Ð´ÑÑÑÐºÐ¾Ð²Ð¸Ð¹\tF5", IDM_VIEW_HEX, CHECKED @@ -403,8 +403,8 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÐÑÐ»ÑÐºÑÑÑÑ ÑÐ¸ÑÑ Ñ Ð³ÑÑÐ¿Ñ", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ åå", IDM_VIEW_STANDARD + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ åå", IDM_VIEW_STANDARD + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ åå", IDM_VIEW_STANDARD + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED

1 0

[zguo] 65633: [CALC] Switch calc to using the registry for storing configuration values. Remove 9x codepath. Patch by Lee Schroeder. Cleaning up Ziliang Guo. CORE-7746
by zguo＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: zguo Date: Sun Dec 14 05:48:05 2014 New Revision: 65633 URL: http://svn.reactos.org/svn/reactos?rev=65633&view=rev Log: [CALC] Switch calc to using the registry for storing configuration values. Remove 9x codepath. Patch by Lee Schroeder. Cleaning up Ziliang Guo. CORE-7746 Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/winmain.c trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun Dec 14 05:48:05 2014 @@ -330,8 +330,8 @@ END POPUP "View" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "View" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "View" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sun Dec 14 05:48:05 2014 @@ -225,38 +225,40 @@ static void load_config(void) { - TCHAR buf[32]; DWORD tmp; -#if _WIN32_WINNT >= 0x0500 HKEY hKey; -#endif - - /* Try to load last selected layout */ - GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf)); - if (_stscanf(buf, TEXT("%lu"), &calc.layout) != 1) - calc.layout = CALC_LAYOUT_STANDARD; - - /* Try to load last selected formatting option */ - GetProfileString(TEXT("SciCalc"), TEXT("UseSep"), TEXT("0"), buf, SIZEOF(buf)); - if (_stscanf(buf, TEXT("%lu"), &tmp) != 1) - calc.usesep = FALSE; - else - calc.usesep = (tmp == 1) ? TRUE : FALSE; + + /* If no settings are found in the registry, then use the default options */ + calc.layout = CALC_LAYOUT_STANDARD; + calc.usesep = FALSE; + + /* Get the configuration based on what version of Windows that's being used */ + if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + /* Try to load last selected layout */ + tmp = sizeof(calc.layout); + if (RegQueryValueEx(hKey, TEXT("layout"), NULL, NULL, (LPBYTE)&calc.layout, &tmp) != ERROR_SUCCESS) + calc.layout = CALC_LAYOUT_STANDARD; + + /* Try to load last selected formatting option */ + tmp = sizeof(calc.usesep); + if (RegQueryValueEx(hKey, TEXT("UseSep"), NULL, NULL, (LPBYTE)&calc.usesep, &tmp) != ERROR_SUCCESS) + calc.usesep = FALSE; + + /* close the key */ + RegCloseKey(hKey); + } /* memory is empty at startup */ calc.is_memory = FALSE; -#if _WIN32_WINNT >= 0x0500 /* empty these values */ calc.sDecimal[0] = TEXT('\0'); calc.sThousand[0] = TEXT('\0'); /* try to open the registry */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, - TEXT("Control Panel\\International"), - 0, - KEY_QUERY_VALUE, - &hKey) == ERROR_SUCCESS) { + if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\International"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { /* get these values (ignore errors) */ tmp = sizeof(calc.sDecimal); RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp); @@ -277,20 +279,24 @@ /* get the string lengths */ calc.sDecimal_len = _tcslen(calc.sDecimal); calc.sThousand_len = _tcslen(calc.sThousand); -#else - /* acquire regional settings */ - calc.sDecimal_len = GetProfileString(TEXT("intl"), TEXT("sDecimal"), TEXT("."), calc.sDecimal, SIZEOF(calc.sDecimal)); - calc.sThousand_len = GetProfileString(TEXT("intl"), TEXT("sThousand"), TEXT(","), calc.sThousand, SIZEOF(calc.sThousand)); -#endif } static void save_config(void) { - TCHAR buf[32]; - - _stprintf(buf, TEXT("%lu"), calc.layout); - WriteProfileString(TEXT("SciCalc"), TEXT("layout"), buf); - WriteProfileString(TEXT("SciCalc"), TEXT("UseSep"), (calc.usesep==TRUE) ? TEXT("1") : TEXT("0")); + HKEY hKey; + DWORD sepValue; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_ALL_ACCESS, &hKey) != ERROR_SUCCESS ) + { + return; + } + + sepValue = (calc.usesep) ? 1 : 0; + + RegSetValueEx(hKey, TEXT("layout"), 0, REG_DWORD, (const BYTE*)&calc.layout, sizeof(calc.layout)); + RegSetValueEx(hKey, TEXT("UseSep"), 0, REG_DWORD, (const BYTE*)&sepValue, sizeof(sepValue)); + + RegCloseKey(hKey); } static LRESULT post_key_press(LPARAM lParam, WORD idc) @@ -657,7 +663,33 @@ HMENU hMenu = GetSubMenu(GetMenu(hwnd), 1); unsigned int x; - for (x=0; x<SIZEOF(upd); x++) { + /* Sets the state of the layout in the menu based on the configuration file */ + if (calc.layout == CALC_LAYOUT_SCIENTIFIC) + { + CheckMenuRadioItem(GetMenu(hwnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_SCIENTIFIC, + MF_BYCOMMAND); + } + else if (calc.layout == CALC_LAYOUT_CONVERSION) + { + CheckMenuRadioItem(GetMenu(hwnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_CONVERSION, + MF_BYCOMMAND); + } + else + { + CheckMenuRadioItem(GetMenu(hwnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_STANDARD, + MF_BYCOMMAND); + } + + for (x=3; x<SIZEOF(upd); x++) { if (*(upd[x].sel) != upd[x].idc) { CheckMenuItem(hMenu, upd[x].idm, MF_BYCOMMAND|MF_UNCHECKED); SendMessage((HWND)GetDlgItem(hwnd,upd[x].idc),BM_SETCHECK,FALSE,0L); @@ -1225,6 +1257,7 @@ { unsigned int x; RECT rc; + HMENU hMenu; switch (msg) { case WM_DRAWITEM: @@ -1258,6 +1291,11 @@ /* set our calc icon */ SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG))); SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_SMALL))); + + /* Sets the state of the option to group digits */ + hMenu = GetSubMenu(GetMenu(hWnd), 1); + CheckMenuItem(hMenu, IDM_VIEW_GROUP, (calc.usesep ? MF_CHECKED : MF_UNCHECKED)); + /* update text for decimal button */ SendDlgItemMessage(hWnd, IDC_BUTTON_DOT, WM_SETTEXT, (WPARAM)0, (LPARAM)calc.sDecimal); /* Fill combo box for conversion */ @@ -1312,18 +1350,36 @@ calc.action = IDM_VIEW_STANDARD; DestroyWindow(hWnd); save_config(); + + CheckMenuRadioItem(GetMenu(hWnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_STANDARD, + MF_BYCOMMAND); return TRUE; case IDM_VIEW_SCIENTIFIC: calc.layout = CALC_LAYOUT_SCIENTIFIC; calc.action = IDM_VIEW_SCIENTIFIC; DestroyWindow(hWnd); save_config(); + + CheckMenuRadioItem(GetMenu(hWnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_SCIENTIFIC, + MF_BYCOMMAND); return TRUE; case IDM_VIEW_CONVERSION: calc.layout = CALC_LAYOUT_CONVERSION; calc.action = IDM_VIEW_CONVERSION; DestroyWindow(hWnd); save_config(); + + CheckMenuRadioItem(GetMenu(hWnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_CONVERSION, + MF_BYCOMMAND); return TRUE; case IDM_VIEW_HEX: case IDM_VIEW_DEC: @@ -1715,8 +1771,7 @@ /* ignore hwnd: dialogs are already visible! */ if (calc.layout == CALC_LAYOUT_SCIENTIFIC) dwLayout = IDD_DIALOG_SCIENTIFIC; - else - if (calc.layout == CALC_LAYOUT_CONVERSION) + else if (calc.layout == CALC_LAYOUT_CONVERSION) dwLayout = IDD_DIALOG_CONVERSION; else dwLayout = IDD_DIALOG_STANDARD; Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun Dec 14 05:48:05 2014 @@ -1811,6 +1811,11 @@ HKCU,"SOFTWARE",,0x00000012 HKCU,"SOFTWARE\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft",,0x00000012 + +; ReactOS Calculator +HKCU,"SOFTWARE\Microsoft\Calc",,0x00000012 +HKCU,"SOFTWARE\Microsoft\Calc","layout",0x00010001,0x00000001 +HKCU,"SOFTWARE\Microsoft\Calc","UseSep",0x00010001,0x00000001 ; DirectX version report as DirectX 9.0 HKCU,"SOFTWARE\Microsoft\DirectX","Debug",0x00010001,0x00000000

1 0

[zguo] 65632: [TREE] Fix build.
by zguo＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: zguo Date: Sun Dec 14 00:09:51 2014 New Revision: 65632 URL: http://svn.reactos.org/svn/reactos?rev=65632&view=rev Log: [TREE] Fix build. Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sun Dec 14 00:09:51 2014 @@ -7,7 +7,7 @@ // Tree.cpp : Defines the entry point for the console application. // -#include <Windows.h> +#include <windows.h> #include <stdio.h> #define STR_MAX 2048

1 0

[zguo] 65631: [TREE] Implement directory tree commandline utility. Code by Asif Bahrainwala. Cleanup by Ziliang Guo. CORE-8529
by zguo＠svn.reactos.org 14 Dec '14

14 Dec '14

Author: zguo Date: Sun Dec 14 00:00:54 2014 New Revision: 65631 URL: http://svn.reactos.org/svn/reactos?rev=65631&view=rev Log: [TREE] Implement directory tree commandline utility. Code by Asif Bahrainwala. Cleanup by Ziliang Guo. CORE-8529 Added: trunk/reactos/base/applications/cmdutils/tree/ (with props) trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/tree/tree.c (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Dec 14 00:00:54 2014 @@ -11,6 +11,7 @@ add_subdirectory(reg) add_subdirectory(sort) add_subdirectory(taskkill) +add_subdirectory(tree) add_subdirectory(wmic) add_subdirectory(wscript) add_subdirectory(xcopy) Propchange: trunk/reactos/base/applications/cmdutils/tree/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 14 00:00:54 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/tree/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/tree/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/tree/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] Sun Dec 14 00:00:54 2014 @@ -0,0 +1,5 @@ + +add_executable(tree tree.c) +set_module_type(tree win32cui UNICODE) +add_importlibs(tree msvcrt kernel32 user32) +add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c (added) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sun Dec 14 00:00:54 2014 @@ -0,0 +1,332 @@ +ï»¿/* + * PROJECT: ReactOS + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * PURPOSE: Implements tree.com functionality similar to Windows + * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala(a)hotmail.com) + */ + +// Tree.cpp : Defines the entry point for the console application. +// +#include <Windows.h> +#include <stdio.h> + +#define STR_MAX 2048 + +const wchar_t *HELP = L"\nGraphically displays the folder structure of a drive or path. \n\nTREE [drive:][path] [/F] [/A]\n\n /F Display the names of the files in each folder.\n\n\n"; +const wchar_t *INVALID = L"No subfolders exist"; + +static void DrawTree(const wchar_t* strPath, const WIN32_FIND_DATA *arrFolder, const size_t szArr, UINT width, const wchar_t *prevLine, BOOL drawfolder); +static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine); + +BOOL bShowFiles = FALSE; //if this flag is set to true, files will also be listed + +/** +* @name: HasSubFolder +* +* @param strPath +* Must specify folder name +* +* @return +* true if folder has sub folders, else will return false +*/ +static BOOL HasSubFolder(const wchar_t *strPath1) +{ + BOOL ret = FALSE; + WIN32_FIND_DATA FindFileData; + HANDLE hFind = NULL; + static wchar_t strPath[STR_MAX]= L""; + ZeroMemory(strPath, sizeof(strPath)); + + wcscat(strPath,strPath1); + wcscat(strPath,L"\\*."); + + hFind=FindFirstFile(strPath, &FindFileData); + do + { + if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if(wcscmp(FindFileData.cFileName, L".")==0 || + wcscmp(FindFileData.cFileName, L"..")==0 ) + { + continue; + } + + ret=TRUE; //found subfolder + break; + } + } + while(FindNextFile(hFind, &FindFileData)); + + FindClose(hFind); + return ret; +} + +/** + * @name: DrawTree + * + * @param strPath + * Must specify folder name + * + * @param arrFolder + * must be a list of folder names to be drawn in tree format + * + * @param width + * specifies drawing distance for correct formatting of tree structure being drawn on console screen + * used internally for adding spaces + * + * @param prevLine + * used internally for formatting reasons + * + * @return + * void + */ +static void DrawTree(const wchar_t* strPath, const WIN32_FIND_DATA *arrFolder, const size_t szArr, UINT width, const wchar_t *prevLine, BOOL drawfolder) +{ + BOOL bHasSubFolder = HasSubFolder(strPath); + UINT i = 0; + + //this will format the spaces required for correct formatting + for(i = 0; i < szArr; ++i) + { + wchar_t *consoleOut = (wchar_t*)malloc(sizeof(wchar_t) * STR_MAX); + UINT j=0; + static wchar_t str[STR_MAX]; + + // As we do not seem to have the _s functions properly set up, use the non-secure version for now + //wcscpy_s(consoleOut, STR_MAX, L""); + //wcscpy_s(str, STR_MAX, L""); + wcscpy(consoleOut, L""); + wcscpy(str, L""); + + for(j=0;j<width-1;++j) + { + //if the previous line has 'â' or 'â' then the current line will add 'â' to continue the connecting line + if((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179) + { + wchar_t a[]={179,0}; + wcscat(consoleOut,a); + } + else + { + wcscat(consoleOut,L" "); + } + } + + if(szArr - 1 != i) + { + if(drawfolder) + { + // will add 'ââââFolder name + wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); + } + else + { + if(bHasSubFolder) + { + // will add 'â FileNamw' //thie line is added to connect the belowfolder sub structure + wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + } + else + { + // will add ' FileNamw' + wsprintf(str,L" %s", (wchar_t*)arrFolder[i].cFileName); + } + } + } + else + { + if(drawfolder) + { + // 'ââââFolder name' + wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); + } + else + { + if(bHasSubFolder) + { + // 'â FileName' + wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + } + else + { + // ' FileName' + wsprintf(str,L" %s", (wchar_t*)arrFolder[i].cFileName); + } + } + } + + wcscat(consoleOut, str); + wprintf(L"%s\n", consoleOut); + + if(drawfolder) + { + wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t)); + ZeroMemory(str, STR_MAX*sizeof(wchar_t)); + + wcscat(str, strPath); + wcscat(str, L"\\"); + wcscat(str, arrFolder[i].cFileName); + GetDirectoryStructure(str, width+4, consoleOut); + + free(str); + } + free(consoleOut); + } +} + +/** + * @name: GetDirectoryStructure + * + * @param strPath + * Must specify folder name + * + * @param width + * specifies drawing distance for correct formatting of tree structure being drawn on console screen + * + * @param prevLine + * specifies the previous line written on console, is used for correct formatting + * @return + * void + */ +static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine) +{ + WIN32_FIND_DATA FindFileData; + HANDLE hFind = NULL; + //DWORD err = 0; + //will fill up with names of all sub folders + WIN32_FIND_DATA *arrFolder = NULL; + UINT arrFoldersz = 0; + //will fill up with names of all sub folders + WIN32_FIND_DATA *arrFile = NULL; + UINT arrFilesz = 0; + + ZeroMemory(&FindFileData,sizeof(FindFileData)); + + { + static wchar_t tmp[STR_MAX]=L""; + ZeroMemory(tmp,sizeof(tmp)); + wcscat(tmp,strPath); + wcscat(tmp,L"\\*.*"); + + hFind=FindFirstFile(tmp, &FindFileData); + + //err = GetLastError(); + } + + if(hFind == INVALID_HANDLE_VALUE) + return; + + do + { + if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + { + if(wcscmp(FindFileData.cFileName, L".")==0 || + wcscmp(FindFileData.cFileName, L"..")==0 ) + continue; + + ++arrFoldersz; + arrFolder=(WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData)); + + if(arrFolder == NULL) + exit(-1); + + arrFolder[arrFoldersz - 1] = FindFileData; + + } + else + { + ++arrFilesz; + arrFile=(WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData)); + + if(arrFile == NULL) + exit(-1); + + arrFile[arrFilesz - 1] = FindFileData; + } + } + while(FindNextFile(hFind, &FindFileData)); + + FindClose(hFind); + + if(bShowFiles) + { + DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE); //will free(arrFile) + } + + DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE); //will free(arrFile) + + free(arrFolder); + free(arrFile); +} + +/** +* @name: main +* standard main functionality as required by C/C++ for application startup +* +* @return +* error /success value +*/ +int wmain( int argc, wchar_t *argv[]) +{ + DWORD dwSerial = 0; + wchar_t t=0; + wchar_t *strPath = NULL; + DWORD sz = 0; + //wchar_t *context = NULL ; + wchar_t *driveLetter = NULL; + + int i; + + for(i = 1; i < argc; ++i) //parse the command line + { + if(wcscmp(argv[i], L"/?") == 0) + { + wprintf(HELP); //will print help and exit after + return 0; + } + else if(wcscmp(argv[i],L"/F")==0 || wcscmp(argv[i],L"/f")==0) + { + bShowFiles=TRUE; //if set to true, will populate all the files within the folder structure + } + else + { + //this must be path to some folder + BOOL b=SetCurrentDirectoryW(argv[i]); //will set the current directory for this executable + if(b==FALSE) + { + wprintf(INVALID); + return 1; + } + } + } + + wprintf(L"Folder PATH listing\n"); + + GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0); + wprintf(L"Volume serial number is %x:%x\n", dwSerial >> 16, dwSerial & 0xffff); + + sz = GetCurrentDirectory(1, &t); //get the buffer size + strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz); //must not return before calling delete[] + + GetCurrentDirectory(sz, strPath); //get the current directory + + + driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz); //get the drive letter , must not return before calling delete[] + + // As we do not seem to have the _s functions properly set up, use the non-secure version for now + //wcscpy_s(driveLetter,sz,strPath); + //wcstok_s(driveLetter,L":", &context); //parse for the drive letter + wcscpy(driveLetter,strPath); + wcstok(driveLetter, L":"); + + wprintf(L"%s:.\n",driveLetter); + + free(driveLetter); + + GetDirectoryStructure(strPath, 1, L" "); //get the sub directories within this current folder + + free(strPath); + wprintf(L"\n"); + + return 0; +} Propchange: trunk/reactos/base/applications/cmdutils/tree/tree.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 65630: [EVENTVWR] Clean up the resource IDs. Fix small icon loading.
by ekohl＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: ekohl Date: Sat Dec 13 22:35:48 2014 New Revision: 65630 URL: http://svn.reactos.org/svn/reactos?rev=65630&view=rev Log: [EVENTVWR] Clean up the resource IDs. Fix small icon loading. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -116,7 +116,7 @@ return FALSE; } - hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_EVENTVWR)); + hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDA_EVENTVWR)); /* Main message loop: */ while (GetMessageW(&msg, NULL, 0, 0)) @@ -575,13 +575,13 @@ if (dwTotalRecords > 0) { - EnableMenuItem(hMainMenu, ID_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED); - EnableMenuItem(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED); + EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_ENABLED); + EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_ENABLED); } else { - EnableMenuItem(hMainMenu, ID_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED); - EnableMenuItem(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hMainMenu, IDM_CLEAR_EVENTS, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_GRAYED); } g_RecordPtrs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalRecords * sizeof(PVOID)); @@ -851,7 +851,6 @@ WNDCLASSEXW wcex; wcex.cbSize = sizeof(WNDCLASSEX); - wcex.style = 0; wcex.lpfnWndProc = WndProc; wcex.cbClsExtra = 0; @@ -860,9 +859,14 @@ wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_EVENTVWR)); wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - wcex.lpszMenuName = MAKEINTRESOURCE(IDC_EVENTVWR); + wcex.lpszMenuName = MAKEINTRESOURCE(IDM_EVENTVWR); wcex.lpszClassName = szWindowClass; - wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL)); + wcex.hIconSm = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_EVENTVWR), + IMAGE_ICON, + 16, + 16, + LR_SHARED); return RegisterClassExW(&wcex); } @@ -1002,11 +1006,11 @@ if (lpDisplayName) { - InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); + InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, lpDisplayName); } else { - InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); + InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_STRING, ID_FIRST_LOG + dwIndex, LogNames[dwIndex]); } LocalFree(lpDisplayName); @@ -1014,7 +1018,7 @@ } } - InsertMenuW(hMainMenu, ID_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL); + InsertMenuW(hMainMenu, IDM_SAVE_PROTOCOL, MF_BYCOMMAND | MF_SEPARATOR, ID_FIRST_LOG + dwIndex + 1, NULL); RegCloseKey(hKey); @@ -1244,7 +1248,7 @@ if (lpnmitem->iItem != -1) { DialogBox(hInst, - MAKEINTRESOURCE(IDD_EVENTDETAILDIALOG), + MAKEINTRESOURCE(IDD_EVENTPROPERTIES), hWnd, EventDetails); } @@ -1270,11 +1274,11 @@ switch (LOWORD(wParam)) { - case ID_SAVE_PROTOCOL: + case IDM_SAVE_PROTOCOL: SaveProtocol(); break; - case ID_CLEAR_EVENTS: + case IDM_CLEAR_EVENTS: if (ClearEvents()) { Refresh(); @@ -1306,22 +1310,21 @@ break; case WM_SIZE: - { - // Gets the window rectangle - GetClientRect(hWnd, &rect); - - // Relocate the listview - MoveWindow(hwndListView, - 0, - 0, - rect.right, - rect.bottom - 20, - 1); - - // Resize the statusbar; - SendMessage(hwndStatus, message, wParam, lParam); - } + // Gets the window rectangle + GetClientRect(hWnd, &rect); + + // Relocate the listview + MoveWindow(hwndListView, + 0, + 0, + rect.right, + rect.bottom - 20, + 1); + + // Resize the statusbar; + SendMessage(hwndStatus, message, wParam, lParam); break; + case WM_DESTROY: FreeRecords(); FreeLogList(); @@ -1516,9 +1519,9 @@ HANDLE prevIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_PREV), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); HANDLE copyIcon = LoadImage(hInst, MAKEINTRESOURCE(IDI_COPY), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - SendMessage(GetDlgItem(hDlg, IDNEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon); - SendMessage(GetDlgItem(hDlg, IDPREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon); - SendMessage(GetDlgItem(hDlg, IDCOPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon); + SendMessage(GetDlgItem(hDlg, IDC_NEXT), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)nextIcon); + SendMessage(GetDlgItem(hDlg, IDC_PREVIOUS), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)prevIcon); + SendMessage(GetDlgItem(hDlg, IDC_COPY), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)copyIcon); } // Message handler for event details box. @@ -1544,21 +1547,21 @@ EndDialog(hDlg, LOWORD(wParam)); return (INT_PTR)TRUE; - case IDPREVIOUS: + case IDC_PREVIOUS: SendMessage(hwndListView, WM_KEYDOWN, VK_UP, 0); // Show event info on dialog box DisplayEvent(hDlg); return (INT_PTR)TRUE; - case IDNEXT: + case IDC_NEXT: SendMessage(hwndListView, WM_KEYDOWN, VK_DOWN, 0); // Show event info on dialog box DisplayEvent(hDlg); return (INT_PTR)TRUE; - case IDCOPY: + case IDC_COPY: CopyEventEntry(hDlg); return (INT_PTR)TRUE; Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -1,12 +1,12 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "ÐÐ·&ÑÐ¾Ð´", IDM_EXIT END @@ -14,7 +14,7 @@ BEGIN MENUITEM "Ð&Ð¿ÑÐµÑÐ½ÑÐ²Ð°Ð½Ðµ", IDM_REFRESH END - MENUITEM "ÐÐ°&ÑÑÑÐ¾Ð¹ÐºÐ¸", ID_OPTIONS + MENUITEM "ÐÐ°&ÑÑÑÐ¾Ð¹ÐºÐ¸", IDM_OPTIONS POPUP "ÐÐ¾Ð¼Ð¾&Ñ" BEGIN MENUITEM "ÐÐ¾Ð¼Ð¾&Ñ", IDM_HELP @@ -23,7 +23,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -48,7 +48,7 @@ CTEXT "ÐÐ°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸ÑÑÐ°. ÐÐ¾ÑÐ°ÐºÐ°Ð¹ÑÐµ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ Ð·Ð° ÑÑÐ±Ð¸ÑÐ¸ÐµÑÐ¾" @@ -71,9 +71,9 @@ LTEXT "&ÐÐ¾Ð¼Ð¿ÑÑÑÑ:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -1,12 +1,12 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Protokol" BEGIN - MENUITEM "UloÅ¾it &Protokol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "UloÅ¾it &Protokol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "&Odstranit udÃ¡losti", ID_CLEAR_EVENTS, GRAYED + MENUITEM "&Odstranit udÃ¡losti", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&Konec", IDM_EXIT END @@ -14,7 +14,7 @@ BEGIN MENUITEM "&Obnovit", IDM_REFRESH END - MENUITEM "&MoÅ¾nosti", ID_OPTIONS + MENUITEM "&MoÅ¾nosti", IDM_OPTIONS POPUP "&NÃ¡povÄda" BEGIN MENUITEM "NÃ¡&povÄda", IDM_HELP @@ -23,7 +23,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -48,7 +48,7 @@ CTEXT "NaÄÃtÃ¡m protokol udÃ¡lostÃ. ProsÃm Äekejte ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Podrobnosti udÃ¡losti" @@ -71,9 +71,9 @@ LTEXT "P&oÄÃtaÄ:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 52, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Popis:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Protokoll" BEGIN - MENUITEM "Protokoll s&peichern...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Protokoll s&peichern...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "Alle E&reignisse lÃ¶schen", ID_CLEAR_EVENTS, GRAYED + MENUITEM "Alle E&reignisse lÃ¶schen", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "B&eenden", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&Aktualisieren", IDM_REFRESH END - MENUITEM "&Optionen", ID_OPTIONS + MENUITEM "&Optionen", IDM_OPTIONS POPUP "&Hilfe" BEGIN MENUITEM "H&ilfe", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Ereignis-Protokolle werden geladen. Bitte warten...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Ereignisdetails" @@ -73,9 +73,9 @@ LTEXT "&Computer:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Bezeichnung:", IDC_STATIC, 8, 65, 45, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Î&Î¾Î¿Î´Î¿Ï", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&ÎÎ½Î±Î½ÎÏÏÎ·", IDM_REFRESH END - MENUITEM "&ÎÏÎ¹Î»Î¿Î³ÎÏ", ID_OPTIONS + MENUITEM "&ÎÏÎ¹Î»Î¿Î³ÎÏ", IDM_OPTIONS POPUP "&ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN MENUITEM "ÎÎ¿&Î®Î¸ÎµÎ¹Î±", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "ÎÎ¯Î½ÎµÏÎ±Î¹ ÏÏÏÏÏÏÎ· ÏÏÎ½ Logs ÏÏÎ¼Î²Î¬Î½ÏÏÎ½. Î Î±ÏÎ±ÎºÎ±Î»Ï ÏÎµÏÎ¹Î¼ÎÎ½ÎµÏÎµ ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "ÎÎµÏÏÎ¿Î¼ÎÏÎµÎ¹ÎµÏ ÏÏÎ¼Î²Î¬Î½ÏÎ¿Ï" @@ -73,9 +73,9 @@ LTEXT "&Î¥ÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®Ï:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Î ÎµÏÎ¹Î³ÏÎ±ÏÎ®:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -8,13 +8,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "E&xit", IDM_EXIT END @@ -22,7 +22,7 @@ BEGIN MENUITEM "&Refresh", IDM_REFRESH END - MENUITEM "&Options", ID_OPTIONS + MENUITEM "&Options", IDM_OPTIONS POPUP "&Help" BEGIN MENUITEM "H&elp", IDM_HELP @@ -31,7 +31,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -56,7 +56,7 @@ CTEXT "Loading Event Logs. Please wait ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Event Properties" @@ -79,9 +79,9 @@ LTEXT "&Computer:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Description:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY | WS_VSCROLL | WS_BORDER Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Registro" BEGIN - MENUITEM "Guardar &protocolo...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Guardar &protocolo...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "&Borrar todos los eventos", ID_CLEAR_EVENTS, GRAYED + MENUITEM "&Borrar todos los eventos", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "S&alir", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&Actualizar", IDM_REFRESH END - MENUITEM "&Opciones", ID_OPTIONS + MENUITEM "&Opciones", IDM_OPTIONS POPUP "Ay&uda" BEGIN MENUITEM "Ay&uda", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Recuperando eventos. Espere un momento...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Detalles del evento" @@ -73,9 +73,9 @@ LTEXT "&Equipo:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&DescripciÃ³n:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "Journa&l" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "Effacer tous &les Ã©vÃ©nements", ID_CLEAR_EVENTS, GRAYED + MENUITEM "Effacer tous &les Ã©vÃ©nements", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Quitter", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&RafraÃ®chir", IDM_REFRESH END - MENUITEM "&Options", ID_OPTIONS + MENUITEM "&Options", IDM_OPTIONS POPUP "Aide" BEGIN MENUITEM "Aide", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Chargement des journaux d'Ã©vÃ©nements. Veuillez patienter...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "DÃ©tail de l'Ã©vÃ©nement" @@ -73,9 +73,9 @@ LTEXT "Ordinateur :", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Description :", IDC_STATIC, 8, 65, 45, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "××¦×× ××××¨××¢×× (××§×××)" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "××¦×××", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "×¨×¢× ×", IDM_REFRESH END - MENUITEM "××¤×©×¨××××ª", ID_OPTIONS + MENUITEM "××¤×©×¨××××ª", IDM_OPTIONS POPUP "×¢××¨×" BEGIN MENUITEM "×¢××¨×", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "×××¢× ×××× × ×××¨××¢××, × × ××××ª××...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "×××¤××× × ×××¨××¢" @@ -73,9 +73,9 @@ LTEXT "×××©×:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "×ª××××¨:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "E&sci", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&Aggiorna", IDM_REFRESH END - MENUITEM "&Opzioni", ID_OPTIONS + MENUITEM "&Opzioni", IDM_OPTIONS POPUP "&Aiuto" BEGIN MENUITEM "A&iuto", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Caricamento eventi in corso. Attendere...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Dettagli" @@ -73,9 +73,9 @@ LTEXT "&Computer:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Descrizione:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "ãã°(&L)" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "çµäº(&X)", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "æ´æ°(&R)", IDM_REFRESH END - MENUITEM "ãªãã·ã§ã³(&O)", ID_OPTIONS + MENUITEM "ãªãã·ã§ã³(&O)", IDM_OPTIONS POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã(&E)", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "ã¤ãã³ã ãã°ãèªã¿è¾¼ãã§ãã¾ãã ãå¾ã¡ãã ãã ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "ã¤ãã³ãã®è©³ç´°æå ±" @@ -73,9 +73,9 @@ LTEXT "ã³ã³ãã¥ã¼ã¿(&C):", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "èª¬æ(&D):", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "ë¡ê·¸(&L)" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "ì¢ë£(&X)", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "ìë¡ ê³ ì¹¨(&R)", IDM_REFRESH END - MENUITEM "ìµì(&O)", ID_OPTIONS + MENUITEM "ìµì(&O)", IDM_OPTIONS POPUP "ëìë§(&H)" BEGIN MENUITEM "ëìë§(&H)", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "ì´ë²¤í¸ ë¡ê·¸ ë¡ë©ì¤. ê¸°ë¤ë ¤ì£¼ì¸ì...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Event Detail" @@ -73,9 +73,9 @@ LTEXT "ì»´í¨í°(&C):", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "ì¤ëª(&D):", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -1,12 +1,12 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Logg" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "A&vslutt", IDM_EXIT END @@ -14,7 +14,7 @@ BEGIN MENUITEM "&Oppdater", IDM_REFRESH END - MENUITEM "&Handling", ID_OPTIONS + MENUITEM "&Handling", IDM_OPTIONS POPUP "&Hjelp" BEGIN MENUITEM "Hj&elp", IDM_HELP @@ -23,7 +23,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -48,7 +48,7 @@ CTEXT "Laster Hendelseliste. Venligst vent ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Hendelse detaljer" @@ -71,9 +71,9 @@ LTEXT "&Datamaskin:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Beskrivelse:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -4,13 +4,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Logi" BEGIN - MENUITEM "Zapisz &protokÃ³Å...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Zapisz &protokÃ³Å...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "W&yczyÅÄ wszystkie zdarzenia", ID_CLEAR_EVENTS, GRAYED + MENUITEM "W&yczyÅÄ wszystkie zdarzenia", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&WyjÅcie", IDM_EXIT END @@ -18,7 +18,7 @@ BEGIN MENUITEM "&OdÅwieÅ¼", IDM_REFRESH END - MENUITEM "Op&cje", ID_OPTIONS + MENUITEM "Op&cje", IDM_OPTIONS POPUP "Po&moc" BEGIN MENUITEM "Pomo&c", IDM_HELP @@ -27,7 +27,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -52,7 +52,7 @@ CTEXT "Åadowanie logÃ³w zdarzeÅ. ProszÄ czekaÄ ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "SzczegÃ³Åy zdarzenia" @@ -75,9 +75,9 @@ LTEXT "&Komputer:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Opis:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Registro" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&Sair", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&Atualizar", IDM_REFRESH END - MENUITEM "&OpÃ§Ãµes", ID_OPTIONS + MENUITEM "&OpÃ§Ãµes", IDM_OPTIONS POPUP "&Ajuda" BEGIN MENUITEM "&Ajuda", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Carregando Registros de Eventos. Por favor aguarde ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Detalhes do Evento" @@ -73,9 +73,9 @@ LTEXT "&Computador:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&DescriÃ§Ã£o:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "J&urnal" BEGIN - MENUITEM "PÄstrare p&rotocolâ¦", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "PÄstrare p&rotocolâ¦", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "ÃnlÄt&urÄ toate evenimentele", ID_CLEAR_EVENTS, GRAYED + MENUITEM "ÃnlÄt&urÄ toate evenimentele", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "I&eÈire", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "Ãmp&rospÄtare", IDM_REFRESH END - MENUITEM "&OpÈiuni", ID_OPTIONS + MENUITEM "&OpÈiuni", IDM_OPTIONS POPUP "&?" BEGIN MENUITEM "&Manualâ¦", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Se Ã®ncarcÄ jurnalul de evenimenteleâ¦", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Detalii eveniment" @@ -73,9 +73,9 @@ LTEXT "&Calculator:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Descriere:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "Ð¡&Ð¾Ð±ÑÑÐ¸Ñ" BEGIN - MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "ÐÑÐ¸ÑÑÐ¸ÑÑ &Ð²ÑÐµ ÑÐ¾Ð±ÑÑÐ¸Ñ", ID_CLEAR_EVENTS, GRAYED + MENUITEM "ÐÑÐ¸ÑÑÐ¸ÑÑ &Ð²ÑÐµ ÑÐ¾Ð±ÑÑÐ¸Ñ", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Ð&ÑÑÐ¾Ð´", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ", IDM_REFRESH END - MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸", ID_OPTIONS + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸", IDM_OPTIONS POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN MENUITEM "&ÐÐ¾Ð¼Ð¾ÑÑ", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "ÐÐ´ÐµÑ Ð·Ð°Ð³ÑÑÐ·ÐºÐ°. ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° ÑÐ¾Ð±ÑÑÐ¸Ñ" @@ -73,9 +73,9 @@ LTEXT "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -5,13 +5,13 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&ZÃ¡znam" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&SkonÄiÅ¥", IDM_EXIT END @@ -19,7 +19,7 @@ BEGIN MENUITEM "&ObnoviÅ¥", IDM_REFRESH END - MENUITEM "&MoÅ¾nosti", ID_OPTIONS + MENUITEM "&MoÅ¾nosti", IDM_OPTIONS POPUP "&PomocnÃk" BEGIN MENUITEM "&PomocnÃk", IDM_HELP @@ -28,7 +28,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -53,7 +53,7 @@ CTEXT "NahrÃ¡vam zÃ¡znamy s udalosÅ¥ami. PoÄkajte, prosÃm ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Podrobnosti o udalosti" @@ -76,9 +76,9 @@ LTEXT "P&oÄÃtaÄ:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Popis:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -8,13 +8,13 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Log" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Dil", IDM_EXIT END @@ -22,7 +22,7 @@ BEGIN MENUITEM "&Rifresko", IDM_REFRESH END - MENUITEM "&Opsione", ID_OPTIONS + MENUITEM "&Opsione", IDM_OPTIONS POPUP "NdihmÃ«" BEGIN MENUITEM "NdihmÃ«", IDM_HELP @@ -31,7 +31,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -56,7 +56,7 @@ CTEXT "Ngarkim loget e ngjarjeve. Ju lutem prisniPlease wait ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Detaje te ngjarjeve" @@ -79,9 +79,9 @@ LTEXT "Kompjuteri:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "PÃ«rshkrimi:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&Logg" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "A&vsluta", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&Uppdatera", IDM_REFRESH END - MENUITEM "&ÃtgÃ¤rd", ID_OPTIONS + MENUITEM "&ÃtgÃ¤rd", IDM_OPTIONS POPUP "&HjÃ¤lp" BEGIN MENUITEM "Hj&Ã¤lp", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "Laddar in HÃ¤ndelseloggen. VÃ¤nligen vÃ¤nta...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "HÃ¤ndelsedetaljer" @@ -73,9 +73,9 @@ LTEXT "&Dator:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&Beskrivning:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -8,13 +8,13 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&KayÄ±t" BEGIN - MENUITEM "&ProtokolÃ¼ Sakla...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "&ProtokolÃ¼ Sakla...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "&TÃ¼m OlaylarÄ± Sil", ID_CLEAR_EVENTS, GRAYED + MENUITEM "&TÃ¼m OlaylarÄ± Sil", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", IDM_EXIT END @@ -22,7 +22,7 @@ BEGIN MENUITEM "&Yenile", IDM_REFRESH END - MENUITEM "&SeÃ§enekler", ID_OPTIONS + MENUITEM "&SeÃ§enekler", IDM_OPTIONS POPUP "&YardÄ±m" BEGIN MENUITEM "&YardÄ±m", IDM_HELP @@ -31,7 +31,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -56,7 +56,7 @@ CTEXT "Olay kayÄ±tlarÄ± yÃ¼kleniyor. LÃ¼tfen bekleyiniz.", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "Olay AyrÄ±ntÄ±larÄ±" @@ -79,9 +79,9 @@ LTEXT "Bilgisayar:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "AÃ§Ä±klama:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "&ÐÐ²ÑÑ" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "Ð&Ð¸ÑÑÐ´", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "&ÐÐ½Ð¾Ð²Ð¸ÑÐ¸", IDM_REFRESH END - MENUITEM "&ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", ID_OPTIONS + MENUITEM "&ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", IDM_OPTIONS POPUP "&ÐÐ¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°" BEGIN MENUITEM "Ð&Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÐÐ²ÑÑÑ Ð¿Ð¾Ð´ÑÐ¹. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð·Ð°ÑÐµÐºÐ°Ð¹ÑÐµ ...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "ÐÐµÑÐ°Ð»Ñ Ð¿Ð¾Ð´ÑÑ" @@ -73,9 +73,9 @@ LTEXT "ÐÐ¾&Ð¼Ð¿'ÑÑÐµÑ:", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "&ÐÐ¿Ð¸Ñ:", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -2,13 +2,13 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -IDC_EVENTVWR MENU +IDM_EVENTVWR MENU BEGIN POPUP "æ¥å¿(&L)" BEGIN - MENUITEM "Save &Protocol...", ID_SAVE_PROTOCOL, GRAYED + MENUITEM "Save &Protocol...", IDM_SAVE_PROTOCOL, GRAYED MENUITEM SEPARATOR - MENUITEM "C&lear all Events", ID_CLEAR_EVENTS, GRAYED + MENUITEM "C&lear all Events", IDM_CLEAR_EVENTS, GRAYED MENUITEM SEPARATOR MENUITEM "éåº(&X)", IDM_EXIT END @@ -16,7 +16,7 @@ BEGIN MENUITEM "å·æ°(&R)", IDM_REFRESH END - MENUITEM "éé¡¹(&O)", ID_OPTIONS + MENUITEM "éé¡¹(&O)", IDM_OPTIONS POPUP "å¸®å©(&H)" BEGIN MENUITEM "å¸®å©åå®¹(&E)", IDM_HELP @@ -25,7 +25,7 @@ END END -IDC_EVENTVWR ACCELERATORS +IDA_EVENTVWR ACCELERATORS BEGIN "?", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT @@ -50,7 +50,7 @@ CTEXT "æ£å¨è½½å¥æ¥å¿ãè¯·ç¨å...", IDC_STATIC, 0, 15, 230, 8, SS_NOPREFIX END -IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 266, 251 +IDD_EVENTPROPERTIES DIALOGEX 0, 0, 266, 251 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP CAPTION "äºä»¶è¯¦ç»ä¿¡æ¯" @@ -73,9 +73,9 @@ LTEXT "è®¡ç®æº(&C)ï¼", IDC_STATIC, 8, 45, 36, 8 EDITTEXT IDC_EVENTCOMPUTERSTATIC, 46, 45, 152, 8, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "", IDPREVIOUS, 225, 5, 28, 14, BS_ICON - PUSHBUTTON "", IDNEXT, 225, 21, 28, 14, BS_ICON - PUSHBUTTON "", IDCOPY, 225, 37, 28, 14, BS_ICON + PUSHBUTTON "", IDC_PREVIOUS, 225, 5, 28, 14, BS_ICON + PUSHBUTTON "", IDC_NEXT, 225, 21, 28, 14, BS_ICON + PUSHBUTTON "", IDC_COPY, 225, 37, 28, 14, BS_ICON LTEXT "æè¿°(&D)ï¼", IDC_STATIC, 8, 65, 39, 8 EDITTEXT IDC_EVENTTEXTEDIT, 8, 76, 247, 88, ES_MULTILINE | ES_READONLY Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sat Dec 13 22:35:48 2014 @@ -1,57 +1,57 @@ #pragma once -#define IDC_STATIC -1 +/* Icon IDs */ +#define IDI_EVENTVWR 10 +#define IDI_WARNINGICON 11 +#define IDI_INFORMATIONICON 12 +#define IDI_ERRORICON 13 +#define IDI_NEXT 14 +#define IDI_PREV 15 +#define IDI_COPY 16 -#define IDC_MYICON 2 -#define IDNEXT 3 -#define IDCOPY 4 -#define IDI_NEXT 11 -#define IDI_PREV 12 -#define IDI_COPY 13 +/* Accelerator IDs */ +#define IDA_EVENTVWR 50 -#define IDD_EVENTVWR_DIALOG 102 -#define IDD_PROGRESSBOX 150 -#define IDD_ABOUTBOX 103 -#define IDM_ABOUT 104 -#define IDM_EXIT 105 -#define IDI_EVENTVWR 107 -#define IDI_SMALL 108 -#define IDC_EVENTVWR 109 -#define IDC_PROCESSPROGRESS 250 -#define IDR_MAINFRAME 128 -#define IDI_WARNINGICON 129 -#define IDI_INFORMATIONICON 130 -#define IDI_ERRORICON 131 -#define IDD_EVENTDETAILDIALOG 132 -#define IDC_EVENTTEXTEDIT 1000 +/* Dialog IDs */ +#define IDD_ABOUTBOX 101 +#define IDD_PROGRESSBOX 102 +#define IDD_EVENTPROPERTIES 103 + + +/* Control IDs*/ +#define IDC_STATIC -1 +#define IDC_MYICON 1000 #define IDC_EVENTDATESTATIC 1001 -#define IDC_EVENTTIMESTATIC 1002 -#define IDC_EVENTUSERSTATIC 1003 -#define IDC_EVENTCOMPUTERSTATIC 1004 -#define IDC_EVENTIDSTATIC 1005 -#define IDC_EVENTSOURCESTATIC 1006 -#define IDC_EVENTTYPESTATIC 1007 -#define IDC_EVENTCATEGORYSTATIC 1008 -#define IDPREVIOUS 1009 -#define IDC_EVENTTEXTEDIT2 1010 -#define IDC_BYTESRADIO 1011 -#define IDC_WORDRADIO 1013 -#define IDC_EVENTDATAEDIT 1014 +#define IDC_EVENTSOURCESTATIC 1002 +#define IDC_EVENTTIMESTATIC 1003 +#define IDC_EVENTCATEGORYSTATIC 1004 +#define IDC_EVENTTYPESTATIC 1005 +#define IDC_EVENTIDSTATIC 1006 +#define IDC_EVENTUSERSTATIC 1007 +#define IDC_EVENTCOMPUTERSTATIC 1008 +#define IDC_PREVIOUS 1009 +#define IDC_NEXT 1010 +#define IDC_COPY 1011 +#define IDC_EVENTTEXTEDIT 1012 +#define IDC_BYTESRADIO 1013 +#define IDC_WORDRADIO 1014 +#define IDC_EVENTDATAEDIT 1015 -#define ID_HELP_HELP 32771 -#define ID_HELP 32772 -#define ID_OPTIONS 32773 -#define ID_VIEW 32774 -#define IDM_HELP 32775 -#define ID_VIEW_REFRESH 32776 -#define ID_REFRESH 32777 -#define IDM_REFRESH 32778 -#define ID_CLEAR_EVENTS 32779 -#define ID_SAVE_PROTOCOL 32780 + +/* Menu IDs */ +#define IDM_EVENTVWR 32771 +#define IDM_CLEAR_EVENTS 32772 +#define IDM_SAVE_PROTOCOL 32773 +#define IDM_EXIT 32774 +#define IDM_REFRESH 32775 +#define IDM_OPTIONS 32776 +#define IDM_HELP 32777 +#define IDM_ABOUT 32778 #define ID_FIRST_LOG 45000 + /* String IDs */ #define IDS_APP_TITLE 103

1 0

[zguo] 65629: [COMP] Incorporate fixes provided by a patch from over three years ago that adds support for the additional compare options. Patch provided by kruntuid. Slight cleanup and reshuffling...
by zguo＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: zguo Date: Sat Dec 13 21:17:59 2014 New Revision: 65629 URL: http://svn.reactos.org/svn/reactos?rev=65629&view=rev Log: [COMP] Incorporate fixes provided by a patch from over three years ago that adds support for the additional compare options. Patch provided by kruntuid. Slight cleanup and reshuffling of some code to make it cleaner. CORE-8484 Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Sat Dec 13 21:17:59 2014 @@ -33,52 +33,70 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <assert.h> #define STRBUF 1024 /* getline: read a line, return length */ -INT GetLine(char *line, FILE *in) +INT GetBuff(char *buff, FILE *in) { - if (fgets(line, STRBUF, in) == NULL) - return 0; - else - return strlen(line); + return fread(buff, 1, STRBUF, in); +} + +INT FileSize(FILE * fd) { + INT result = -1; + if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1) + { + //restoring file pointer + rewind(fd); + } + return result; } /* print program usage */ VOID Usage(VOID) { _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" - "COMP [data1] [data2]\n\n" + "COMP [/L] [/A] [data1] [data2]\n\n" " data1 Specifies location and name of first file to compare.\n" - " data2 Specifies location and name of second file to compare.\n")); + " data2 Specifies location and name of second file to compare.\n" + " /A Display differences in ASCII characters.\n" + " /L Display line numbers for differences.\n")); } int _tmain (int argc, TCHAR *argv[]) { INT i; - FILE *fp1, *fp2; // file pointers - PTCHAR Line1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); - PTCHAR Line2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); - TCHAR File1[_MAX_PATH], // file paths - File2[_MAX_PATH]; - BOOL bMatch = TRUE, // files match - bAscii = FALSE, // /A switch + // file pointers + FILE *fp1 = NULL; + FILE *fp2 = NULL; + INT BufLen1, BufLen2; + PTCHAR Buff1 = NULL; + PTCHAR Buff2 = NULL; + TCHAR File1[_MAX_PATH + 1], // file paths + File2[_MAX_PATH + 1]; + BOOL bAscii = FALSE, // /A switch bLineNos = FALSE; // /L switch + UINT LineNumber; + UINT Offset; + INT FileSizeFile1; + INT FileSizeFile2; + INT NumberOfOptions = 0; + INT FilesOK = 1; + INT Status = EXIT_SUCCESS; /* parse command line for options */ for (i = 1; i < argc; i++) { if (argv[i][0] == '/') { - --argc; switch (argv[i][1]) { case 'A': bAscii = TRUE; - _tprintf(_T("/a not Supported\n")); (void)bAscii; /*FIXME: needs adding */ + NumberOfOptions++; break; case 'L': bLineNos = TRUE; - _tprintf(_T("/l not supported\n")); (void)bLineNos; /*FIXME: needs adding */ + NumberOfOptions++; break; case '?': Usage(); return EXIT_SUCCESS; @@ -90,92 +108,137 @@ } } - switch (argc) - { - case 1 : - _tprintf(_T("Name of first file to compare: ")); - fgets(File1, _MAX_PATH, stdin); - for (i=0; i<_MAX_PATH; i++) - { - if (File1[i] == '\n') - { - File1[i] = '\0'; - break; - } - } - - _tprintf(_T("Name of second file to compare: ")); - fgets(File2, _MAX_PATH, stdin); - for (i=0; i<_MAX_PATH; i++) - { - if (File2[i] == '\n') - { - File2[i] = '\0'; - break; - } - } - break; - case 2 : - _tcsncpy(File1, argv[1], _MAX_PATH); - _tprintf(_T("Name of second file to compare: ")); - fgets(File2, _MAX_PATH, stdin); - for (i=0; i<_MAX_PATH; i++) - { - if (File2[i] == '\n') - { - File2[i] = '\0'; - break; - } - } - break; - case 3 : - _tcsncpy(File1, argv[1], _MAX_PATH); - _tcsncpy(File2, argv[2], _MAX_PATH); - break; - default : - _tprintf(_T("Bad command line syntax\n")); - return EXIT_FAILURE; - break; - } - - - - if ((fp1 = fopen(File1, "r")) == NULL) + if (argc - NumberOfOptions == 3) + { + _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); + _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); + } else { + _tprintf(_T("Bad command line syntax\n")); + return EXIT_FAILURE; + } + + Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + if (Buff1 == NULL) + { + _tprintf(_T("Can't get free memory for Buff1\n")); + return EXIT_FAILURE; + } + + Buff2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); + if (Buff2 == NULL) + { + _tprintf(_T("Can't get free memory for Buff2\n")); + Status = EXIT_FAILURE; + goto Cleanup; + } + + if ((fp1 = fopen(File1, "rb")) == NULL) { _tprintf(_T("Can't find/open file: %s\n"), File1); - return EXIT_FAILURE; - } - if ((fp2 = fopen(File2, "r")) == NULL) + Status = EXIT_FAILURE; + goto Cleanup; + } + if ((fp2 = fopen(File2, "rb")) == NULL) { _tprintf(_T("Can't find/open file: %s\n"), File2); + Status = EXIT_FAILURE; + goto Cleanup; + } + + + _tprintf(_T("Comparing %s and %s...\n"), File1, File2); + + FileSizeFile1 = FileSize(fp1); + if (FileSizeFile1 == -1) + { + _tprintf(_T("Can't determine size of file: %s\n"), File1); + Status = EXIT_FAILURE; + goto Cleanup; + } + + FileSizeFile2 = FileSize(fp2); + if (FileSizeFile2 == -1) + { + _tprintf(_T("Can't determine size of file: %s\n"), File2); + Status = EXIT_FAILURE; + goto Cleanup; + } + + if (FileSizeFile1 != FileSizeFile2) + { + _tprintf(_T("Files are different sizes.\n")); + Status = EXIT_FAILURE; + goto Cleanup; + } + + LineNumber = 1; + Offset = 0; + while (1) + { + BufLen1 = GetBuff(Buff1, fp1); + BufLen2 = GetBuff(Buff2, fp2); + + if (ferror(fp1) || ferror(fp2)) + { + _tprintf(_T("Files read error.\n")); + Status = EXIT_FAILURE; + goto Cleanup; + } + + if (!BufLen1 && !BufLen2) + break; + + assert(BufLen1 == BufLen2); + for (i = 0; i < BufLen1; i++) + { + if (Buff1[i] != Buff2[i]) + { + FilesOK = 0; + + //Reporting here a mismatch + if (bLineNos) + { + _tprintf(_T("Compare error at LINE %d\n"), LineNumber); + } + else + { + _tprintf(_T("Compare error at OFFSET %d\n"), Offset); + } + + if (bAscii) + { + _tprintf(_T("file1 = %c\n"), Buff1[i]); + _tprintf(_T("file2 = %c\n"), Buff2[i]); + } + else + { + _tprintf(_T("file1 = %X\n"), Buff1[i]); + _tprintf(_T("file2 = %X\n"), Buff2[i]); + } + + Offset++; + + if (Buff1[i] == '\n') + LineNumber++; + } + } + } + + if (FilesOK) + _tprintf(_T("Files compare OK\n")); + +Cleanup: + + if(fp1) fclose(fp1); - return EXIT_FAILURE; - } - - - _tprintf(_T("Comparing %s and %s...\n"), File1, File2); - - while ((GetLine(Line1, fp1) != 0) && - (GetLine(Line2, fp2) != 0)) - { - // LineCount++; - while ((*Line1 != '\0') && (*Line2 != '\0')) - { - if (*Line1 != *Line2) - { - bMatch = FALSE; - break; - } - Line1++, Line2++; - } - } - - bMatch ? _tprintf(_T("Files compare OK\n")) : _tprintf(_T("Files are different sizes.\n")); - - fclose(fp1); - fclose(fp2); - - - return EXIT_SUCCESS; + if(fp2) + fclose(fp2); + + if(Buff1) + free(Buff1); + if(Buff2) + free(Buff2); + + return Status; } /* EOF */

1 0

[ekohl] 65628: [EVENTVWR] Update the Event Detail Dialog to better match XP/2K3 Patch by Lee Schroeder. I updated the remaining dialogs. Translators: Please check the dialogs! CORE_8904 #resolve
by ekohl＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: ekohl Date: Sat Dec 13 20:53:06 2014 New Revision: 65628 URL: http://svn.reactos.org/svn/reactos?rev=65628&view=rev Log: [EVENTVWR] Update the Event Detail Dialog to better match XP/2K3 Patch by Lee Schroeder. I updated the remaining dialogs. Translators: Please check the dialogs! CORE_8904 #resolve Added: trunk/reactos/base/applications/mscutils/eventvwr/res/copy.ico (with props) trunk/reactos/base/applications/mscutils/eventvwr/res/next_event.ico (with props) trunk/reactos/base/applications/mscutils/eventvwr/res/prev_event.ico (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/copy.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/next_event.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/prev_event.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

1 0

[tkreuzer] 65627: [DDK] ExInitializePushLock is NTAPI!
by tkreuzer＠svn.reactos.org 13 Dec '14

13 Dec '14

Author: tkreuzer Date: Sat Dec 13 14:37:34 2014 New Revision: 65627 URL: http://svn.reactos.org/svn/reactos?rev=65627&view=rev Log: [DDK] ExInitializePushLock is NTAPI! Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/xdk/exfuncs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=65… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Dec 13 14:37:34 2014 @@ -5213,6 +5213,7 @@ #define ExDisableResourceBoost ExDisableResourceBoostLite VOID +NTAPI ExInitializePushLock( _Out_ PEX_PUSH_LOCK PushLock); Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Sat Dec 13 14:37:34 2014 @@ -379,6 +379,7 @@ #define ExDisableResourceBoost ExDisableResourceBoostLite VOID +NTAPI ExInitializePushLock( _Out_ PEX_PUSH_LOCK PushLock); $endif (_NTIFS_)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs