Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[mkupfer] 52375: [TRANSLATIONS] fix the code_page-#pragma issue for Chinese - add Chinese to UTF-8 section - remove default #pragma at end of Romanian file
by mkupfer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: mkupfer Date: Sun Jun 19 22:11:42 2011 New Revision: 52375 URL: http://svn.reactos.org/svn/reactos?rev=52375&view=rev Log: [TRANSLATIONS] fix the code_page-#pragma issue for Chinese - add Chinese to UTF-8 section - remove default #pragma at end of Romanian file Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/calc/resource.rc 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 Jun 19 22:11:42 2011 @@ -730,5 +730,3 @@ IDS_WEIGHT_TONS_UK "Tone (Marea Britanie)" IDS_WEIGHT_TONS_US "Tone (SUA)" END - -#pragma code_page(default) 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 Jun 19 22:11:42 2011 @@ -3,8 +3,6 @@ * * By: Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> */ - -#pragma code_page(65001) LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Jun 19 22:11:42 2011 @@ -59,7 +59,6 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" -#include "lang/zh-CN.rc" // UTF-8 @@ -68,3 +67,4 @@ #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc"

1 0

[cgutman] 52374: [FASTFAT] - Move verification code to the BlockDev* functions (like CDFS does) so functions that call those directly will have verification handled for them - Add verification hand...
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 20:03:49 2011 New Revision: 52374 URL: http://svn.reactos.org/svn/reactos?rev=52374&view=rev Log: [FASTFAT] - Move verification code to the BlockDev* functions (like CDFS does) so functions that call those directly will have verification handled for them - Add verification handling for IOCTL requests Modified: trunk/reactos/drivers/filesystems/fastfat/blockdev.c trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/blockdev.c [iso-8859-1] Sun Jun 19 20:03:49 2011 @@ -37,6 +37,10 @@ if (Irp->PendingReturned) { IrpContext->Flags |= IRPCONTEXT_PENDINGRETURNED; + } + else + { + IrpContext->Flags &= ~IRPCONTEXT_PENDINGRETURNED; } if (!NT_SUCCESS(Irp->IoStatus.Status)) { @@ -67,6 +71,7 @@ KEVENT event; NTSTATUS Status; +again: KeInitializeEvent (&event, NotificationEvent, FALSE); DPRINT ("VfatReadDisk(pDeviceObject %p, Offset %I64x, Length %d, Buffer %p)\n", @@ -102,6 +107,25 @@ KeWaitForSingleObject (&event, Suspended, KernelMode, FALSE, NULL); DPRINT ("Getting IO Status... for %p\n", Irp); Status = IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing read request\n"); + goto again; + } } if (!NT_SUCCESS (Status)) @@ -134,6 +158,7 @@ Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; +again: Irp = IoAllocateIrp(IrpContext->DeviceExt->StorageDevice->StackSize, TRUE); if (Irp == NULL) { @@ -188,6 +213,25 @@ { KeWaitForSingleObject(&IrpContext->Event, Executive, KernelMode, FALSE, NULL); Status = IrpContext->Irp->IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing read request\n"); + goto again; + } } DPRINT("%x\n", Status); @@ -212,6 +256,7 @@ Buffer = (PCHAR)MmGetMdlVirtualAddress(IrpContext->Irp->MdlAddress) + BufferOffset; +again: DPRINT ("Building asynchronous FSD Request...\n"); Irp = IoAllocateIrp(IrpContext->DeviceExt->StorageDevice->StackSize, TRUE); if (Irp == NULL) @@ -266,6 +311,25 @@ { KeWaitForSingleObject(&IrpContext->Event, Executive, KernelMode, FALSE, NULL); Status = IrpContext->Irp->IoStatus.Status; + } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing write request\n"); + goto again; + } } return Status; @@ -292,6 +356,7 @@ InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, OutputBufferSize ? *OutputBufferSize : 0); +again: KeInitializeEvent (&Event, NotificationEvent, FALSE); DPRINT("Building device I/O control request ...\n"); @@ -328,6 +393,25 @@ Status = IoStatus.Status; } + + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + + DPRINT1 ("Media change detected!\n"); + + /* Find the device to verify and reset the thread field to empty value again. */ + DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); + IoSetDeviceToVerify (PsGetCurrentThread (), NULL); + Status = IoVerifyVolume (DeviceToVerify, + FALSE); + + if (NT_SUCCESS(Status)) + { + DPRINT1 ("Volume verification successful; Reissuing IOCTL request\n"); + goto again; + } + } if (OutputBufferSize) { Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Jun 19 20:03:49 2011 @@ -372,20 +372,6 @@ 0, FALSE); - if (Status == STATUS_VERIFY_REQUIRED) - - { - PDEVICE_OBJECT DeviceToVerify; - - DPRINT ("Media change detected!\n"); - DPRINT ("Device %p\n", DeviceExt->StorageDevice); - - /* Find the device to verify and reset the thread field to empty value again. */ - DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); - IoSetDeviceToVerify (PsGetCurrentThread (), NULL); - Status = IoVerifyVolume (DeviceToVerify, - FALSE); - } if (!NT_SUCCESS(Status)) { DPRINT ("Status %lx\n", Status); Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Jun 19 20:03:49 2011 @@ -537,7 +537,6 @@ PERESOURCE Resource = NULL; LARGE_INTEGER ByteOffset; PVOID Buffer; - PDEVICE_OBJECT DeviceToVerify; ULONG BytesPerSector; ASSERT(IrpContext); @@ -697,20 +696,6 @@ } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); - if (Status == STATUS_VERIFY_REQUIRED) - { - DPRINT("VfatReadFileData returned STATUS_VERIFY_REQUIRED\n"); - DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - Status = IoVerifyVolume (DeviceToVerify, FALSE); - - if (NT_SUCCESS(Status)) - { - Status = VfatReadFileData(IrpContext, Length, - ByteOffset, &ReturnedLength); - } - } - if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = ReturnedLength; @@ -767,7 +752,6 @@ ULONG OldAllocationSize; PVOID Buffer; ULONG BytesPerSector; - PDEVICE_OBJECT DeviceToVerify; ASSERT(IrpContext); @@ -989,19 +973,6 @@ } Status = VfatWriteFileData(IrpContext, Length, ByteOffset); - if (Status == STATUS_VERIFY_REQUIRED) - { - DPRINT("VfatWriteFileData returned STATUS_VERIFY_REQUIRED\n"); - DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - Status = IoVerifyVolume (DeviceToVerify, FALSE); - - if (NT_SUCCESS(Status)) - { - Status = VfatWriteFileData(IrpContext, Length, ByteOffset); - } - } - if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = Length;

1 0

[tkreuzer] 52373: [BROWSEUI] Fix rc syntax
by tkreuzer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tkreuzer Date: Sun Jun 19 19:48:43 2011 New Revision: 52373 URL: http://svn.reactos.org/svn/reactos?rev=52373&view=rev Log: [BROWSEUI] Fix rc syntax Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/browseui/lang/en-US.rc trunk/reactos/dll/win32/browseui/lang/es-ES.rc trunk/reactos/dll/win32/browseui/lang/pl-PL.rc trunk/reactos/dll/win32/browseui/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -26,14 +26,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&ÐÐ±Ð¸ÑÐ°Ð¹Ð½Ð¸ Ð±ÑÑÐ¾Ð½Ð¸", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&ÐÐ´ÑÐµÑÐ½Ð° Ð»ÐµÐ½ÑÐ°", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&ÐÑÑÐ·ÐºÐ¸", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ &Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&ÐÐ°Ð³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -123,7 +123,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -145,50 +145,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð¸Ð·Ð±ÑÐ°Ð½Ð¸ÑÐµ Ð¿ÑÐµÐ´Ð¼ÐµÑÐ¸." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð¸Ð·Ð³Ð»ÐµÐ´Ð°." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Ð¡ÑÐ´ÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¿Ð¾ÑÐ¾Ð±Ð¸ÑÑÐ°." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Ð¡ÑÑÑÑÐ¶Ð° Ð·Ð°Ð¿Ð¾Ð²ÐµÐ´Ð¸ Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð¼Ð¾Ñ." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "ÐÐ°ÑÐ²Ð°ÑÑ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." 9026 "ÐÑÐ¸Ð²Ð° ÑÐ°Ð²Ð½Ð¸ÑÐµ Ð½Ð°Ð³Ð¾ÑÐµ." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Ð¡Ð²ÑÑÐ²Ð°Ð½Ðµ ÐºÑÐ¼ Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." 9122 "Ð Ð°Ð·ÐºÐ°ÑÐ°Ð½Ðµ Ð¾Ñ Ð¼ÑÐµÐ¶Ð¾Ð²Ð¾ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð°ÑÐ°, Ð²ÐµÑÑÐ¸Ñ Ð¸ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¸ Ð¿ÑÐ°Ð²Ð°." 9252 "ÐÐ¾ÐºÐ°Ð·Ð²Ð° ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð½ÐµÐ´ÑÐ·Ð¸." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "ÐÑÐ¸Ð²Ð° Ð½Ð° Ð¿ÑÐµÐ´ÑÐ¾Ð´Ð½Ð°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°." 9282 "ÐÑÐ¸Ð²Ð° Ð½Ð° ÑÐ»ÐµÐ´Ð²Ð°ÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°." @@ -196,13 +196,13 @@ 9285 "ÐÑÐ¸Ð²Ð° Ð² Ð½Ð°ÑÐ°Ð»Ð½Ð°ÑÐ° Ð²Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ°." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "ÐÑÐ²Ð°ÑÑ Ð¿Ð°Ð¿ÐºÐ°ÑÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." 9363 "ÐÐ¾Ð±Ð°Ð²Ñ ÑÐµÐºÑÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ° ÐºÑÐ¼ ÑÐ¿Ð¸ÑÑÐºÐ° Ñ Ð»ÑÐ±Ð¸Ð¼ÐºÐ¸ÑÐµ." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Ð¡ÐºÑÐ¸Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." 9506 "Ð¡ÐºÑÐ¸Ð²Ð° Ð¸Ð»Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾." @@ -212,12 +212,12 @@ 9516 "ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð·Ð¼ÐµÑÐ¸ÑÐµ Ð¸ ÑÐ°Ð·Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ð° Ð»ÐµÐ½ÑÐ¸ÑÐµ Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "ÐÐ°Ð³Ð»Ð°ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ñ Ð¿Ð¾ÑÐ¾Ð±Ð¸Ñ." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð¸Ð»Ð¸ ÑÐºÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð½Ð° Ð¸Ð·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»Ñ." 9553 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð»ÐµÐ½ÑÐ°ÑÐ° Ð·Ð° ÑÑÑÑÐµÐ½Ðµ." @@ -227,47 +227,47 @@ 9559 "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "ÐÐ°Ð»ÐºÐ¸ Ð·Ð½Ð°ÑÐµÑÐ°" IDS_LARGEICONS "ÐÐ¾Ð»ÐµÐ¼Ð¸ Ð·Ð½Ð°ÑÐµÑÐ°" IDS_SHOWTEXTLABELS "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "ÐÐ¸Ð¿ÑÐ²Ð°Ñ ÑÐµÐºÑÑÐ¾Ð²Ð¸ ÐµÑÐ¸ÐºÐµÑÐ¸" IDS_SELECTIVETEXTONRIGHT "Selective text on right" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|ÐÑÐ¸Ð²Ð°Ð½Ðµ||" IDS_GOBUTTONTIPTEMPLATE "ÐÑÐ¸Ð²Ð°Ð½Ðµ Ð²""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Ð¢ÑÑÑÐµÐ½Ðµ" IDS_ADDRESSBANDLABEL "&ÐÐ´ÑÐµÑ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "ÐÐ°Ð¿ÐºÐ¸" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&ÐÐ½ÐµÐ²Ð½Ð¸Ðº\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "ÐÐ°Ð³Ð¾ÑÐµ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" Modified: trunk/reactos/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/en… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/en-US.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -23,14 +23,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&Standard Buttons", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&Address Bar", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&Links", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Lock the Tool&bars", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Customize...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Text Labels", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -120,7 +120,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -142,50 +142,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Contains commands for manipulating the selected items." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Contains edit commands." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Contains commands for manipulating the view." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Contains tools commands." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Contains commands for displaying Help." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Closes the window." 9026 "Goes up one level." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Connects to a network drive." 9122 "Disconnects from a network drive." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "Displays program information, version number, and copyright." 9252 "Displays information for debugging." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Goes to the previous page." 9282 "Goes to the next page." @@ -193,13 +193,13 @@ 9285 "Goes to your home page." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Opens the Favorites folder." 9363 "Adds the current page to your Favorites list." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Shows or hides toolbars." 9506 "Shows or hides the status bar." @@ -209,12 +209,12 @@ 9516 "Locks the sizes and positions of the toolbars." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Customizes the toolbar." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Shows or hides an Explorer bar." 9553 "Shows the Search bar." @@ -224,47 +224,47 @@ 9559 "Shows the Media Bar." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "Small icons" IDS_LARGEICONS "Large icons" IDS_SHOWTEXTLABELS "Show text labels" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "No text labels" IDS_SELECTIVETEXTONRIGHT "Selective text on right" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|Go||" IDS_GOBUTTONTIPTEMPLATE "Go to ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Search" IDS_ADDRESSBANDLABEL "A&ddress" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Folders" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&History\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "Up" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Back" IDS_FORWARD "Forward" Modified: trunk/reactos/dll/win32/browseui/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/es… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/es-ES.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -23,14 +23,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "Botones e&stándar", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&Barra de direcciones", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&Vínculos", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Bloquear las barras de &herramientas", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Personalizar...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Etiquetas", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -120,7 +120,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -142,50 +142,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Contiene comandos para trabajar con los elementos seleccionados." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Contiene comandos de edición." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Contiene comandos para manipular la vista." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Contiene comandos de herramientas." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Contiene comandos para mostrar la Ayuda." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Cierra la ventana." 9026 "Sube un nivel." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Conecta a unidad de red." 9122 "Desconecta de unidad de red." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "Muestra información sobre el programa, número de versión y copyright." 9252 "Muestra información para debugging." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Va a la página previa." 9282 "Va a la próxima página." @@ -193,13 +193,13 @@ 9285 "Va a página de inicio." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Abre la carpeta Organizar Favoritos." 9363 "Añade la página actual a la lista de Favoritos." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Muestra u oculta las barras de herramientas." 9506 "Muestra u oculta la barra de estado." @@ -209,12 +209,12 @@ 9516 "Bloquear el tamaño y la posición de las barras de herramientas." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Personalizar la barra de herramientas." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Muestra u oculta una de las barras del explorador." 9553 "Muestra la barra de búsqueda." @@ -224,47 +224,47 @@ 9559 "Muestra la barra de media." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "Iconos pequeños" IDS_LARGEICONS "Iconos grandes" IDS_SHOWTEXTLABELS "Muestra etiquetas de texto" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "Sin etiquetas de texto" IDS_SELECTIVETEXTONRIGHT "Selecciona el texto a la derecha" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|Ir||" IDS_GOBUTTONTIPTEMPLATE "Ir a ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Búsqueda" IDS_ADDRESSBANDLABEL "Dire&cción" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Carpetas" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&Historial\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "Arriba" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Atrás" IDS_FORWARD "Adelante" Modified: trunk/reactos/dll/win32/browseui/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -29,14 +29,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&Przyciski standardowe", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "Pasek &Adresu", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&OdnoÅniki", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "&Zablokuj paski narzÄdzi", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Dostosuj...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Etykiety", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -126,7 +126,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -148,50 +148,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Zawiera polecenia do manipulowania wybranymi elementami." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Zawiera polecenia do edycji." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Zawiera polecenia do zmiany widoku." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Zawiera polecenia dla narzÄdzi." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Zawiera polecenia do wyÅwietlania pomocy." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Zamyka okno." 9026 "Przechodzi o poziom wyÅ¼ej." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "PodÅÄcza dysk sieciowy." 9122 "OdÅÄcza dysk sieciowy." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "WyÅwietla informacje o programie, jego wersjÄ i licencjÄ." 9252 "WyÅwietla informacje do debugowania." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Przechodzi na poprzedniÄ stronÄ." 9282 "Przechodzi na nastÄpnÄ stronÄ." @@ -199,13 +199,13 @@ 9285 "Przechodzi na stronÄ domowÄ." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Otwiera katalog Ulubionych." 9363 "Dodaje bierzÄcÄ stronÄ do listy ulubionych." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Pokazuje lub ukrywa paski narzÄdzi." 9506 "Pokazuje lub ukrywa pasek stanu." @@ -215,12 +215,12 @@ 9516 "Blokuje poÅoÅ¼enie i rozmiar paskÃ³w." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Dostosowuje wybrane paski." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Pokazuje lub ukrywa Pasek Eksploratora." 9553 "Pokazuje pasek Wyszukiwania." @@ -230,47 +230,47 @@ 9559 "Pokazuje pasek MultimediÃ³w." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "MaÅe ikony" IDS_LARGEICONS "DuÅ¼e ikony" IDS_SHOWTEXTLABELS "PokaÅ¼ etykiety" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "Brak etykiet" IDS_SELECTIVETEXTONRIGHT "Tekst do zaznaczenia po prawej" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|IdÅº||" IDS_GOBUTTONTIPTEMPLATE "IdÅº do ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Wyszukaj" IDS_ADDRESSBANDLABEL "A&dres" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Katalogi" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&Historia\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "W gÃ³rÄ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Wstecz" IDS_FORWARD "NaprzÃ³d" Modified: trunk/reactos/dll/win32/browseui/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/uk-UA.rc [iso-8859-1] Sun Jun 19 19:48:43 2011 @@ -25,14 +25,14 @@ // Menus // -IDM_CABINET_CONTEXTMENU MENUEX +IDM_CABINET_CONTEXTMENU MENUEX BEGIN POPUP "", 264,MFT_STRING,MFS_ENABLED BEGIN MENUITEM "&Ñòàíäàðòí³ Êíîïêè", IDM_TOOLBARS_STANDARDBUTTONS,MFT_STRING,MFS_ENABLED MENUITEM "&Ðÿäîê Àäðåñè", IDM_TOOLBARS_ADDRESSBAR,MFT_STRING,MFS_ENABLED MENUITEM "&Ïîñèëàííÿ", IDM_TOOLBARS_LINKSBAR,MFT_STRING,MFS_ENABLED - MENUITEM SEPARATOR + MENUITEM "", -1, MFT_SEPARATOR MENUITEM "Áëîêóâàííÿ ïàíåëåé ³íñòðóìåíò³â", IDM_TOOLBARS_LOCKTOOLBARS,MFT_STRING,MFS_ENABLED MENUITEM "&Íàëàøòóâàòè...", IDM_TOOLBARS_CUSTOMIZE,MFT_STRING,MFS_ENABLED MENUITEM "&Òåêñòîâ³ ì³òêè", IDM_TOOLBARS_TEXTLABELS,MFT_STRING,MFS_ENABLED @@ -122,7 +122,7 @@ // Accelerator // -IDR_ACCELERATORS ACCELERATORS +IDR_ACCELERATORS ACCELERATORS BEGIN VK_F5, IDM_VIEW_REFRESH, VIRTKEY, NOINVERT VK_F5, IDM_VIEW_REFRESH, VIRTKEY, CONTROL, NOINVERT @@ -144,50 +144,50 @@ // Strings // -STRINGTABLE +STRINGTABLE BEGIN 800 "Ì³ñòèòü êîìàíäè ìàí³ïóëþâàííÿ âèáðàíèìè îá'ºêòàìè." END -STRINGTABLE +STRINGTABLE BEGIN 864 "Ì³ñòèòü êîìàíäè ïðàâêè." END -STRINGTABLE +STRINGTABLE BEGIN 928 "Ì³ñòèòü êîìàíäè ìàí³ïóëþâàííÿ âèãëÿäîì." END -STRINGTABLE +STRINGTABLE BEGIN 992 "Ì³ñòèòü êîìàíäè ³íñòðóìåíò³â." END -STRINGTABLE +STRINGTABLE BEGIN 1056 "Ì³ñòèòü êîìàíäè äëÿ â³äîáðàæåííÿ Äîïîìîãè." END -STRINGTABLE +STRINGTABLE BEGIN 9025 "Çàêðèâàº â³êíî." 9026 "Éäå ââåðõ íà îäèí ð³âåíü." END -STRINGTABLE +STRINGTABLE BEGIN 9121 "Ï³ä'ºäíóº äî ìåðåæåâîãî äèñêó." 9122 "Â³ä'ºäíóº â³ä ìåðåæåâîãî äèñêó." END -STRINGTABLE +STRINGTABLE BEGIN 9250 "Â³äîáðàæàº äàí³ ïðî ïðîãðàìó, íîìåð âåðñ³¿, òà copyright." 9252 "Â³äîáðàæàº äàí³ äëÿ íàëàãîäæåííÿ." END -STRINGTABLE +STRINGTABLE BEGIN 9281 "Éäå äî ïîïåðåäíüî¿ ñòîð³íêè." 9282 "Éäå äî íàñòóïíî¿ ñòîð³íêè." @@ -195,13 +195,13 @@ 9285 "Éäå äî âàøî¿ äîìàøíüî¿ ñòîð³íêè." END -STRINGTABLE +STRINGTABLE BEGIN 9362 "Â³äêðèâàº ïàïêó Îáðàíå." 9363 "Äîäàº ïîòî÷íó ñòîð³íêó äî ñïèñêó Îáðàíîãî." END -STRINGTABLE +STRINGTABLE BEGIN 9505 "Ïîêàçóº ÷è ïðèõîâóº ïàíåë³ ³íñòðóìåíò³â." 9506 "Ïîêàçóº ÷è ïðèõîâóº ðÿäîê ñòàíó." @@ -211,12 +211,12 @@ 9516 "Áëîêóº ðîçì³ðè òà ðîçòàøóâàííÿ ïàíåëåé ³íñòðóìåíò³â." END -STRINGTABLE +STRINGTABLE BEGIN 9533 "Ïåðñîíàë³çóº ïàíåëü ³íñòðóìåíò³â." END -STRINGTABLE +STRINGTABLE BEGIN 9552 "Ïîêàçóº ÷è ïðèõîâóº ïàíåëü Ïðîâ³äíèêà." 9553 "Ïîêàçóº ïàíåëü Ïîøóêó." @@ -226,47 +226,47 @@ 9559 "Ïîêàçóº ïàíåëü Ìåä³à." END -STRINGTABLE +STRINGTABLE BEGIN IDS_SMALLICONS "Ìàë³ çíà÷êè" IDS_LARGEICONS "Âåëèê³ çíà÷êè" IDS_SHOWTEXTLABELS "Ïîêàçàòè òåêñòîâ³ ì³òêè" END -STRINGTABLE +STRINGTABLE BEGIN IDS_NOTEXTLABELS "Áåç òåêñòîâèõ ì³òîê" IDS_SELECTIVETEXTONRIGHT "×àñòèíà òåêñòó ïðàâîðó÷" END -STRINGTABLE +STRINGTABLE BEGIN IDS_GOBUTTONLABEL "|Éòè||" IDS_GOBUTTONTIPTEMPLATE "Éòè äî ""%s""" END -STRINGTABLE +STRINGTABLE BEGIN IDS_SEARCHLABEL "Ïîøóê" IDS_ADDRESSBANDLABEL "À&äðåñà" END -STRINGTABLE +STRINGTABLE BEGIN IDS_FOLDERSLABEL "Ïàïêè" END -STRINGTABLE +STRINGTABLE BEGIN IDS_HISTORYTEXT "&²ñòîð³ÿ\tCtrl+H" END -STRINGTABLE +STRINGTABLE BEGIN IDS_UP "Ââåðõ" END -STRINGTABLE +STRINGTABLE BEGIN IDS_BACK "Íàçàä" IDS_FORWARD "Âïåðåä"

1 0

[cgutman] 52372: [FASTFAT] - Handle STATUS_VERIFY_REQUIRED for write requests - Clear the device to verify after retrieving it - Fixes write failure after changing floppy media [CDFS] - Reissue the...
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 19:43:52 2011 New Revision: 52372 URL: http://svn.reactos.org/svn/reactos?rev=52372&view=rev Log: [FASTFAT] - Handle STATUS_VERIFY_REQUIRED for write requests - Clear the device to verify after retrieving it - Fixes write failure after changing floppy media [CDFS] - Reissue the I/O request if IoVerifyVolume was successful - Fixes read after a media change Modified: trunk/reactos/drivers/filesystems/cdfs/common.c trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/common.c [iso-8859-1] Sun Jun 19 19:43:52 2011 @@ -50,6 +50,7 @@ PIRP Irp; NTSTATUS Status; +again: KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -102,14 +103,19 @@ if (Status == STATUS_VERIFY_REQUIRED) { PDEVICE_OBJECT DeviceToVerify; - NTSTATUS NewStatus; DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); IoSetDeviceToVerify(PsGetCurrentThread(), NULL); - NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); + Status = IoVerifyVolume(DeviceToVerify, FALSE); + DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); + + if (NT_SUCCESS(Status)) + { + DPRINT1("Volume verify succeeded; trying request again\n"); + goto again; + } } DPRINT("CdfsReadSectors() failed (Status %x)\n", Status); @@ -146,6 +152,7 @@ InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, OutputBufferSize ? *OutputBufferSize : 0); +again: KeInitializeEvent (&Event, NotificationEvent, FALSE); DPRINT("Building device I/O control request ...\n"); @@ -191,7 +198,6 @@ if (Status == STATUS_VERIFY_REQUIRED) { PDEVICE_OBJECT DeviceToVerify; - NTSTATUS NewStatus; DPRINT1("STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); @@ -199,8 +205,14 @@ if (DeviceToVerify) { - NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); - DPRINT1("IoVerifyVolume() returned (Status %lx)\n", NewStatus); + Status = IoVerifyVolume(DeviceToVerify, FALSE); + DPRINT1("IoVerifyVolume() returned (Status %lx)\n", Status); + } + + if (NT_SUCCESS(Status)) + { + DPRINT1("Volume verify succeeded; trying request again\n"); + goto again; } } Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Jun 19 19:43:52 2011 @@ -697,12 +697,11 @@ } Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); -/**/ if (Status == STATUS_VERIFY_REQUIRED) { - DPRINT("VfatReadFile returned STATUS_VERIFY_REQUIRED\n"); + DPRINT("VfatReadFileData returned STATUS_VERIFY_REQUIRED\n"); DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); - IoSetDeviceToVerify(PsGetCurrentThread(), DeviceToVerify); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); Status = IoVerifyVolume (DeviceToVerify, FALSE); if (NT_SUCCESS(Status)) @@ -710,9 +709,8 @@ Status = VfatReadFileData(IrpContext, Length, ByteOffset, &ReturnedLength); } - - } -/**/ + } + if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = ReturnedLength; @@ -769,6 +767,7 @@ ULONG OldAllocationSize; PVOID Buffer; ULONG BytesPerSector; + PDEVICE_OBJECT DeviceToVerify; ASSERT(IrpContext); @@ -990,6 +989,19 @@ } Status = VfatWriteFileData(IrpContext, Length, ByteOffset); + if (Status == STATUS_VERIFY_REQUIRED) + { + DPRINT("VfatWriteFileData returned STATUS_VERIFY_REQUIRED\n"); + DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); + Status = IoVerifyVolume (DeviceToVerify, FALSE); + + if (NT_SUCCESS(Status)) + { + Status = VfatWriteFileData(IrpContext, Length, ByteOffset); + } + } + if (NT_SUCCESS(Status)) { IrpContext->Irp->IoStatus.Information = Length;

1 0

[tfaber] 52371: [KMTESTS] - add START_TEST macro in case test functions ever have to be passed an argument - add a few ok_* convenience macros - remove unnecessary C library function renaming macros
by tfaber＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tfaber Date: Sun Jun 19 18:27:14 2011 New Revision: 52371 URL: http://svn.reactos.org/svn/reactos?rev=52371&view=rev Log: [KMTESTS] - add START_TEST macro in case test functions ever have to be passed an argument - add a few ok_* convenience macros - remove unnecessary C library function renaming macros Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Sun Jun 19 18:27:14 2011 @@ -8,7 +8,7 @@ #include <ntddk.h> #include <kmt_test.h> -VOID Test_Example(VOID) +START_TEST(Example) { KIRQL Irql; @@ -17,5 +17,18 @@ trace("Message from kernel, low-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); KeRaiseIrql(HIGH_LEVEL, &Irql); trace("Message from kernel, high-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); + + ok_irql(DISPATCH_LEVEL); + ok_eq_int(5, 6); + ok_eq_uint(6U, 7U); + ok_eq_long(1L, 2L); + ok_eq_ulong(3LU, 4LU); + ok_eq_pointer((PVOID)8, (PVOID)9); + ok_eq_hex(0x1234LU, 0x5678LU); + ok_bool_true(FALSE, "foo"); + ok_bool_false(TRUE, "bar"); + ok_eq_print(1, 2, "%i"); + ok_eq_str("Hello", "world"); + ok_eq_wstr(L"ABC", L"DEF"); KeLowerIrql(Irql); } Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Sun Jun 19 18:27:14 2011 @@ -37,6 +37,8 @@ extern PKMT_RESULTBUFFER ResultBuffer; +#define START_TEST(name) VOID Test_##name(VOID) + #define KMT_STRINGIZE(x) #x #define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) #define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) @@ -49,6 +51,21 @@ VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments); VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...); +#ifdef KMT_KERNEL_MODE +#define ok_irql(irql) ok(KeGetCurrentIrql() == irql, "IRQL is %d, expected %d\n", KeGetCurrentIrql(), irql) +#endif /* defined KMT_KERNEL_MODE */ +#define ok_eq_print(value, expected, spec) ok(value == expected, #value " = " spec ", expected " spec "\n", value, expected) +#define ok_eq_pointer(value, expected) ok_eq_print(value, expected, "%p") +#define ok_eq_int(value, expected) ok_eq_print(value, expected, "%d") +#define ok_eq_uint(value, expected) ok_eq_print(value, expected, "%u") +#define ok_eq_long(value, expected) ok_eq_print(value, expected, "%ld") +#define ok_eq_ulong(value, expected) ok_eq_print(value, expected, "%lu") +#define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") +#define ok_bool_true(value, desc) ok(value == TRUE, desc " FALSE, expected TRUE\n") +#define ok_bool_false(value, desc) ok(value == FALSE, desc " TRUE, expected FALSE\n") +#define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) +#define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) + #if defined KMT_DEFINE_TEST_FUNCTIONS PKMT_RESULTBUFFER ResultBuffer = NULL; @@ -70,10 +87,6 @@ HeapFree(GetProcessHeap(), 0, Buffer); } #endif /* defined KMT_USER_MODE */ - -#define KmtMemCpy memcpy -#define KmtStrLen strlen -#define KmtAssert assert static VOID KmtAddToLogBuffer(PKMT_RESULTBUFFER Buffer, PCSTR String, SIZE_T Length) { @@ -92,7 +105,7 @@ } } while (InterlockedCompareExchange(&Buffer->LogBufferLength, NewLength, OldLength) != OldLength); - KmtMemCpy(&Buffer->LogBuffer[OldLength], String, Length); + memcpy(&Buffer->LogBuffer[OldLength], String, Length); } #ifdef KMT_KERNEL_MODE @@ -108,16 +121,16 @@ if (Prepend1) { - SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend1)); - KmtMemCpy(Buffer, Prepend1, Length); + SIZE_T Length = min(BufferMaxLength, strlen(Prepend1)); + memcpy(Buffer, Prepend1, Length); Buffer += Length; BufferLength += Length; BufferMaxLength -= Length; } if (Prepend2) { - SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend2)); - KmtMemCpy(Buffer, Prepend2, Length); + SIZE_T Length = min(BufferMaxLength, strlen(Prepend2)); + memcpy(Buffer, Prepend2, Length); Buffer += Length; BufferLength += Length; BufferMaxLength -= Length;

1 0

[jgardou] 52370: addendum to r52369: forgot those
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 16:40:10 2011 New Revision: 52370 URL: http://svn.reactos.org/svn/reactos?rev=52370&view=rev Log: addendum to r52369: forgot those Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt trunk/reactos/base/applications/mmc/CMakeLists.txt trunk/reactos/base/applications/msconfig/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt trunk/reactos/base/applications/notepad/CMakeLists.txt trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/services/eventlog/CMakeLists.txt trunk/reactos/base/system/services/CMakeLists.txt Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/C… ============================================================================== --- trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -20,12 +20,12 @@ add_executable(dxdiag ${SOURCE}) -add_pch(dxdiag precomp.h) - set_module_type(dxdiag win32gui) target_link_libraries(dxdiag dxguid) add_importlibs(dxdiag user32 advapi32 comctl32 dinput8 setupapi dsound ddraw version gdi32 winmm d3d9 msvcrt kernel32 ntdll) +add_pch(dxdiag precomp.h) + add_cd_file(TARGET dxdiag DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak… ============================================================================== --- trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -10,7 +10,6 @@ add_executable(mmcclient ${SOURCE}) -add_pch(mmcclient precomp.h) - set_module_type(mmcclient win32gui) add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32) +add_pch(mmcclient precomp.h) Modified: trunk/reactos/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -14,8 +14,7 @@ add_executable(msconfig ${SOURCE}) -add_pch(msconfig precomp.h) - set_module_type(msconfig win32gui) add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32) +add_pch(msconfig precomp.h) add_cd_file(TARGET msconfig DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -11,8 +11,7 @@ add_executable(devmgmt ${SOURCE}) -add_pch(devmgmt precomp.h) - set_module_type(devmgmt win32gui) add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32) +add_pch(devmgmt precomp.h) add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -10,8 +10,7 @@ add_executable(notepad ${SOURCE}) -add_pch(notepad notepad.h) - set_module_type(notepad win32gui) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) +add_pch(notepad notepad.h) add_cd_file(TARGET notepad DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -25,8 +25,7 @@ add_executable(taskmgr ${SOURCE}) -add_pch(taskmgr precomp.h) - set_module_type(taskmgr win32gui) add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll) +add_pch(taskmgr precomp.h) add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMa… ============================================================================== --- trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -15,8 +15,7 @@ target_link_libraries(eventlog eventlogrpc ${PSEH_LIB}) -add_pch(eventlog eventlog.h) - set_module_type(eventlog win32cui) add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(eventlog eventlog.h) add_cd_file(TARGET eventlog DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… ============================================================================== --- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:40:10 2011 @@ -20,8 +20,7 @@ svcctlrpc ${PSEH_LIB}) -add_pch(services services.h) - set_module_type(services win32cui) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(services services.h) add_cd_file(TARGET services DESTINATION reactos/system32 FOR all)

1 0

[jgardou] 52369: [CMAKE] - set PCH file after importing libraries for modules that link to msvcrt. Otherwise it wouldn't get the added definitions and become useless.
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 16:35:43 2011 New Revision: 52369 URL: http://svn.reactos.org/svn/reactos?rev=52369&view=rev Log: [CMAKE] - set PCH file after importing libraries for modules that link to msvcrt. Otherwise it wouldn't get the added definitions and become useless. Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/logoff/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/regedit/CMakeLists.txt trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/shutdown/CMakeLists.txt trunk/reactos/base/applications/sndvol32/CMakeLists.txt trunk/reactos/base/services/tcpsvcs/CMakeLists.txt trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/system/winlogon/CMakeLists.txt trunk/reactos/dll/win32/authz/CMakeLists.txt trunk/reactos/dll/win32/msafd/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/CM… ============================================================================== --- trunk/reactos/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -6,8 +6,6 @@ add_executable(cacls ${SOURCE}) -add_pch(cacls precomp.h) - set_module_type(cacls win32cui) add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32) add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -18,5 +18,5 @@ if(MSVC) add_importlibs(calc ntdll) endif() - +add_pch(calc calc.h) add_cd_file(TARGET calc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -11,10 +11,10 @@ add_executable(charmap ${SOURCE}) -add_pch(charmap precomp.h) - set_module_type(charmap win32gui) add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32) +add_pch(charmap precomp.h) + add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/C… ============================================================================== --- trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/logoff/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -6,8 +6,7 @@ add_executable(logoff ${SOURCE}) -add_pch(logoff precomp.h) - set_module_type(logoff win32cui) add_importlibs(logoff advapi32 user32 msvcrt kernel32) +add_pch(logoff precomp.h) add_cd_file(TARGET logoff DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -26,10 +26,10 @@ add_executable(servman ${SOURCE}) -add_pch(servman precomp.h) - set_module_type(servman win32gui) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) +add_pch(servman precomp.h) + add_cd_file(TARGET servman DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… ============================================================================== --- trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -25,10 +25,10 @@ add_executable(mstsc ${SOURCE}) -add_pch(mstsc precomp.h) - set_module_type(mstsc win32gui) add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32) +add_pch(mstsc precomp.h) + add_cd_file(TARGET mstsc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -22,14 +22,14 @@ add_executable(regedit ${SOURCE}) -add_pch(regedit regedit.h) - set_module_type(regedit win32gui) target_link_libraries(regedit uuid) add_importlibs(regedit user32 gdi32 advapi32 ole32 shell32 comctl32 comdlg32 shlwapi msvcrt kernel32) +add_pch(regedit regedit.h) + #add_subdirectory(clb) add_cd_file(TARGET regedit DESTINATION reactos FOR all) Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… ============================================================================== --- trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -15,8 +15,7 @@ add_executable(sc ${SOURCE}) -add_pch(sc sc.h) - set_module_type(sc win32cui) add_importlibs(sc advapi32 msvcrt kernel32) +add_pch(sc sc.h) add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -6,8 +6,7 @@ add_executable(shutdown ${SOURCE}) -add_pch(shutdown precomp.h) - set_module_type(shutdown win32cui) add_importlibs(shutdown advapi32 user32 msvcrt kernel32) +add_pch(shutdown precomp.h) add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -10,8 +10,7 @@ add_executable(sndvol32 ${SOURCE}) -add_pch(sndvol32 sndvol32.h) - set_module_type(sndvol32 win32gui) add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll) +add_pch(sndvol32 sndvol32.h) add_cd_file(TARGET sndvol32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/CMak… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -14,9 +14,9 @@ add_executable(tcpsvcs ${SOURCE}) -add_pch(tcpsvcs tcpsvcs.h) set_module_type(tcpsvcs win32cui) add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll) +add_pch(tcpsvcs tcpsvcs.h) add_cd_file(TARGET tcpsvcs DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -76,7 +76,7 @@ target_link_libraries(cmd wine) -add_pch(cmd precomp.h) set_module_type(cmd win32cui) add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll) +add_pch(cmd precomp.h) add_cd_file(TARGET cmd DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… ============================================================================== --- trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -22,7 +22,6 @@ target_link_libraries(explorer_new uuid) -add_pch(explorer_new precomp.h) set_module_type(explorer_new win32gui) add_importlibs(explorer_new advapi32 @@ -37,5 +36,6 @@ msvcrt kernel32 ntdll) +add_pch(explorer_new precomp.h) add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) Modified: trunk/reactos/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/CMake… ============================================================================== --- trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -12,8 +12,7 @@ target_link_libraries(winlogon wine) -add_pch(winlogon winlogon.h) - set_module_type(winlogon win32gui) add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) +add_pch(winlogon winlogon.h) add_cd_file(TARGET winlogon DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/authz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -15,7 +15,7 @@ set_module_type(authz win32dll) +add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_pch(authz precomp.h) -add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/msafd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -20,7 +20,6 @@ set_module_type(msafd win32dll) +add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_pch(msafd msafd.h) - -add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -77,8 +77,6 @@ add_library(shell32 SHARED ${SOURCE}) -add_pch(shell32 precomp.h) - set_module_type(shell32 win32dll) target_link_libraries(shell32 @@ -101,6 +99,8 @@ kernel32 msvcrt ntdll) + +add_pch(shell32 precomp.h) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) add_importlib_target(shell32.spec) Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sun Jun 19 16:35:43 2011 @@ -75,7 +75,7 @@ win32ksys ${PSEH_LIB}) +add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_pch(user32 include/user32.h) -add_importlibs(user32 gdi32 advapi32 imm32 msvcrt kernel32 ntdll) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) add_importlib_target(user32.spec)

1 0

[mkupfer] 52368: patch by Song Fuchang (0xfc) <sfc_0 AT yahoo DOT com DOT cn>: - [TRANSLATIONS] add Simplified Chinese translation for calc - #pragma code_page(65001) added in zh-CN.rc (needs to be...
by mkupfer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: mkupfer Date: Sun Jun 19 16:34:58 2011 New Revision: 52368 URL: http://svn.reactos.org/svn/reactos?rev=52368&view=rev Log: patch by Song Fuchang (0xfc) <sfc_0 AT yahoo DOT com DOT cn>: - [TRANSLATIONS] add Simplified Chinese translation for calc - #pragma code_page(65001) added in zh-CN.rc (needs to be reviewed) - See issue #6319 for details. Added: trunk/reactos/base/applications/calc/lang/zh-CN.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc Added: 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 (added) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Sun Jun 19 16:34:58 2011 @@ -1,0 +1,740 @@ +/* + * Simplified Chinese translation for calc + * + * By: Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + */ + +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS è®¡ç®å¨" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "åå",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "åå",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "å",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "åè",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "è§åº¦",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "å¼§åº¦",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "æ¢¯åº¦",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS è®¡ç®å¨" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS è®¡ç®å¨" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "è½¬æ¢",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ç±»å«:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ä»...è½¬æ¢:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "è½¬æ¢ä¸º:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "å³äº ReactOS è®¡ç®å¨" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ç¡®å®",IDOK,105,148,52,16 + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "ReactOS è®¡ç®å¨",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "çæ¬ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "ä½è Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ç»è®¡æ¡" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "è¿å",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "å è½½",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "æ¸é¤",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "å¨æ¸",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "ç¼è¾" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", IDM_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "æ¥ç" + BEGIN + MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "åè¿å¶\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "å«è¿å¶\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "äºè¿å¶\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "è§åº¦\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "å¼§åº¦\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "æ¢¯åº¦\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED + END + POPUP "å¸®å©" + BEGIN + MENUITEM "å¸®å©ä¸»é¢", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "å³äº ReactOS è®¡ç®å¨", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "ç¼è¾" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", IDM_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "æ¥ç" + BEGIN + MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "åè¿å¶\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "å«è¿å¶\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "äºè¿å¶\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "åå\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "åå\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "å\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "åè\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED + END + POPUP "å¸®å©" + BEGIN + MENUITEM "å¸®å©ä¸»é¢", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "å³äº ReactOS è®¡ç®å¨", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "ç¼è¾" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", IDM_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "æ¥ç" + BEGIN + MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED + END + POPUP "å¸®å©" + BEGIN + MENUITEM "å¸®å©ä¸»é¢", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "å³äº ReactOS è®¡ç®å¨", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS è®¡ç®å¨æ¯å¨ GNU GPL åè®®ä¸åè¡çèªç±è½¯ä»¶ã\r\n\r\nä½ å¯ä»¥ä»è¿å¿åå¾ä¸ä»½ GNU GPL åè®®çå¯æ¬ï¼\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nä½ ä¹å¯ä»¥ä»è¿å¿åå¾å¶ç¿»è¯ï¼\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "éè¯¯" + IDS_QUICKHELP "å¿«éå¸®å©" +END + +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "è§" + IDS_CONV_AREA "é¢ç§¯" + IDS_CONV_CONSUMPTION "æ²¹è (å¼æ)" + IDS_CONV_CURRENCY "è´§å¸" + IDS_CONV_ENERGY "è½é" + IDS_CONV_LENGTH "é¿åº¦" + IDS_CONV_POWER "åç" + IDS_CONV_PRESSURE "åå" + IDS_CONV_TEMPERATURE "æ¸©åº¦" + IDS_CONV_TIME "æ¶é´" + IDS_CONV_VELOCITY "éåº¦" + IDS_CONV_VOLUME "ä½ç§¯" + IDS_CONV_WEIGHT "è´¨é" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "è§åº¦" + IDS_ANGLE_GRADIANS "æ¢¯åº¦" + IDS_ANGLE_RADIANS "å¼§åº¦" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "è±äº©" + IDS_AREA_ACRES_BRAZIL "è±äº© (å·´è¥¿)" + IDS_AREA_ACRES_FRANCE "è±äº© (æ³å½)" + IDS_AREA_ACRES_SCOTS "è±äº© (èæ ¼å°)" + IDS_AREA_ACRES_US "è±äº© (ç¾å½)" + IDS_AREA_ARES "å¬äº©" + IDS_AREA_CHOU "ç´" + IDS_AREA_DANBO "å¤§äº©" + IDS_AREA_HECTARES "å¬é¡·" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "æ©æ ¹ (åçå©)" + IDS_AREA_MU "äº©" + IDS_AREA_PING "åª" + IDS_AREA_PYEONG "åª (é©å½)" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "è±" + IDS_AREA_SE "äº© (æ¥æ¬)" + IDS_AREA_SQUARE_CENTIMETERS "å¹³æ¹åç±³" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "å¹³æ¹è±å¯»" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "å¹³æ¹è±å¯» (åçå©)" + IDS_AREA_SQUARE_FEET "å¹³æ¹è±å°º" + IDS_AREA_SQUARE_INCHES "å¹³æ¹è±å¯¸" + IDS_AREA_SQUARE_KILOMETERS "å¹³æ¹åç±³" + IDS_AREA_SQUARE_LAR "å¹³æ¹æå°" + IDS_AREA_SQUARE_METER "å¹³æ¹ç±³" + IDS_AREA_SQUARE_MILES "å¹³æ¹è±é" + IDS_AREA_SQUARE_MILLIMETERS "å¹³æ¹æ¯«ç±³" + IDS_AREA_SQUARE_SHAKU "å¹³æ¹å°º" + IDS_AREA_SQUARE_TSUEN "å¹³æ¹å¯¸" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "å¹³æ¹ç " + IDS_AREA_TAN "æ®µ" + IDS_AREA_TSUBO "åª (æ¥æ¬)" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "åç±³/å" + IDS_CONSUMPTION_L_PER_100_KM "å/100 åç±³" + IDS_CONSUMPTION_MILES_GALLON_UK "è±é/å ä» (è±å½)" + IDS_CONSUMPTION_MILES_GALLON_US "è±é/å ä» (ç¾å½)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "å¥¥å°å©åä»¤" + IDS_CURRENCY_BELGIAN_FRANC "æ¯å©æ¶æ³é" + IDS_CURRENCY_CYPRIOT_POUND "å¡æµ¦è·¯æ¯é" + IDS_CURRENCY_CZECH_KORUNA "æ·ååæ" + IDS_CURRENCY_DEUTSCHE_MARK "å¾·å½é©¬å" + IDS_CURRENCY_DUTCH_GUILDER "è·å°ç¾" + IDS_CURRENCY_EURO "æ¬§å" + IDS_CURRENCY_FINNISH_MARKKA "è¬å°é©¬å" + IDS_CURRENCY_FRENCH_FRANC "æ³é" + IDS_CURRENCY_GREEK_DRACHMA "å¸èå¾·æåé©¬" + IDS_CURRENCY_IRISH_POUND "ç±å°å°é" + IDS_CURRENCY_ITALIAN_LIRA "æå¤§å©éæ" + IDS_CURRENCY_LUXEMBOURG_FRANC "å¢æ£®å ¡æ³é" + IDS_CURRENCY_MALTESE_LIRA "é©¬è³ä»éæ" + IDS_CURRENCY_PORTOGUESE_ESCUDO "è¡èçåæ¯åºå¤" + IDS_CURRENCY_SLOVAK_KORUNA "æ¯æ´ä¼ååæ" + IDS_CURRENCY_SLOVENIAN_TOLAR "æ¯æ´æå°¼äºææ" + IDS_CURRENCY_SPANISH_PESETA "è¥¿ççæ¯å¡å¡" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 Â°C å¡è·¯é" + IDS_ENERGY_BTUS "è±å¶çéåä½" + IDS_ENERGY_ERGS "å°æ ¼" + IDS_ENERGY_EVS "çµåä¼ç¹" + IDS_ENERGY_FOOT_POUNDS "è±å°º-ç£" + IDS_ENERGY_IT_CALORIES "å½éè¸æ±½è¡¨å¡è·¯é" + IDS_ENERGY_IT_KILOCALORIES "å½éè¸æ±½è¡¨åå¡è·¯é" + IDS_ENERGY_JOULES "ç¦è³" + IDS_ENERGY_KILOJOULES "åç¦" + IDS_ENERGY_KILOWATT_HOURS "åç¦æ¶" + IDS_ENERGY_NUTRITION_CALORIES "è¥å»å¡è·¯é" + IDS_ENERGY_TH_CALORIES "çåå¦å¡è·¯é" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "å" + IDS_LENGTH_ASTRONOMICAL_UNITS "å¤©æåä½" + IDS_LENGTH_BARLEYCORNS "å·´å©è¯" + IDS_LENGTH_CENTIMETERS "åç±³" + IDS_LENGTH_CHAINS_UK "é¾ (è±å½)" + IDS_LENGTH_CHI "å°º" + IDS_LENGTH_CHOU "ç´" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "å¯¸" + IDS_LENGTH_FATHOMS "è±å¯»" + IDS_LENGTH_FATHOMS_HUNGARY "è±å¯» (åçå©)" + IDS_LENGTH_FEET "è±å°º" + IDS_LENGTH_FURLONGS "æµª" + IDS_LENGTH_GAN "æ" + IDS_LENGTH_HANDS "æå®½" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "è±å°º" + IDS_LENGTH_JA "å°º (é©å½)" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "åç±³" + IDS_LENGTH_LAR "æå°" + IDS_LENGTH_LIGHT_YEARS "åå¹´" + IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_METERS "ç±³" + IDS_LENGTH_MICRONS "å¾®ç±³" + IDS_LENGTH_MILES "è±é" + IDS_LENGTH_MILLIMETERS "æ¯«ç±³" + IDS_LENGTH_NAUTICAL_MILES "æµ·é" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "é (æ¥æ¬)" + IDS_LENGTH_RI_KOREA "é (é©å½)" + IDS_LENGTH_RODS "æ" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "å°º (æ¥æ¬)" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "å¯¸ (æ¥æ¬)" + IDS_LENGTH_TSUEN "å¯¸" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "ç " + IDS_LENGTH_YOTE "çº¦ç¹" + IDS_LENGTH_ZHANG "ä¸" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "è±å¶çéåä½æ¯åé" + IDS_POWER_FPS_PER_MINUTE "è±å°º-ç£æ¯åé" + IDS_POWER_HORSEPOWER "é©¬å" + IDS_POWER_KILOWATTS "åç¦" + IDS_POWER_MEGAWATTS "åç¦" + IDS_POWER_WATTS "ç¦" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "å¤§æ°å" + IDS_PRESSURE_BARS "å·´" + IDS_PRESSURE_HECTOPASCALS "ç¾å¸" + IDS_PRESSURE_KILOPASCALS "åå¸" + IDS_PRESSURE_MM_OF_MERCURY "æ¯«ç±³æ±æ±" + IDS_PRESSURE_PASCALS "å¸" + IDS_PRESSURE_PSI "è±ç£-åæ¯å¹³æ¹è±å°º" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "ææ°åº¦" + IDS_TEMPERATURE_FAHRENHEIT "åæ°åº¦" + IDS_TEMPERATURE_KELVIN "å¼å°æ" + IDS_TEMPERATURE_RANKINE "å°éåº¦" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "æ¥" + IDS_TIME_HOURS "å°æ¶" + IDS_TIME_NANOSECONDS "çº³ç§" + IDS_TIME_MICROSECONDS "å¾®ç§" + IDS_TIME_MILLISECONDS "æ¯«ç§" + IDS_TIME_MINUTES "å" + IDS_TIME_SECONDS "ç§" + IDS_TIME_WEEKS "å¨" + IDS_TIME_YEARS "å¹´" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "åç±³/å°æ¶" + IDS_VELOCITY_FEET_HOUR "è±å°º/å°æ¶" + IDS_VELOCITY_FEET_SECOND "è±å°º/ç§" + IDS_VELOCITY_KILOMETERS_HOUR "åç±³/å°æ¶" + IDS_VELOCITY_KNOTS "è" + IDS_VELOCITY_MACH "é©¬èµ«" + IDS_VELOCITY_METERS_SECOND "ç±³/ç§" + IDS_VELOCITY_MILES_HOUR "è±é/å°æ¶" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "æ¡¶ (è±å½)" + IDS_VOLUME_BARRELS_OIL "æ¡¶æ²¹" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "è²å¼è³ (è±å½)" + IDS_VOLUME_BUSHELS_US "è²å¼è³ (ç¾å½)" + IDS_VOLUME_CUBIC_CENTIMETERS "ç«æ¹åç±³" + IDS_VOLUME_CUBIC_FEET "ç«æ¹è±å°º" + IDS_VOLUME_CUBIC_INCHES "ç«æ¹è±å¯¸" + IDS_VOLUME_CUBIC_METERS "ç«æ¹ç±³" + IDS_VOLUME_CUBIC_YARDS "ç«æ¹ç " + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "æ¶²çå¸ (è±å½)" + IDS_VOLUME_FLUID_OUNCES_US "æ¶²çå¸ (ç¾å½)" + IDS_VOLUME_GALLONS_UK "å ä» (è±å½)" + IDS_VOLUME_GALLONS_DRY_US "å¹²éå ä» (ç¾å½)" + IDS_VOLUME_GALLONS_LIQUID_US "æ¶²å ä» (ç¾å½)" + IDS_VOLUME_GOU "å" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "å" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "æ¯«å" + IDS_VOLUME_PINTS_UK "åè± (è±å½)" + IDS_VOLUME_PINTS_DRY_US "å¹²éåè± (ç¾å½)" + IDS_VOLUME_PINTS_LIQUID_US "æ¶²åè± (ç¾å½)" + IDS_VOLUME_QUARTS_UK "å¤¸è± (è±å½)" + IDS_VOLUME_QUARTS_DRY_US "å¹²éå¤¸è± (ç¾å½)" + IDS_VOLUME_QUARTS_LIQUID_US "æ¶²å¤¸è± (ç¾å½)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "æ (æ¥æ¬)" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "é¢" + IDS_WEIGHT_CARATS "åæ" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "å" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "æ¤ (ä¸å½)" + IDS_WEIGHT_JIN_TAIWAN "æ¤ (ä¸å½å°æ¹¾)" + IDS_WEIGHT_KAN "è´¯ (æ¥æ¬)" + IDS_WEIGHT_KILOGRAMS "åå" + IDS_WEIGHT_KIN "æ¤ (æ¥æ¬)" + IDS_WEIGHT_LIANG_CHINA "ä¸¤ (ä¸å½)" + IDS_WEIGHT_LIANG_TAIWAN "ä¸¤ (ä¸å½å°æ¹¾)" + IDS_WEIGHT_MONME "ä¸¤ (æ¥æ¬)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "å¸¸è¡¡çå¸" + IDS_WEIGHT_OUNCES_TROY "éè¡¡çå¸" + IDS_WEIGHT_POUNDS "è±ç£" + IDS_WEIGHT_QUINTAL_METRIC "å¬æ" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "ç³" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "å¨" + IDS_WEIGHT_TONS_UK "å¨ (è±å½)" + IDS_WEIGHT_TONS_US "å¨ (ç¾å½)" +END Propchange: trunk/reactos/base/applications/calc/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Jun 19 16:34:58 2011 @@ -59,6 +59,7 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" +#include "lang/zh-CN.rc" // UTF-8

1 0

[jgardou] 52367: [NOTSKRNL] - Addendum to 52366: get back old code, thanks to Alex
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 13:59:33 2011 New Revision: 52367 URL: http://svn.reactos.org/svn/reactos?rev=52367&view=rev Log: [NOTSKRNL] - Addendum to 52366: get back old code, thanks to Alex Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Jun 19 13:59:33 2011 @@ -1510,7 +1510,7 @@ /* Set thread fields */ Thread->TrapFrame = TrapFrame; - Thread->PreviousMode = KiUserTrap(TrapFrame) ? UserMode : KernelMode; + Thread->PreviousMode = KiUserTrap(TrapFrame); /* Enable interrupts */ _enable();

1 0

[gadamopoulos] 52366: [NTOSKRNL] - Fix incorrect KiUserTrap which returned 3 for UserMode traps. Kind-of spotted by Jerome, but fixed in the wrong place...ReactOS-style, as always. -Patch by Alex I...
by gadamopoulos＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: gadamopoulos Date: Sun Jun 19 13:55:28 2011 New Revision: 52366 URL: http://svn.reactos.org/svn/reactos?rev=52366&view=rev Log: [NTOSKRNL] - Fix incorrect KiUserTrap which returned 3 for UserMode traps. Kind-of spotted by Jerome, but fixed in the wrong place...ReactOS-style, as always. -Patch by Alex Ionescu Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sun Jun 19 13:55:28 2011 @@ -34,7 +34,7 @@ KiUserTrap(IN PKTRAP_FRAME TrapFrame) { /* Anything else but Ring 0 is Ring 3 */ - return (TrapFrame->SegCs & MODE_MASK); + return !!(TrapFrame->SegCs & MODE_MASK); } //

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011