Ros-diffs December 2017

ros-diffs@reactos.org

26 participants
355 discussions

[reactos] 01/01: [HAL] Use 64 bits for physical addresses.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5311c57b5fdb1a57d6017… commit 5311c57b5fdb1a57d6017d9e89f8822a573fc6d1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 17 17:37:43 2017 +0100 [HAL] Use 64 bits for physical addresses. --- hal/halx86/generic/memory.c | 9 ++++----- hal/halx86/include/halp.h | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hal/halx86/generic/memory.c b/hal/halx86/generic/memory.c index e16eef3dbf..587503fca1 100644 --- a/hal/halx86/generic/memory.c +++ b/hal/halx86/generic/memory.c @@ -24,15 +24,15 @@ PVOID HalpHeapStart = MM_HAL_HEAP_START; /* PRIVATE FUNCTIONS *********************************************************/ -ULONG_PTR +ULONG64 NTAPI HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN ULONG_PTR MaxAddress, + IN ULONG64 MaxAddress, IN PFN_NUMBER PageCount, IN BOOLEAN Aligned) { ULONG UsedDescriptors; - ULONG_PTR PhysicalAddress; + ULONG64 PhysicalAddress; PFN_NUMBER MaxPage, BasePage, Alignment; PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock, NewBlock, FreeBlock; @@ -71,9 +71,8 @@ HalpAllocPhysicalMemory(IN PLOADER_PARAMETER_BLOCK LoaderBlock, (MdBlock->PageCount >= PageCount + Alignment) && (BasePage + PageCount + Alignment < MaxPage)) { - /* We found an address */ - PhysicalAddress = (BasePage + Alignment) << PAGE_SHIFT; + PhysicalAddress = ((ULONG64)BasePage + Alignment) << PAGE_SHIFT; break; } } diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 8e79f3444e..315282f809 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -633,11 +633,11 @@ HalpReleasePciDeviceForDebugging( // // Memory routines // -ULONG_PTR +ULONG64 NTAPI HalpAllocPhysicalMemory( IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN ULONG_PTR MaxAddress, + IN ULONG64 MaxAddress, IN PFN_NUMBER PageCount, IN BOOLEAN Aligned );

6 years, 9 months

[reactos] 01/01: [FASTFAT] Add a comment (and an ASSERT) in VfatCreateFile() that shows that my stats code is broken...

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcd95c1a85d88c2adc98a… commit dcd95c1a85d88c2adc98af14194e9b3057cbcb27 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 18:25:43 2017 +0100 [FASTFAT] Add a comment (and an ASSERT) in VfatCreateFile() that shows that my stats code is broken... --- drivers/filesystems/fastfat/create.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 248d99e7f7..20a4bc0d04 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -982,6 +982,8 @@ VfatCreateFile( /* FIXME : test write access if requested */ + /* FIXME: That is broken, we cannot reach this code path with failure */ + ASSERT(NT_SUCCESS(Status)); if (NT_SUCCESS(Status)) { vfatAddToStat(DeviceExt, Fat.SuccessfulCreates, 1);

6 years, 9 months

[reactos] 03/03: [FASTFAT] While closing FCBs on dismount, release from tail to head and not the contrary. It fixes assertion failure in vfatDestroyFCB() where we would have release parent before child. This is still not perfect, but less bug prone...

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64bc96558e878cc91da14… commit 64bc96558e878cc91da148ec5892a7e2bf58e052 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 18:21:51 2017 +0100 [FASTFAT] While closing FCBs on dismount, release from tail to head and not the contrary. It fixes assertion failure in vfatDestroyFCB() where we would have release parent before child. This is still not perfect, but less bug prone... With this commits (and ENABLE_SWAPOUT defined), ReactOS seems to unmount FAT volumes quite nice! :-) (Tried with fsutil volume dismount X:) --- drivers/filesystems/fastfat/fsctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index f059410044..abd772648a 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -1203,7 +1203,7 @@ VfatDismountVolume( /* Rebrowse the FCB in order to free them now */ while (!IsListEmpty(&DeviceExt->FcbListHead)) { - NextEntry = RemoveHeadList(&DeviceExt->FcbListHead); + NextEntry = RemoveTailList(&DeviceExt->FcbListHead); Fcb = CONTAINING_RECORD(NextEntry, VFATFCB, FcbListEntry); vfatDestroyFCB(Fcb); }

6 years, 9 months

[reactos] 02/03: [FASTFAT] Fix a handle count leak on volume close. This can prevent locking a volume!

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de0368614814293c40517… commit de0368614814293c40517551911c0057bde7dfed Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 18:20:04 2017 +0100 [FASTFAT] Fix a handle count leak on volume close. This can prevent locking a volume! --- drivers/filesystems/fastfat/cleanup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index 85b4ea2d2c..d584dee859 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -41,6 +41,7 @@ VfatCleanupFile( if (IsVolume) { pFcb->OpenHandleCount--; + DeviceExt->OpenHandleCount--; if (pFcb->OpenHandleCount != 0) {

6 years, 9 months

[reactos] 01/03: [FASTFAT] When not able to lock a volume due to open handles, print open handles

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27773dbb3f1ab3f93a24a… commit 27773dbb3f1ab3f93a24a742bec91676bf3a70a4 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 18:19:03 2017 +0100 [FASTFAT] When not able to lock a volume due to open handles, print open handles --- drivers/filesystems/fastfat/fsctl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index a406276ee6..f059410044 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -1115,6 +1115,22 @@ VfatLockOrUnlockVolume( /* Deny locking if we're not alone */ if (Lock && DeviceExt->OpenHandleCount != 1) { + PLIST_ENTRY ListEntry; + + DPRINT1("Can't lock: %u opened\n", DeviceExt->OpenHandleCount); + + ListEntry = DeviceExt->FcbListHead.Flink; + while (ListEntry != &DeviceExt->FcbListHead) + { + Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); + ListEntry = ListEntry->Flink; + + if (Fcb->OpenHandleCount > 0) + { + DPRINT1("Opened (%u - %u): %wZ\n", Fcb->OpenHandleCount, Fcb->RefCount, &Fcb->PathNameU); + } + } + return STATUS_ACCESS_DENIED; }

6 years, 9 months

[reactos] 01/01: [RAPPS] Select 'Available' category by default.

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab7ddc44f7ba8281ade75… commit ab7ddc44f7ba8281ade75364861992d2f7f5b955 Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sun Dec 17 16:09:55 2017 +0200 [RAPPS] Select 'Available' category by default. --- base/applications/rapps/gui.cpp | 50 ++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 76a5e76d08..62d1a1961b 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -729,33 +729,33 @@ private: VOID InitCategoriesList() { - HTREEITEM hRootItem1, hRootItem2; - - hRootItem1 = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); - AddCategory(hRootItem1, IDS_APPLICATIONS, IDI_APPS); - AddCategory(hRootItem1, IDS_UPDATES, IDI_APPUPD); - - hRootItem2 = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); - AddCategory(hRootItem2, IDS_CAT_AUDIO, IDI_CAT_AUDIO); - AddCategory(hRootItem2, IDS_CAT_VIDEO, IDI_CAT_VIDEO); - AddCategory(hRootItem2, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); - AddCategory(hRootItem2, IDS_CAT_GAMES, IDI_CAT_GAMES); - AddCategory(hRootItem2, IDS_CAT_INTERNET, IDI_CAT_INTERNET); - AddCategory(hRootItem2, IDS_CAT_OFFICE, IDI_CAT_OFFICE); - AddCategory(hRootItem2, IDS_CAT_DEVEL, IDI_CAT_DEVEL); - AddCategory(hRootItem2, IDS_CAT_EDU, IDI_CAT_EDU); - AddCategory(hRootItem2, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); - AddCategory(hRootItem2, IDS_CAT_FINANCE, IDI_CAT_FINANCE); - AddCategory(hRootItem2, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); - AddCategory(hRootItem2, IDS_CAT_TOOLS, IDI_CAT_TOOLS); - AddCategory(hRootItem2, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); - AddCategory(hRootItem2, IDS_CAT_LIBS, IDI_CAT_LIBS); - AddCategory(hRootItem2, IDS_CAT_OTHER, IDI_CAT_OTHER); + HTREEITEM hRootItemInstalled, hRootItemAvailable; + + hRootItemInstalled = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY); + AddCategory(hRootItemInstalled, IDS_APPLICATIONS, IDI_APPS); + AddCategory(hRootItemInstalled, IDS_UPDATES, IDI_APPUPD); + + hRootItemAvailable = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY); + AddCategory(hRootItemAvailable, IDS_CAT_AUDIO, IDI_CAT_AUDIO); + AddCategory(hRootItemAvailable, IDS_CAT_VIDEO, IDI_CAT_VIDEO); + AddCategory(hRootItemAvailable, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS); + AddCategory(hRootItemAvailable, IDS_CAT_GAMES, IDI_CAT_GAMES); + AddCategory(hRootItemAvailable, IDS_CAT_INTERNET, IDI_CAT_INTERNET); + AddCategory(hRootItemAvailable, IDS_CAT_OFFICE, IDI_CAT_OFFICE); + AddCategory(hRootItemAvailable, IDS_CAT_DEVEL, IDI_CAT_DEVEL); + AddCategory(hRootItemAvailable, IDS_CAT_EDU, IDI_CAT_EDU); + AddCategory(hRootItemAvailable, IDS_CAT_ENGINEER, IDI_CAT_ENGINEER); + AddCategory(hRootItemAvailable, IDS_CAT_FINANCE, IDI_CAT_FINANCE); + AddCategory(hRootItemAvailable, IDS_CAT_SCIENCE, IDI_CAT_SCIENCE); + AddCategory(hRootItemAvailable, IDS_CAT_TOOLS, IDI_CAT_TOOLS); + AddCategory(hRootItemAvailable, IDS_CAT_DRIVERS, IDI_CAT_DRIVERS); + AddCategory(hRootItemAvailable, IDS_CAT_LIBS, IDI_CAT_LIBS); + AddCategory(hRootItemAvailable, IDS_CAT_OTHER, IDI_CAT_OTHER); m_TreeView->SetImageList(); - m_TreeView->Expand(hRootItem1, TVE_EXPAND); - m_TreeView->Expand(hRootItem2, TVE_EXPAND); - m_TreeView->SelectItem(hRootItem1); + m_TreeView->Expand(hRootItemInstalled, TVE_EXPAND); + m_TreeView->Expand(hRootItemAvailable, TVE_EXPAND); + m_TreeView->SelectItem(hRootItemAvailable); } BOOL CreateStatusBar()

6 years, 9 months

[reactos] 01/01: [MSCONFIG_NEW] Temporarily "fix" the header of the SimpChinese resource file because this has nothing to do with Paint whatsoever. Proper headers will be used as soon as msconfig_new replaces the old one and such headers be used in all of its code.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f04bf3af6e941764d581… commit 8f04bf3af6e941764d581d1b09d65b0f556caefb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 17 14:44:23 2017 +0100 [MSCONFIG_NEW] Temporarily "fix" the header of the SimpChinese resource file because this has nothing to do with Paint whatsoever. Proper headers will be used as soon as msconfig_new replaces the old one and such headers be used in all of its code. --- base/applications/msconfig_new/lang/zh-CN.rc | 3 --- 1 file changed, 3 deletions(-) diff --git a/base/applications/msconfig_new/lang/zh-CN.rc b/base/applications/msconfig_new/lang/zh-CN.rc index ad772d76b8..f6282e7028 100644 --- a/base/applications/msconfig_new/lang/zh-CN.rc +++ b/base/applications/msconfig_new/lang/zh-CN.rc @@ -1,7 +1,4 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/zh-CN.rc * PURPOSE: Simplified Chinese Language resource file * TRANSLATORS: zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> * Li Keqing <auroracloud4096(a)gmail.com>

6 years, 9 months

[reactos] 01/01: [TRANSLATION] Improve Simplified Chinese Translations.

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6131ace49b7bbe2ff84c… commit d6131ace49b7bbe2ff84c88c51d442f0e7ef55ba Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Fri Dec 15 19:11:24 2017 +0800 [TRANSLATION] Improve Simplified Chinese Translations. * Fix Simplified Chinese Translation of EXPLORER. * Fix Simplified Chinese Translation of MSCONFIG_NEW. * Fix Simplified Chinese Translation of MSPAINT. * Fix Simplified Chinese Translation of SHELL32. * Fix Simplified Chinese Translation of SYSDM. * Fix Simplified Chinese Translation of SETUP/REACTOS. --- base/applications/msconfig_new/lang/zh-CN.rc | 44 ++++--- base/applications/mspaint/lang/zh-CN.rc | 15 ++- base/setup/reactos/lang/zh-CN.rc | 10 +- base/shell/explorer/lang/zh-CN.rc | 6 +- dll/cpl/sysdm/lang/zh-CN.rc | 8 +- dll/win32/shell32/lang/zh-CN.rc | 183 ++++++++++++++------------- 6 files changed, 138 insertions(+), 128 deletions(-) diff --git a/base/applications/msconfig_new/lang/zh-CN.rc b/base/applications/msconfig_new/lang/zh-CN.rc index 6cc0e448ef..ad772d76b8 100644 --- a/base/applications/msconfig_new/lang/zh-CN.rc +++ b/base/applications/msconfig_new/lang/zh-CN.rc @@ -1,14 +1,22 @@ -/* Simplified Chinese translation by zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> */ - +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL + * FILE: base/applications/mspaint/lang/zh-CN.rc + * PURPOSE: Simplified Chinese Language resource file + * TRANSLATORS: zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * Li Keqing <auroracloud4096(a)gmail.com> + * Luo Yufan <njlyf2011(a)hotmail.com> + */ + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_ABOUTBOX DIALOGEX 0, 0, 229, 98 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "关于系统配置程序" +CAPTION "关于系统配置实用程序" FONT 9, "MS Shell Dlg" BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 - LTEXT "系统配置程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX + LTEXT "系统配置实用程序\n版本 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" LTEXT "版权所有 (C) ReactOS 团队 2005-2015\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ @@ -66,23 +74,23 @@ BEGIN PUSHBUTTON "设置为默认(&S)", IDC_BTN_SET_DEFAULT_BOOT, 82, 68, 66, 14 PUSHBUTTON "向上移动(&U)", IDC_BTN_MOVE_UP_BOOT_OPTION, 153, 68, 66, 14 PUSHBUTTON "向下移动(&D)", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 224, 68, 66, 14 - GROUPBOX "启动选项", IDC_STATIC, 5, 84, 285, 86 + GROUPBOX "引导选项", IDC_STATIC, 5, 84, 285, 86 GROUPBOX "", IDC_STATIC, 10, 97, 143, 68 - CHECKBOX "安全启动 (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10 + CHECKBOX "安全模式 (/SA&FEBOOT)", IDC_CBX_SAFE_BOOT, 15, 97, 121, 10 CONTROL "最小 (&MINIMAL)", IDC_RADIO1, "Button", BS_AUTORADIOBUTTON, 15, 110, 133, 10 - CONTROL "其他环境\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, + CONTROL "其他外壳\n(M&INIMAL (ALTERNATESHELL))", IDC_RADIO4, "Button", BS_AUTORADIOBUTTON | BS_MULTILINE, 15, 121, 133, 17 CONTROL "维修活动目录 (DSRE&PAIR)", IDC_RADIO3, "Button", BS_AUTORADIOBUTTON, 15, 139, 133, 10 CONTROL "网络 (NET&WORK)", IDC_RADIO2, "Button", BS_AUTORADIOBUTTON, 15, 150, 133, 10 - CHECKBOX "无 GUI 启动\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE - CHECKBOX "启动日志 (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12 - CHECKBOX "基地视频 (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12 + CHECKBOX "无 GUI 引导\n(/&NOGUIBOOT)", IDC_CBX_NO_GUI_BOOT, 158, 91, 127, 17, BS_MULTILINE + CHECKBOX "引导日志 (/&BOOTLOG)", IDC_CBX_BOOT_LOG, 158, 110, 127, 12 + CHECKBOX "基本视频 (/BAS&EVIDEO)", IDC_CBX_BASE_VIDEO, 158, 124, 127, 12 CHECKBOX "OS 引导信息 (/S&OS)", IDC_CBX_SOS, 158, 138, 127, 12 PUSHBUTTON "高级选项...(&V)", IDC_BTN_ADVANCED_OPTIONS, 207, 151, 78, 14 LTEXT "超时:(&T)", IDC_STATIC, 296, 91, 32, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 295, 102, 33, 12, ES_RIGHT | ES_NUMBER LTEXT "秒", IDC_STATIC, 330, 104, 31, 10 - CONTROL "使所有的引导设置成为永久(&A)", 292, + CONTROL "使所有的引导设置成为永久设置(&A)", 292, "Button", BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP, 295, 121, 66, 49 PUSHBUTTON "删除(&D)", IDC_BTN_DELETE, 295, 68, 66, 14 END @@ -124,16 +132,16 @@ END IDD_FILE_EXTRACT_DIALOG DIALOGEX 0, 0, 353, 117 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "扩展文件从安装源" +CAPTION "从安装源位置展开一个文件" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "指定您想要还原的文件，包含安装文件的源位置和文件的目标位置。", IDC_STATIC, 7, 7, 339, 17 + LTEXT "指定您要还原的文件，包含安装文件的源位置和文件的目标位置。", IDC_STATIC, 7, 7, 339, 17 LTEXT "要还原的文件:(&I)", IDC_STATIC, 7, 34, 93, 10 EDITTEXT IDC_TXT_FILE_TO_RESTORE, 103, 32, 158, 12, ES_AUTOHSCROLL PUSHBUTTON "浏览文件...(&B)", IDC_BTN_BROWSE_ALL_FILES, 264, 30, 82, 14 - LTEXT "从还原:(&R)", IDC_STATIC, 7, 55, 93, 10 + LTEXT "还原自:(&R)", IDC_STATIC, 7, 55, 93, 10 COMBOBOX IDC_DRP_CAB_FILE, 103, 53, 158, 56, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "从浏览...(&F)", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 + PUSHBUTTON "浏览自...(&F)", IDC_BTN_BROWSE_CAB_FILES, 264, 51, 82, 14 LTEXT "保存文件:(&S)", IDC_STATIC, 7, 76, 93, 10 COMBOBOX IDC_DRP_DEST_DIR, 103, 74, 158, 42, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "浏览到...(&T)", IDC_BTN_BROWSE_DIRS, 264, 72, 82, 14 @@ -152,11 +160,11 @@ BEGIN "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 CONTROL "区分大小写(&C)", IDC_CBX_FIND_MATCH_CASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 100, 12 GROUPBOX "方向", IDC_STATIC, 107, 26, 68, 28 - CONTROL "向上(&U)", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 - CONTROL "向下(&D)", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 + CONTROL "上移(&U)", IDC_RB_FIND_UP, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 111, 38, 28, 12 + CONTROL "下移(&D)", IDC_RB_FIND_DOWN, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 143, 38, 28, 12 DEFPUSHBUTTON "查找下一个(&N)", IDOK, 182, 5, 50, 14, WS_GROUP PUSHBUTTON "取消", IDCANCEL, 182, 23, 50, 14, WS_GROUP - CONTROL "从一开始的搜索 (方向: 下来) 或结尾 (方向: 向上)(&S)", IDC_CBX_FIND_FROM_BEGINNING, + CONTROL "从最初(方向:下)或末尾(方向:上)开始搜索(&S)", IDC_CBX_FIND_FROM_BEGINNING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 58, 231, 12 END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index b865731867..b6aceb78ad 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/lang/zh-CN.rc * PURPOSE: Chinese Language resource file * TRANSLATOR: Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + * Luo Yufan <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -17,19 +18,19 @@ BEGIN MENUITEM "保存(&S)\tCtrl+S", IDM_FILESAVE MENUITEM "另存为...(&A)", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "From Scanner or Camera...", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "从扫描仪或照相机...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR MENUITEM "页面视图", IDM_FILEPAGEVIEW MENUITEM "页面设置...", IDM_FILEPAGESETUP MENUITEM "打印(&P)...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Send...", IDM_FILESEND + MENUITEM "发送...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "保存为壁纸 (普通)", IDM_FILEASWALLPAPERPLANE MENUITEM "保存为壁纸 (居中)", IDM_FILEASWALLPAPERCENTERED MENUITEM "保存为壁纸 (拉伸)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM "最近使用过的文件", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR MENUITEM "退出(&X)\tAlt+F4", IDM_FILEEXIT END @@ -94,7 +95,7 @@ BEGIN BEGIN MENUITEM "帮助主题(&H)", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "信息(&I)", IDM_HELPINFO + MENUITEM "程序信息(&I)", IDM_HELPINFO END END @@ -196,7 +197,7 @@ BEGIN IDS_PROGRAMNAME "画图" IDS_WINDOWTITLE "%s - 画图" IDS_INFOTITLE "ReactOS 画图" - IDS_INFOTEXT "ReactOS 画图是在 GNU LGPL 下发布的 (详见 www.gnu.org)" + IDS_INFOTEXT "ReactOS 画图是在 GNU LGPL 许可证下发布的 (详见 www.gnu.org)" IDS_SAVEPROMPTTEXT "您想把改变保存到 %s 吗？" IDS_DEFAULTFILENAME "未命名.bmp" IDS_MINIATURETITLE "缩略图" @@ -216,8 +217,8 @@ BEGIN IDS_TOOLTIP14 "多边形" IDS_TOOLTIP15 "椭圆" IDS_TOOLTIP16 "圆角矩形" - IDS_ALLFILES "All Files" - IDS_ALLPICTUREFILES "All Picture Files" + IDS_ALLFILES "所有文件" + IDS_ALLPICTUREFILES "所有图片文件" IDS_FILESIZE "%d 字节" IDS_PRINTRES "%d x %d 像素每米" IDS_INTNUMBERS "只输入数字积分！" diff --git a/base/setup/reactos/lang/zh-CN.rc b/base/setup/reactos/lang/zh-CN.rc index 7a9629cb50..3581a37f68 100644 --- a/base/setup/reactos/lang/zh-CN.rc +++ b/base/setup/reactos/lang/zh-CN.rc @@ -6,7 +6,7 @@ CAPTION "ReactOS 安装" FONT 9, "MS Shell Dlg" BEGIN LTEXT "欢迎使用 ReactOS 安装向导。", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "您不能直接从此CD安装 ReactOS！请重新启动并从CD引导您的电脑以便安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 + LTEXT "您不能直接从此 CD 安装 ReactOS！请重新启动并从 CD 引导您的电脑以便安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 LTEXT "点击完成退出安装。", IDC_STATIC, 115, 169, 195, 17 END @@ -16,9 +16,9 @@ CAPTION "ReactOS 安装" FONT 9, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "安装 ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "安装 ReactOS 的新副本。此选项没有保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25 + LTEXT "安装 ReactOS 的新副本。此选项将不会保存你的文件、设置和程序。你可以对磁盘和分区进行更改。", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "修复或更新已安装的 ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装在此计算机上, 此选项才能使用的。", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "更新或修复 ReactOS 安装的副本。此选项会保存您的文件、设置和程序。如果 ReactOS 已经安装，此选项方可使用。", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "点击下一步安装设备。", IDC_STATIC, 7, 128, 297, 8 END @@ -55,7 +55,7 @@ CAPTION "建立分区" FONT 9, "MS Shell Dlg" BEGIN CONTROL "", IDC_UPDOWN1, "msctls_updown32", WS_VISIBLE, 104, 22, 9, 13 - CONTROL "建立并格式化分区", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 + CONTROL "创建并格式化分区", IDC_STATIC, "Button", BS_GROUPBOX, 7, 5, 129, 57 LTEXT "大小:", IDC_STATIC, 13, 24, 27, 9 EDITTEXT IDC_PARTSIZE, 58, 22, 47, 13, WS_VISIBLE | WS_TABSTOP LTEXT "GB", IDC_UNIT, 117, 24, 14, 9 @@ -72,7 +72,7 @@ FONT 9, "MS Shell Dlg" BEGIN CONTROL "安装文件夹", IDC_STATIC, "Button", BS_GROUPBOX, 4, 1, 298, 30 EDITTEXT IDC_PATH, 10, 11, 278, 13, WS_VISIBLE - CONTROL "引导器程序安装", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 + CONTROL "引导程序安装", IDC_STATIC, "Button", BS_GROUPBOX, 4, 36, 298, 52 CONTROL "安装引导程序到硬盘 (MBR 和 VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 46, 278, 11 CONTROL "安装引导程序到硬盘 (仅 VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10, 57, 278, 11 CONTROL "不安装引导程序", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED, 10, 68, 278, 11 diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 1d68d920b1..4b9ed28499 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -80,12 +80,12 @@ BEGIN CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 18, 229, 24 AUTOCHECKBOX "锁定任务栏(&L)", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 AUTOCHECKBOX "自动隐藏任务栏(&U)", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 - AUTOCHECKBOX "使任务栏显示在最上方(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 - AUTOCHECKBOX "分组相似按钮(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 + AUTOCHECKBOX "将任务栏保持在其它窗口的前端(&T)", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "分组类似任务栏按钮(&G)", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "显示快速启动(&Q)", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 GROUPBOX "通知区域", IDC_STATIC, 6, 114, 240, 98 CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 126, 229, 24 - AUTOCHECKBOX "时间(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 + AUTOCHECKBOX "显示时钟(&K)", IDC_TASKBARPROP_CLOCK, 13, 153, 80, 10 AUTOCHECKBOX "显示秒", IDC_TASKBARPROP_SECONDS, 120, 153, 80, 10, WS_DISABLED LTEXT "您可以通过隐藏不常用的图标来保持通知区域的整洁。", IDC_STATIC, 13, 169, 223, 16 AUTOCHECKBOX "隐藏不活动的图标(&H)", IDC_TASKBARPROP_HIDEICONS, 13, 191, 125, 10 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 92e82e3a6c..f36280ad5f 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -19,8 +19,8 @@ BEGIN LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 - CONTROL "请访问<A HREF=""http://www.reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 - PUSHBUTTON "查看协议(&L)...", IDC_LICENCE, 170, 199, 78, 13 + CONTROL "访问<A HREF=""http://www.reactos.org/"">ReactOS 主页</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 140, 10 + PUSHBUTTON "许可证(&L)...", IDC_LICENCE, 170, 199, 78, 13 END IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 @@ -92,7 +92,7 @@ BEGIN LTEXT "启动 ReactOS 时:", IDC_STATIC, 14, 142, 210, 8 AUTORADIOBUTTON "等待用户选定硬件配置文件(&W)", IDC_HRDPROFWAIT, 14, 158, 133, 8, WS_GROUP AUTORADIOBUTTON "秒内还没有选定配置文件，就请从列出的文件中选择第一个(&S)", IDC_HRDPROFSELECT, 14, 173, 190, 8 - LTEXT "秒", IDC_STATIC, 65, 187, 35, 8 + LTEXT "编辑", IDC_STATIC, 65, 187, 35, 8 EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 @@ -184,7 +184,7 @@ BEGIN UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "秒", IDC_STATIC, 223, 70, 18, 8 LTEXT "要手动编辑启动选项，请单击“编辑”。", IDC_STATIC, 14, 89, 187, 8 - PUSHBUTTON "秒", IDC_STRRECEDIT, 188, 87, 50, 14 + PUSHBUTTON "编辑(&E)", IDC_STRRECEDIT, 188, 87, 50, 14 GROUPBOX "系统失败", IDC_STATIC, 7, 111, 238, 140 AUTOCHECKBOX "将事件写入系统日志(&W)", IDC_STRRECWRITEEVENT, 14, 124, 148, 10 AUTOCHECKBOX "发送管理警报(&N)", IDC_STRRECSENDALERT, 14, 138, 148, 10 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 7c40bed54b..ebb433f7b2 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -5,6 +5,7 @@ * PURPOSE: Chinese (Simplified) Language Resources * TRANSLATORS: 2008 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> 2011 Elton Chung aka MfldElton <elton328(a)gmail.com> + 2017 Luo Yufan <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -57,14 +58,14 @@ BEGIN MENUITEM SEPARATOR MENUITEM "剪下(&T)\tCtrl+X", FCIDM_SHVIEW_CUT MENUITEM "复制(&C)\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "贴上(&P)\tCtrl+V", FCIDM_SHVIEW_INSERT - MENUITEM "贴上快捷方式(&S)", FCIDM_SHVIEW_INSERTLINK + MENUITEM "粘贴(&P)\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "粘贴快捷方式(&S)", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "将复制到文件夹...(&F)", FCIDM_SHVIEW_COPYTO + MENUITEM "复制到文件夹...(&F)", FCIDM_SHVIEW_COPYTO MENUITEM "移动到文件夹...(&V)", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR - MENUITEM "选择所有(&A)\tCtrl+A", FCIDM_SHVIEW_SELECTALL - MENUITEM "反向选择(&I)", FCIDM_SHVIEW_INVERTSELECTION + MENUITEM "全选(&A)\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "反选(&I)", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -154,7 +155,7 @@ IDD_ABOUT_AUTHORS DIALOGEX 35, 90, 235, 85 STYLE DS_SHELLFONT | WS_CHILD FONT 9, "MS Shell Dlg" BEGIN - LTEXT "ReactOS 被带到你的是：", IDC_STATIC, 0, 0, 180, 10 + LTEXT "为你带来 ReactOS 的是：", IDC_STATIC, 0, 0, 180, 10 LISTBOX IDC_ABOUT_AUTHORS_LISTBOX, 0, 10, 165, 75 END @@ -164,7 +165,7 @@ CAPTION "运行" FONT 9, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "输入程序，目录，文件或者Internet资源名，ReactOS将为您打开它。", 12289, 36, 11, 182, 18 + LTEXT "输入程序，目录，文件或者 Internet 资源名，ReactOS 将为您打开它。", 12289, 36, 11, 182, 18 LTEXT "打开(&O):", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "确定", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -187,13 +188,13 @@ BEGIN LTEXT "目标(&T):", 14008, 8, 71, 68, 10 EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "开始在(&S):", 14010, 8, 98, 68, 10 + LTEXT "起始位置(&S):", 14010, 8, 98, 68, 10 EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL LTEXT "快捷键(&K):", 14014, 8, 117, 68, 10 CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 LTEXT "运行(&R):", 14016, 8, 136, 68, 10 COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "注解(&O):", 14018, 8, 154, 68, 10 + LTEXT "备注(&O):", 14018, 8, 154, 68, 10 EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "查找目标...(&F)", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "更改图标...(&C)", 14021, 84, 172, 70, 14, ES_LEFT @@ -202,16 +203,16 @@ END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "扩展的属性" +CAPTION "高级属性" FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON - LTEXT "选择你想要为这个快捷方式的高级的属性。", -1, 5, 30, 210, 10 - CHECKBOX "以不同用户身份运行", 14000, 25, 50, 150, 10 - LTEXT "此选项可以允许您运行此快捷方式作为另一个用户，或继续作为自己同时保护您的计算机和数据免受未经授权的程序活动。", -1, 50, 60, 175, 40 + LTEXT "为这个快捷方式选择您想要的高级属性。", -1, 5, 30, 210, 10 + CHECKBOX "以其他用户身份运行", 14000, 25, 50, 150, 10 + LTEXT "此选项允许您以另一用户身份运行此快捷方式，或继续以您自己的身份运行以保护您的计算机和数据不受未授权程序的破坏。", -1, 50, 60, 175, 40 CHECKBOX "在单独的内存空间中运行", 14001, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "确定", 1, 63, 124, 50, 15, WS_VISIBLE - PUSHBUTTON "中止", 2, 120, 124, 50, 15, WS_VISIBLE + PUSHBUTTON "取消", 2, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 @@ -255,7 +256,7 @@ BEGIN CONTROL "文件", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 LTEXT "打开方式:", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "更换...(&C)", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "更改...(&C)", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "地点:", 14008, 8, 75, 45, 10 @@ -273,7 +274,7 @@ BEGIN EDITTEXT 14019, 68, 163, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "属性：", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "只读模式(&R)", 14021, 58, 189, 67, 10 + AUTOCHECKBOX "只读(&R)", 14021, 58, 189, 67, 10 AUTOCHECKBOX "隐藏(&H)", 14022, 126, 189, 50, 10 AUTOCHECKBOX "存档(&A)", 14023, 181, 189, 49, 10 PUSHBUTTON "高级...(&A)", 14028, 180, 185, 50, 15, WS_TABSTOP @@ -311,7 +312,7 @@ BEGIN EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 - LTEXT "已用的空间：", -1, 25, 69, 80, 10 + LTEXT "已用空间：", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 @@ -326,8 +327,8 @@ BEGIN LTEXT "磁盘 %c", 14009, 100, 150, 70, 10 PUSHBUTTON "磁盘清理(&D)", 14010, 160, 154, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "压缩磁盘以节省磁盘空间", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "允许索引服务编制该磁盘的快速搜索文件", 14012, 8, 205, 222, 10, WS_DISABLED + CHECKBOX "压缩磁盘以节约磁盘空间", 14011, 8, 191, 222, 10, WS_DISABLED + CHECKBOX "允许索引服务编制该磁盘的索引以便快速搜索文件", 14012, 8, 205, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 @@ -335,9 +336,9 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "工具" FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "错误检查", -1, 5, 5, 230, 60 + GROUPBOX "查错", -1, 5, 5, 230, 60 ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 - LTEXT "该选项将检查容量\n错误。", -1, 40, 25, 160, 20 + LTEXT "该选项将检查卷\n错误。", -1, 40, 25, 160, 20 PUSHBUTTON "现在检查...", 14000, 130, 45, 90, 15, WS_TABSTOP GROUPBOX "碎片整理", -1, 5, 65, 230, 60 ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 @@ -345,7 +346,7 @@ BEGIN PUSHBUTTON "立即进行碎片整理...", 14001, 130, 105, 90, 15, WS_TABSTOP GROUPBOX "备份", -1, 5, 130, 230, 60 ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 - LTEXT "此选项将备份容量上的文件。", -1, 40, 150, 160, 20 + LTEXT "此选项将备份卷上的文件。", -1, 40, 150, 160, 20 PUSHBUTTON "现在备份...", 14002, 130, 170, 90, 15, WS_TABSTOP END @@ -358,7 +359,7 @@ END IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "运行作为" +CAPTION "运行方式" FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "你想要使用来运行这个程序哪一个用户帐户？", -1, 10, 20, 220, 20 @@ -366,7 +367,7 @@ BEGIN LTEXT "保护我的计算机和数据不受未授权的程序的活动", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "此选项可防止计算机病毒危害您的计算机或个人数据，但选择它可能会引起程序工作不正常。", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "下列用户:", 14002, 10, 100, 90, 10 - LTEXT "用户名称：", -1, 20, 118, 54, 10 + LTEXT "用户名：", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP LTEXT "密码：", -1, 20, 143, 53, 10 @@ -386,13 +387,13 @@ BEGIN RADIOBUTTON "自定义大小(&C):", 14001, 20, 90, 80, 10, WS_TABSTOP EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "最大大小(MB)(&A):", -1, 20, 105, 70, 10 - RADIOBUTTON "不将文件移到回收站。删除文件时，立即删除。(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON "不将文件移入回收站，而是彻底删除。(&R)", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP AUTOCHECKBOX "显示删除确认对话框(&D)", 14004, 20, 155, 140, 10, WS_TABSTOP END IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "开放与" +CAPTION "打开方式" FONT 9, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 @@ -438,7 +439,7 @@ BEGIN LTEXT "您可以应用您正在使用此文件夹的\n所有文件夹的视图（如详细信息或平铺)。", -1, 60, 20, 180, 20 PUSHBUTTON "应用到所有文件夹(&L)", 14001, 60, 50, 80, 14, WS_TABSTOP PUSHBUTTON "重置所有文件夹(&R)", 14002, 150, 50, 80, 14, WS_TABSTOP - LTEXT "高级的设置：", -1, 7, 80, 100, 10 + LTEXT "高级设置：", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120 PUSHBUTTON "还原默认值(&D)", 14004, 177, 215, 80, 14, WS_TABSTOP END @@ -456,7 +457,7 @@ BEGIN LTEXT "打开方式:", -1, 12, 140, 40, 10 //ICON LTEXT "应用程序名称", 14005, 100, 140, 40, 10 - PUSHBUTTON "更换...(&C)", 14006, 180, 140, 50, 14, WS_TABSTOP + PUSHBUTTON "更改...(&C)", 14006, 180, 140, 50, 14, WS_TABSTOP LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "高级(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -488,7 +489,7 @@ CAPTION "注销 ReactOS" FONT 9, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "确信你想要注销吗?", -1, 35, 16, 146, 8 + LTEXT "确实要注销吗?", -1, 35, 16, 146, 8 DEFPUSHBUTTON "注销(&L)", IDOK, 41, 39, 50, 14 PUSHBUTTON "取消", IDCANCEL, 95, 39, 50, 14 END @@ -525,7 +526,7 @@ FONT 9, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 LTEXT "此磁盘或设备包含多个类型的内容。", 1001, 32, 7, 191, 20 - LTEXT "你想要 ReactOS 做的是什么？", 1002, 32, 31, 188, 8 + LTEXT "你想要 ReactOS 做什么？", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "确定", IDOK, 96, 186, 60, 14 PUSHBUTTON "取消", IDCANCEL, 160, 186, 60, 14 @@ -537,10 +538,10 @@ CAPTION "混合的内容" FONT 9, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS 可以执行相同的操作每次您插入盘或连接的设备与此类型的文件：", 1001, 30, 7, 193, 20 + LTEXT "每次您插入盘或连接的设备与此类型的文件，ReactOS 可以执行相同的操作：", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "你想要 ReactOS 做的是什么？", 1002, 32, 41, 190, 8 + LTEXT "你想要 ReactOS 做什么？", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 AUTOCHECKBOX "始终执行选择的操作。", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "确定", IDOK, 96, 185, 60, 14 @@ -553,8 +554,8 @@ CAPTION "自动播放" FONT 9, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS 可以执行相同的操作每次您连接此设备。", 1001, 32, 7, 190, 22 - LTEXT "你想要 ReactOS 做的是什么？(&W)", 1002, 32, 31, 190, 8 + LTEXT "每次您连接此设备，ReactOS 可以执行相同的操作。", 1001, 32, 7, 190, 22 + LTEXT "你想要 ReactOS 做什么？(&W)", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 AUTOCHECKBOX "总是执行选定的操作(&A)", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "确定", IDOK, 94, 160, 60, 14 @@ -569,7 +570,7 @@ BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP LTEXT "你想让计算机做什么？", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "维护您的会话，保持在低功耗数据仍在内存中运行的计算机。当你按下一个键或移动鼠标将唤醒这台计算机。", 8225, 39, 40, 167, 37 + LTEXT "维护会话，计算机数据仍然保持在内存中。当你按下一个键或移动鼠标将唤醒这台计算机。", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "确定", 1, 7, 82, 60, 14, WS_GROUP PUSHBUTTON "取消", IDCANCEL, 75, 82, 60, 14 PUSHBUTTON "帮助(&H)", IDHELP, 144, 82, 60, 14 @@ -615,10 +616,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL CAPTION "更改图标" FONT 9, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + LTEXT "在这个文件中查找图标:", -1, 7, 7, 179, 10 PUSHBUTTON "浏览...", IDC_BUTTON_PATH, 135, 17, 50, 14 EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL - LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LTEXT "从以下列表选择一个图标:", -1, 7, 36, 179, 10 LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP DEFPUSHBUTTON "确定", IDOK, 81, 179, 50, 14 PUSHBUTTON "取消", IDCANCEL, 135, 179, 50, 14 @@ -630,7 +631,7 @@ CAPTION "警告" FONT 9, "MS Shell Dlg" BEGIN ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20 - LTEXT "由操作系统或另一个应用程序，也可以使用此文件。\n修改此文件可能会损坏您的系统，\n或者使它的功能较弱。\n\n\ + LTEXT "由操作系统或另一个应用程序，也可以使用此文件。\n修改此文件可能会损坏您的系统，\n或者使它的功能变弱。\n\n\ 你确定你想要打开此文件？", IDC_STATIC, 35, 5, 230, 60 DEFPUSHBUTTON "是", IDYES, 125, 55, 50, 14 PUSHBUTTON "否", IDNO, 180, 55, 50, 14 @@ -669,10 +670,10 @@ BEGIN IDS_ADMINISTRATIVETOOLS "管理工具" /* special folders descriptions */ - IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." - IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." - IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." - IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "配置您计算机的管理设置。" + IDS_FOLDER_OPTIONS_DESCRIPTION "自定义文件和文件夹的显示。" + IDS_FONTS_DESCRIPTION "添加、更改和管理您计算机上的字体" + IDS_PRINTERS_DESCRIPTION "显示安装的打印机和传真打印机，并帮助您添加新的。" /* context menus */ IDS_VIEW_LARGE "大图标(&G)" @@ -687,23 +688,23 @@ BEGIN IDS_PROPERTIES "属性(&P)" IDS_CUT "剪切(&U)" IDS_RESTORE "还原" - IDS_FORMATDRIVE "格式..." + IDS_FORMATDRIVE "格式化..." IDS_RENAME "重命名" IDS_PASTE "贴上" - IDS_EJECT "Eject" - IDS_DISCONNECT "Disconnect" + IDS_EJECT "弹出" + IDS_DISCONNECT "断开" - IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" - IDS_CREATEFOLDER_CAPTION "Unable to create folder" + IDS_CREATEFOLDER_DENIED "无法创建文件夹 '%1'" + IDS_CREATEFOLDER_CAPTION "无法创建文件夹" IDS_DELETEITEM_CAPTION "确认文件删除" IDS_DELETEFOLDER_CAPTION "确认文件夹删除" IDS_DELETEITEM_TEXT "确实要删除 '%1'?" IDS_DELETEMULTIPLE_TEXT "确实要删除这 '%1' 项?" IDS_DELETESELECTED_TEXT "确实要删除所选的项目吗?" - IDS_TRASHITEM_TEXT "你确定你想要发送 '%1' 到回收箱？" - IDS_TRASHFOLDER_TEXT "确信你想要将 '%1' 和它的所有内容发送到回收站吗?" + IDS_TRASHITEM_TEXT "你确定你想要移动 '%1' 到回收站？" + IDS_TRASHFOLDER_TEXT "确定你想要将 '%1' 和它的所有内容发送到回收站吗?" IDS_TRASHMULTIPLE_TEXT "确实要将这 '%1' 项发送到回收站吗?" - IDS_CANTTRASH_TEXT "项目 '%1' 不能发送到回收站。你想要删除它相反吗？" + IDS_CANTTRASH_TEXT "项目 '%1' 不能发送到回收站。你想要彻底删除它吗？" IDS_OVERWRITEFILE_TEXT "此文件夹已包含名为 '%1' 的文件。\n\n你想要替换它吗？" IDS_OVERWRITEFILE_CAPTION "确认文件覆盖" IDS_OVERWRITEFOLDER_TEXT "此文件夹已包含一个名为 '%1' 文件夹。\n\n如果目标文件夹中的文件具有相同的名称作为\n所选文件夹中的文件，他们将被替换。你仍然想要移动或\n复制该文件夹吗？" @@ -732,36 +733,36 @@ BEGIN IDS_PERSONAL "我的文档" IDS_FAVORITES "收藏夹" IDS_STARTUP "开始菜单\\程序\\启动" - IDS_RECENT "最近" - IDS_SENDTO "为必填项" + IDS_RECENT "我最近的文档" + IDS_SENDTO "发送到" IDS_STARTMENU "开始菜单" IDS_MYMUSIC "我的音乐" IDS_MYVIDEO "我的视频" IDS_DESKTOPDIRECTORY "桌面" - IDS_NETHOOD "NetHood" + IDS_NETHOOD "网上邻居" IDS_TEMPLATES "模板" IDS_APPDATA "应用程序数据" - IDS_PRINTHOOD "PrintHood" + IDS_PRINTHOOD "打印文件夹" IDS_LOCAL_APPDATA "本地设置\\应用程序数据" IDS_INTERNET_CACHE "本地设置\\互联网临时文件" - IDS_COOKIES "小型文字檔案" + IDS_COOKIES "Cookies" IDS_HISTORY "本地设置\\历史记录" IDS_PROGRAM_FILES "程序文件" IDS_MYPICTURES "我的图片" IDS_PROGRAM_FILES_COMMON "程序文件\\共同文件" IDS_COMMON_DOCUMENTS "文件" IDS_ADMINTOOLS "开始菜单\\程序\\管理工具" - IDS_COMMON_MUSIC "我的文件\\我的音乐" - IDS_COMMON_PICTURES "我的文件\\我的图片" - IDS_COMMON_VIDEO "我的文件\\我的视频" + IDS_COMMON_MUSIC "我的文档\\我的音乐" + IDS_COMMON_PICTURES "我的文档\\我的图片" + IDS_COMMON_VIDEO "我的文档\\我的视频" IDS_CDBURN_AREA "本地设置\\应用程序数据\\微软\\光盘刻录" IDS_NETWORKPLACE "网上邻居" - IDS_NEWFOLDER "新的文件夹" + IDS_NEWFOLDER "新建文件夹" IDS_DRIVE_FIXED "本地磁盘" - IDS_DRIVE_CDROM "CD 磁盘" - IDS_DRIVE_NETWORK "网络磁盘" + IDS_DRIVE_CDROM "光盘驱动器" + IDS_DRIVE_NETWORK "网络驱动器" IDS_DRIVE_FLOPPY "3.5 英寸软盘" IDS_DRIVE_REMOVABLE "可移动磁盘" IDS_FS_UNKNOWN "未知" @@ -770,7 +771,7 @@ BEGIN IDS_OPEN_WITH "打开方式" IDS_OPEN_WITH_CHOOSE "选择程序" IDS_OPEN_WITH_RECOMMENDED "推荐的程序：" - IDS_OPEN_WITH_OTHER "其他的程序：" + IDS_OPEN_WITH_OTHER "其他程序：" IDS_SHELL_ABOUT_AUTHORS "作者(&A)" IDS_SHELL_ABOUT_BACK "< 返回(&B)" @@ -785,11 +786,11 @@ BEGIN IDS_PICK_ICON_FILTER "图标文件 (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" IDS_OPEN_WITH_FILTER "可执行文件 (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - IDS_CANTLOCKVOLUME "Unable to lock volume (Error Code: %lu)." - IDS_CANTDISMOUNTVOLUME "Unable to dismount volume (Error Code: %lu)." - IDS_CANTEJECTMEDIA "Unable to eject media (Error Code: %lu)." - IDS_CANTSHOWPROPERTIES "Unable to show properties (Error Code: %lu)." - IDS_CANTDISCONNECT "Unable to disconnect (Error Code: %lu)." + IDS_CANTLOCKVOLUME "无法锁定卷 (错误代码: %lu)." + IDS_CANTDISMOUNTVOLUME "无法卸载卷 (错误代码: %lu)." + IDS_CANTEJECTMEDIA "无法弹出媒体 (错误代码: %lu)." + IDS_CANTSHOWPROPERTIES "无法显示属性 (错误代码: %lu)." + IDS_CANTDISCONNECT "无法断开连接 (错误代码: %lu)." IDS_DIRECTORY "文件夹" IDS_BAT_FILE "ReactOS 批处理文件" @@ -815,7 +816,7 @@ BEGIN IDS_OPEN_VERB "打开" IDS_EXPLORE_VERB "浏览" - IDS_RUNAS_VERB "运行作为..." + IDS_RUNAS_VERB "运行方式..." IDS_EDIT_VERB "编辑" IDS_FIND_VERB "查找" IDS_PRINT_VERB "打印" @@ -828,16 +829,16 @@ BEGIN IDS_DEFAULT_CLUSTER_SIZE "默认分配大小" IDS_COPY_OF "副本" - IDS_SHLEXEC_NOASSOC "没有 ReactOS 程序配置为打开这种类型的文件。" + IDS_SHLEXEC_NOASSOC "没有为 ReactOS 配置关联的程序以打开这种类型的文件。" - IDS_FILE_DETAILS "'%S' 扩展的详细信息" + IDS_FILE_DETAILS "'%S' 扩展名的详细信息" IDS_FILE_DETAILSADV "文件扩展名为 '%s' 的类型 '%s'。若要更改会影响所有的 '%s' 文件的设置，请单击高级。" IDS_FILE_TYPES "文件类型" - IDS_COLUMN_EXTENSION "扩展" + IDS_COLUMN_EXTENSION "扩展名" /* As in 'INI File' or 'WAV File', fallback string for no-name extensions used in the _File type_ tab of the _Folder Options_ dialog */ - IDS_FILE_EXT_TYPE "%s File" + IDS_FILE_EXT_TYPE "%s 文件" IDS_BYTES_FORMAT "字节" IDS_UNKNOWN_APP "未知应用程序" @@ -847,23 +848,23 @@ BEGIN IDS_OBJECTS "%d 个对象" IDS_OBJECTS_SELECTED "%d 个选定的对象" - IDS_ADVANCED_FOLDER "Files and Folders" - IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" - IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips" - IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list" - IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders" - IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar" - IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar" - IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails" - IDS_ADVANCED_HIDDEN "Hidden files and folders" - IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders" - IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders" - IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types" - IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)" - IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process" - IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" - IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" - IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" - IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" + IDS_ADVANCED_FOLDER "文件和文件夹" + IDS_ADVANCED_NET_CRAWLER "自动搜索网络文件夹和打印机" + IDS_ADVANCED_FOLDER_SIZE_TIP "在文件夹提示中显示文件大小信息" + IDS_ADVANCED_FRIENDLY_TREE "在资源管理器文件夹列表中显示简单文件夹查看" + IDS_ADVANCED_WEB_VIEW_BARRICADE "显示系统文件夹的内容" + IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "在地址栏中显示完整路径" + IDS_ADVANCED_SHOW_FULL_PATH "在标题栏中显示完整路径" + IDS_ADVANCED_DISABLE_THUMB_CACHE "不缓存缩略图" + IDS_ADVANCED_HIDDEN "隐藏的文件和文件夹" + IDS_ADVANCED_DONT_SHOW_HIDDEN "不显示隐藏的文件和文件夹" + IDS_ADVANCED_SHOW_HIDDEN "显示隐藏的文件和文件夹" + IDS_ADVANCED_HIDE_FILE_EXT "隐藏已知文件类型的拓展名" + IDS_ADVANCED_SUPER_HIDDEN "隐藏受保护的操作系统文件 (推荐)" + IDS_ADVANCED_DESKTOP_PROCESS "在单独的进程中打开文件夹窗口" + IDS_ADVANCED_CLASSIC_VIEW_STATE "记住每个文件夹的视图设置" + IDS_ADVANCED_PERSIST_BROWSERS "在登录时还原上一个文件夹窗口" + IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "在我的电脑中显示控制面板" + IDS_ADVANCED_SHOW_COMP_COLOR "用彩色显示加密或压缩的 NTFS 文件" + IDS_ADVANCED_SHOW_INFO_TIP "鼠标指向文件夹和桌面项时显示提示信息" END

6 years, 9 months

[reactos] 01/01: [VFATLIB] Never touch the file system if not in interactive or RW mode. It's critical not to perform any write on a volume without an exclusive lock on it. That lock is only acquired if ChkDsk is started in RW mode. Also added an assert in write routine, to make sure that when we're about to perform a write operation, we're really allowed to do so.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0bf7dfb62400227e8fb3… commit b0bf7dfb62400227e8fb33fbeafcb0da02145439 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 17 13:59:20 2017 +0100 [VFATLIB] Never touch the file system if not in interactive or RW mode. It's critical not to perform any write on a volume without an exclusive lock on it. That lock is only acquired if ChkDsk is started in RW mode. Also added an assert in write routine, to make sure that when we're about to perform a write operation, we're really allowed to do so. This will avoid volume corruptions when a simple "chkdsk" is issued from cmd. To put it simple: check will really check now, and won't attempt any repair. CORE-14119 --- sdk/lib/fslib/vfatlib/check/check.c | 198 +++++++++++++++++++----------------- sdk/lib/fslib/vfatlib/check/fat.c | 54 +++++----- sdk/lib/fslib/vfatlib/check/io.c | 2 + 3 files changed, 137 insertions(+), 117 deletions(-) diff --git a/sdk/lib/fslib/vfatlib/check/check.c b/sdk/lib/fslib/vfatlib/check/check.c index 5315e3684c..dcf1808687 100644 --- a/sdk/lib/fslib/vfatlib/check/check.c +++ b/sdk/lib/fslib/vfatlib/check/check.c @@ -493,23 +493,25 @@ static int handle_dot(DOS_FS * fs, DOS_FILE * file, int dots) if (interactive) printf("1) Drop it\n2) Auto-rename\n3) Rename\n" "4) Convert to directory\n"); - else + else if (rw) printf(" Auto-renaming it.\n"); - switch (interactive ? get_key("1234", "?") : '2') { - case '1': - drop_file(fs, file); - return 1; - case '2': - auto_rename(file); - printf(" Renamed to %s\n", file_name(file->dir_ent.name)); - return 0; - case '3': - rename_file(file); + if (rw || interactive) { + switch (interactive ? get_key("1234", "?") : '2') { + case '1': + drop_file(fs, file); + return 1; + case '2': + auto_rename(file); + printf(" Renamed to %s\n", file_name(file->dir_ent.name)); + return 0; + case '3': + rename_file(file); return 0; - case '4': - MODIFY(file, size, htole32(0)); - MODIFY(file, attr, file->dir_ent.attr | ATTR_DIR); - break; + case '4': + MODIFY(file, size, htole32(0)); + MODIFY(file, attr, file->dir_ent.attr | ATTR_DIR); + break; + } } } if (!dots) { @@ -528,9 +530,9 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (file->dir_ent.attr & ATTR_DIR) { if (le32toh(file->dir_ent.size)) { - printf("%s\n Directory has non-zero size. Fixing it.\n", - path_name(file)); - MODIFY(file, size, htole32(0)); + printf("%s\n Directory has non-zero size.%s\n", + path_name(file), (rw) ? " Fixing it." : ""); + if (rw) MODIFY(file, size, htole32(0)); } if (file->parent && !strncmp((const char *)file->dir_ent.name, MSDOS_DOT, @@ -539,7 +541,7 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (FSTART(file, fs) != expect) { printf("%s\n Start (%lu) does not point to parent (%lu)\n", path_name(file), (unsigned long)FSTART(file, fs), (long)expect); - MODIFY_START(file, expect, fs); + if (rw) MODIFY_START(file, expect, fs); } return 0; } @@ -553,14 +555,14 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) if (FSTART(file, fs) != expect) { printf("%s\n Start (%lu) does not point to .. (%lu)\n", path_name(file), (unsigned long)FSTART(file, fs), (unsigned long)expect); - MODIFY_START(file, expect, fs); + if (rw) MODIFY_START(file, expect, fs); } return 0; } if (FSTART(file, fs) == 0) { - printf("%s\n Start does point to root directory. Deleting dir. \n", - path_name(file)); - MODIFY(file, name[0], DELETED_FLAG); + printf("%s\n Start does point to root directory.%s\n", + path_name(file), (rw) ? " Deleting dir. " : ""); + if (rw) MODIFY(file, name[0], DELETED_FLAG); return 0; } } @@ -569,18 +571,19 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) path_name(file)); if (!file->offset) die("Bad FAT32 root directory! (bad start cluster 1)\n"); - MODIFY_START(file, 0, fs); + if (rw) MODIFY_START(file, 0, fs); } if (FSTART(file, fs) >= fs->data_clusters + 2) { printf - ("%s\n Start cluster beyond limit (%lu > %lu). Truncating file.\n", + ("%s\n Start cluster beyond limit (%lu > %lu).%s\n", path_name(file), (unsigned long)FSTART(file, fs), - (unsigned long)(fs->data_clusters + 1)); + (unsigned long)(fs->data_clusters + 1), + (rw) ? " Truncating file." : ""); if (!file->offset) die("Bad FAT32 root directory! (start cluster beyond limit: %lu > %lu)\n", (unsigned long)FSTART(file, fs), (unsigned long)(fs->data_clusters + 1)); - MODIFY_START(file, 0, fs); + if (rw) MODIFY_START(file, 0, fs); } clusters = prev = 0; for (curr = FSTART(file, fs) ? FSTART(file, fs) : @@ -589,25 +592,34 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) get_fat(&curEntry, fs->fat, curr, fs); if (!curEntry.value || bad_cluster(fs, curr)) { - printf("%s\n Contains a %s cluster (%lu). Assuming EOF.\n", - path_name(file), curEntry.value ? "bad" : "free", (unsigned long)curr); + printf("%s\n Contains a %s cluster (%lu).%s\n", + path_name(file), curEntry.value ? "bad" : "free", (unsigned long)curr, + (rw) ? " Assuming EOF." : ""); if (prev) set_fat(fs, prev, -1); else if (!file->offset) die("FAT32 root dir starts with a bad cluster!"); else - MODIFY_START(file, 0, fs); + if (rw) MODIFY_START(file, 0, fs); break; } if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) <= (uint64_t)clusters * fs->cluster_size) { - printf - ("%s\n File size is %u bytes, cluster chain length is > %llu " - "bytes.\n Truncating file to %u bytes.\n", path_name(file), - le32toh(file->dir_ent.size), - (unsigned long long)clusters * fs->cluster_size, - le32toh(file->dir_ent.size)); - truncate_file(fs, file, clusters); + if (rw) { + printf + ("%s\n File size is %u bytes, cluster chain length is > %llu " + "bytes.\n Truncating file to %u bytes.\n", path_name(file), + le32toh(file->dir_ent.size), + (unsigned long long)clusters * fs->cluster_size, + le32toh(file->dir_ent.size)); + truncate_file(fs, file, clusters); + } else { + printf + ("%s\n File size is %u bytes, cluster chain length is > %llu " + "bytes.\n", path_name(file), + le32toh(file->dir_ent.size), + (unsigned long long)clusters * fs->cluster_size); + } break; } if ((owner = get_owner(fs, curr))) { @@ -622,12 +634,12 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) else clusters2++; restart = file->dir_ent.attr & ATTR_DIR; - if (!owner->offset) { + if (!owner->offset && rw) { printf(" Truncating second to %llu bytes because first " "is FAT32 root dir.\n", (unsigned long long)clusters2 * fs->cluster_size); do_trunc = 2; - } else if (!file->offset) { + } else if (!file->offset && rw) { printf(" Truncating first to %llu bytes because second " "is FAT32 root dir.\n", (unsigned long long)clusters * fs->cluster_size); @@ -638,11 +650,11 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) (unsigned long long)clusters * fs->cluster_size, restart ? " and restart" : "", (unsigned long long)clusters2 * fs->cluster_size); - else + else if (rw) printf(" Truncating second to %llu bytes.\n", (unsigned long long)clusters2 * fs->cluster_size); - if (do_trunc != 2 - && (do_trunc == 1 + if ((do_trunc != 2 && rw) + && ((do_trunc == 1 && rw) || (interactive && get_key("12", "?") == '1'))) { prev = 0; clusters = 0; @@ -684,7 +696,7 @@ static int check_file(DOS_FS * fs, DOS_FILE * file) prev = curr; } if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) > - (uint64_t)clusters * fs->cluster_size) { + (uint64_t)clusters * fs->cluster_size && rw) { printf ("%s\n File size is %u bytes, cluster chain length is %llu bytes." "\n Truncating file to %llu bytes.\n", path_name(file), @@ -727,7 +739,7 @@ static int check_dir(DOS_FS * fs, DOS_FILE ** root, int dots) path_name(parent), bad, good + bad); if (!dots) printf(" Not dropping root directory.\n"); - else if (!interactive) + else if (!interactive || !rw) printf(" Not dropping it in auto-mode.\n"); else if (get_key("yn", "Drop directory ? (y/n)") == 'y') { truncate_file(fs, parent, 0); @@ -759,23 +771,25 @@ static int check_dir(DOS_FS * fs, DOS_FILE ** root, int dots) if (interactive) printf("1) Drop file\n2) Rename file\n3) Auto-rename\n" "4) Keep it\n"); - else + else if (rw) printf(" Auto-renaming it.\n"); - switch (interactive ? get_key("1234", "?") : '3') { - case '1': - drop_file(fs, *walk); - walk = &(*walk)->next; - continue; - case '2': - rename_file(*walk); - redo = 1; - break; - case '3': - auto_rename(*walk); - printf(" Renamed to %s\n", file_name((*walk)->dir_ent.name)); - break; - case '4': - break; + if (rw || interactive) { + switch (interactive ? get_key("1234", "?") : '3') { + case '1': + drop_file(fs, *walk); + walk = &(*walk)->next; + continue; + case '2': + rename_file(*walk); + redo = 1; + break; + case '3': + auto_rename(*walk); + printf(" Renamed to %s\n", file_name((*walk)->dir_ent.name)); + break; + case '4': + break; + } } } /* don't check for duplicates of the volume label */ @@ -794,38 +808,40 @@ static int check_dir(DOS_FS * fs, DOS_FILE ** root, int dots) ("1) Drop first\n2) Drop second\n3) Rename first\n" "4) Rename second\n5) Auto-rename first\n" "6) Auto-rename second\n"); - else + else if (rw) printf(" Auto-renaming second.\n"); - switch (interactive ? get_key("123456", "?") : '6') { - case '1': - drop_file(fs, *walk); - *walk = (*walk)->next; - skip = 1; - break; - case '2': - drop_file(fs, *scan); - *scan = (*scan)->next; - continue; - case '3': - rename_file(*walk); - printf(" Renamed to %s\n", path_name(*walk)); - redo = 1; - break; - case '4': - rename_file(*scan); - printf(" Renamed to %s\n", path_name(*walk)); - redo = 1; - break; - case '5': - auto_rename(*walk); - printf(" Renamed to %s\n", - file_name((*walk)->dir_ent.name)); - break; - case '6': - auto_rename(*scan); - printf(" Renamed to %s\n", - file_name((*scan)->dir_ent.name)); - break; + if (rw || interactive) { + switch (interactive ? get_key("123456", "?") : '6') { + case '1': + drop_file(fs, *walk); + *walk = (*walk)->next; + skip = 1; + break; + case '2': + drop_file(fs, *scan); + *scan = (*scan)->next; + continue; + case '3': + rename_file(*walk); + printf(" Renamed to %s\n", path_name(*walk)); + redo = 1; + break; + case '4': + rename_file(*scan); + printf(" Renamed to %s\n", path_name(*walk)); + redo = 1; + break; + case '5': + auto_rename(*walk); + printf(" Renamed to %s\n", + file_name((*walk)->dir_ent.name)); + break; + case '6': + auto_rename(*scan); + printf(" Renamed to %s\n", + file_name((*scan)->dir_ent.name)); + break; + } } } scan = &(*scan)->next; diff --git a/sdk/lib/fslib/vfatlib/check/fat.c b/sdk/lib/fslib/vfatlib/check/fat.c index 87c7fa5f2b..a601e6a67f 100644 --- a/sdk/lib/fslib/vfatlib/check/fat.c +++ b/sdk/lib/fslib/vfatlib/check/fat.c @@ -350,7 +350,7 @@ void reclaim_free(DOS_FS * fs) get_fat(&curEntry, fs->fat, i, fs); if (!get_owner(fs, i) && curEntry.value && - !FAT_IS_BAD(fs, curEntry.value)) { + !FAT_IS_BAD(fs, curEntry.value) && rw) { set_fat(fs, i, 0); reclaimed++; } @@ -490,30 +490,32 @@ void reclaim_file(DOS_FS * fs) } while (changed); - /* Now we can start recovery */ - files = reclaimed = 0; - for (i = 2; i < total_num_clusters; i++) - /* If this cluster is the head of an orphan chain... */ - if (get_owner(fs, i) == &orphan && !num_refs[i]) { - DIR_ENT de; - off_t offset; - files++; - offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = htole16(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = htole16(i >> 16); - for (walk = i; walk > 0 && walk != -1; - walk = next_cluster(fs, walk)) { - de.size = htole32(le32toh(de.size) + fs->cluster_size); - reclaimed++; + if (rw) { + /* Now we can start recovery */ + files = reclaimed = 0; + for (i = 2; i < total_num_clusters; i++) + /* If this cluster is the head of an orphan chain... */ + if (get_owner(fs, i) == &orphan && !num_refs[i]) { + DIR_ENT de; + off_t offset; + files++; + offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); + de.start = htole16(i & 0xffff); + if (fs->fat_bits == 32) + de.starthi = htole16(i >> 16); + for (walk = i; walk > 0 && walk != -1; + walk = next_cluster(fs, walk)) { + de.size = htole32(le32toh(de.size) + fs->cluster_size); + reclaimed++; + } + fs_write(offset, sizeof(DIR_ENT), &de); } - fs_write(offset, sizeof(DIR_ENT), &de); - } - if (reclaimed) - printf("Reclaimed %d unused cluster%s (%llu bytes) in %d chain%s.\n", - reclaimed, reclaimed == 1 ? "" : "s", - (unsigned long long)reclaimed * fs->cluster_size, files, - files == 1 ? "" : "s"); + if (reclaimed) + printf("Reclaimed %d unused cluster%s (%llu bytes) in %d chain%s.\n", + reclaimed, reclaimed == 1 ? "" : "s", + (unsigned long long)reclaimed * fs->cluster_size, files, + files == 1 ? "" : "s"); + } free(num_refs); } @@ -543,9 +545,9 @@ uint32_t update_free(DOS_FS * fs) (long)fs->free_clusters, (long)free); if (interactive) printf("1) Correct\n2) Don't correct\n"); - else + else if (rw) printf(" Auto-correcting.\n"); - if (!interactive || get_key("12", "?") == '1') + if ((!interactive && rw) || (interactive && get_key("12", "?") == '1')) do_set = 1; } } else { diff --git a/sdk/lib/fslib/vfatlib/check/io.c b/sdk/lib/fslib/vfatlib/check/io.c index 2eca2abdd4..06e0496e1a 100644 --- a/sdk/lib/fslib/vfatlib/check/io.c +++ b/sdk/lib/fslib/vfatlib/check/io.c @@ -352,6 +352,8 @@ void fs_write(off_t pos, int size, void *data) CHANGE *new; int did; + assert(interactive || rw); + #if 1 //SAE if (FsCheckFlags & FSCHECK_IMMEDIATE_WRITE) {

6 years, 9 months

[reactos] 01/01: [COMCTL32_WINETEST] Add a PCH.

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=284a839dbd6f647894211… commit 284a839dbd6f6478942117c2bd8ecc83b1dde6b3 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Dec 17 13:40:43 2017 +0100 [COMCTL32_WINETEST] Add a PCH. --- modules/rostests/winetests/comctl32/CMakeLists.txt | 12 +++++++---- modules/rostests/winetests/comctl32/animate.c | 10 +-------- modules/rostests/winetests/comctl32/button.c | 8 +++---- modules/rostests/winetests/comctl32/comboex.c | 11 +--------- modules/rostests/winetests/comctl32/datetime.c | 11 +--------- modules/rostests/winetests/comctl32/dpa.c | 17 +-------------- modules/rostests/winetests/comctl32/header.c | 19 +--------------- modules/rostests/winetests/comctl32/imagelist.c | 21 +++--------------- modules/rostests/winetests/comctl32/ipaddress.c | 6 +----- modules/rostests/winetests/comctl32/listview.c | 11 +--------- modules/rostests/winetests/comctl32/misc.c | 9 +------- modules/rostests/winetests/comctl32/monthcal.c | 16 +------------- modules/rostests/winetests/comctl32/mru.c | 14 ++---------- modules/rostests/winetests/comctl32/msg.h | 8 +++---- modules/rostests/winetests/comctl32/pager.c | 9 +------- modules/rostests/winetests/comctl32/precomp.h | 25 ++++++++++++++++++++++ modules/rostests/winetests/comctl32/progress.c | 11 +--------- modules/rostests/winetests/comctl32/propsheet.c | 9 +------- modules/rostests/winetests/comctl32/rebar.c | 15 +------------ modules/rostests/winetests/comctl32/status.c | 7 +----- modules/rostests/winetests/comctl32/subclass.c | 8 ++----- modules/rostests/winetests/comctl32/syslink.c | 10 +-------- modules/rostests/winetests/comctl32/tab.c | 11 +--------- modules/rostests/winetests/comctl32/taskdialog.c | 10 +-------- modules/rostests/winetests/comctl32/toolbar.c | 16 +------------- modules/rostests/winetests/comctl32/tooltips.c | 11 +--------- modules/rostests/winetests/comctl32/trackbar.c | 10 +-------- modules/rostests/winetests/comctl32/treeview.c | 15 +------------ modules/rostests/winetests/comctl32/updown.c | 10 +-------- modules/rostests/winetests/comctl32/v6util.h | 6 ++++-- 30 files changed, 72 insertions(+), 284 deletions(-) diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index b1798c3018..f72f87a169 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -5,7 +5,6 @@ add_definitions(-DUSE_WINE_TODOS) list(APPEND SOURCE animate.c - button.c comboex.c datetime.c dpa.c @@ -21,7 +20,6 @@ list(APPEND SOURCE propsheet.c rebar.c status.c - subclass.c syslink.c tab.c taskdialog.c @@ -30,9 +28,14 @@ list(APPEND SOURCE trackbar.c treeview.c updown.c - testlist.c) + precomp.h) -add_executable(comctl32_winetest ${SOURCE} rsrc.rc) +add_executable(comctl32_winetest + ${SOURCE} + button.c + subclass.c + testlist.c + rsrc.rc) if(USE_CLANG_CL OR (NOT MSVC)) add_target_compile_flags(comctl32_winetest "-Wno-format") @@ -40,4 +43,5 @@ endif() set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32) +add_pch(comctl32_winetest precomp.h SOURCE) add_rostests_file(TARGET comctl32_winetest) diff --git a/modules/rostests/winetests/comctl32/animate.c b/modules/rostests/winetests/comctl32/animate.c index 28cf55b958..9324acd0e6 100644 --- a/modules/rostests/winetests/comctl32/animate.c +++ b/modules/rostests/winetests/comctl32/animate.c @@ -17,15 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commctrl.h" - -#include "wine/test.h" +#include "precomp.h" #define SEARCHING_AVI_INDEX 151 /* From shell32 resource library */ #define INVALID_AVI_INDEX 0xffff diff --git a/modules/rostests/winetests/comctl32/button.c b/modules/rostests/winetests/comctl32/button.c index 8cb5b5fc9b..ccc052b327 100644 --- a/modules/rostests/winetests/comctl32/button.c +++ b/modules/rostests/winetests/comctl32/button.c @@ -22,15 +22,13 @@ #undef USE_WINE_TODOS -//#include <windows.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> +#include "wine/test.h" + +#include <assert.h> #include <wingdi.h> #include <winuser.h> #include <commctrl.h> -#include "wine/test.h" #include "v6util.h" #include "msg.h" diff --git a/modules/rostests/winetests/comctl32/comboex.c b/modules/rostests/winetests/comctl32/comboex.c index ec13e22801..947a871a6b 100644 --- a/modules/rostests/winetests/comctl32/comboex.c +++ b/modules/rostests/winetests/comctl32/comboex.c @@ -17,16 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -//#include <windows.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> - -//#include "wine/test.h" -#include "msg.h" +#include "precomp.h" #define EDITBOX_SEQ_INDEX 0 #define NUM_MSG_SEQUENCES 1 diff --git a/modules/rostests/winetests/comctl32/datetime.c b/modules/rostests/winetests/comctl32/datetime.c index fcd7bee143..19ee52ba40 100644 --- a/modules/rostests/winetests/comctl32/datetime.c +++ b/modules/rostests/winetests/comctl32/datetime.c @@ -17,16 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <windows.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winnls.h> -#include <commctrl.h> -//#include "wine/test.h" -#include "msg.h" +#include "precomp.h" #define expect(EXPECTED, GOT) ok((GOT)==(EXPECTED), "Expected %d, got %ld\n", (EXPECTED), (GOT)) diff --git a/modules/rostests/winetests/comctl32/dpa.c b/modules/rostests/winetests/comctl32/dpa.c index 291fb98b78..b72214533b 100644 --- a/modules/rostests/winetests/comctl32/dpa.c +++ b/modules/rostests/winetests/comctl32/dpa.c @@ -19,22 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <commctrl.h> -#include <objbase.h> -//#include "objidl.h" - -#include <wine/test.h> +#include "precomp.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) diff --git a/modules/rostests/winetests/comctl32/header.c b/modules/rostests/winetests/comctl32/header.c index 8be4db27dd..f428349186 100644 --- a/modules/rostests/winetests/comctl32/header.c +++ b/modules/rostests/winetests/comctl32/header.c @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -//#include <windows.h> -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winnls.h> -#include <objbase.h> -#include <commctrl.h> -#include <assert.h> - -#include <wine/test.h> -#include "v6util.h" -#include "msg.h" +#include "precomp.h" typedef struct tagEXPECTEDNOTIFY { diff --git a/modules/rostests/winetests/comctl32/imagelist.c b/modules/rostests/winetests/comctl32/imagelist.c index 5d2cf3cb05..57e7f5c069 100644 --- a/modules/rostests/winetests/comctl32/imagelist.c +++ b/modules/rostests/winetests/comctl32/imagelist.c @@ -21,28 +21,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H +#include "precomp.h" -#define COBJMACROS -#define CONST_VTABLE - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <objbase.h> -#include <commctrl.h> /* must be included after objbase.h to get ImageList_Write */ #include <ole2.h> -#include <initguid.h> -#include <commoncontrols.h> #include <shellapi.h> -#include <wine/test.h> -#include "v6util.h" +#include <initguid.h> +#include <commoncontrols.h> #define IMAGELIST_MAGIC (('L' << 8) | 'I') diff --git a/modules/rostests/winetests/comctl32/ipaddress.c b/modules/rostests/winetests/comctl32/ipaddress.c index 22bd1d0555..f5075662dd 100644 --- a/modules/rostests/winetests/comctl32/ipaddress.c +++ b/modules/rostests/winetests/comctl32/ipaddress.c @@ -17,11 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <windows.h> -#include <winuser.h> -#include <commctrl.h> +#include "precomp.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) diff --git a/modules/rostests/winetests/comctl32/listview.c b/modules/rostests/winetests/comctl32/listview.c index ba3700fead..2210fb3a8a 100644 --- a/modules/rostests/winetests/comctl32/listview.c +++ b/modules/rostests/winetests/comctl32/listview.c @@ -20,16 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <stdio.h> -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> - -#include "v6util.h" -#include "msg.h" +#include "precomp.h" enum seq_index { PARENT_SEQ_INDEX, diff --git a/modules/rostests/winetests/comctl32/misc.c b/modules/rostests/winetests/comctl32/misc.c index 89fc5f73b5..9fe3ae378e 100644 --- a/modules/rostests/winetests/comctl32/misc.c +++ b/modules/rostests/winetests/comctl32/misc.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdio.h> -//#include <windows.h> - -#include <wine/test.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> -#include "v6util.h" +#include "precomp.h" static PVOID (WINAPI * pAlloc)(LONG); static PVOID (WINAPI * pReAlloc)(PVOID, LONG); diff --git a/modules/rostests/winetests/comctl32/monthcal.c b/modules/rostests/winetests/comctl32/monthcal.c index 1ca593e6bb..84ba54acfa 100644 --- a/modules/rostests/winetests/comctl32/monthcal.c +++ b/modules/rostests/winetests/comctl32/monthcal.c @@ -19,21 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <commctrl.h> - -#include "v6util.h" -//#include <assert.h> -//#include <windows.h> -#include "msg.h" +#include "precomp.h" #define expect(expected, got) ok(expected == got, "Expected %d, got %d\n", expected, got); #define expect_hex(expected, got) ok(expected == got, "Expected %x, got %x\n", expected, got); diff --git a/modules/rostests/winetests/comctl32/mru.c b/modules/rostests/winetests/comctl32/mru.c index 5c0ec48d44..1cb9a99c60 100644 --- a/modules/rostests/winetests/comctl32/mru.c +++ b/modules/rostests/winetests/comctl32/mru.c @@ -17,18 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -#include <winuser.h> -//#include "winnls.h" -#include <winreg.h> -#include <commctrl.h> -//#include "shlwapi.h" - -#include <wine/test.h> + +#include "precomp.h" /* Keys for testing MRU functions */ #define REG_TEST_BASEKEYA "Software\\Wine" diff --git a/modules/rostests/winetests/comctl32/msg.h b/modules/rostests/winetests/comctl32/msg.h index 36327d1d72..fe9969daa0 100644 --- a/modules/rostests/winetests/comctl32/msg.h +++ b/modules/rostests/winetests/comctl32/msg.h @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -//#include <windows.h> -#include <wine/test.h> +#pragma once /* undocumented SWP flags - from SDK 3.1 */ #define SWP_NOCLIENTSIZE 0x0800 @@ -164,7 +162,7 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index, } } -static void ok_sequence_(struct msg_sequence **seq, int sequence_index, +static inline void ok_sequence_(struct msg_sequence **seq, int sequence_index, const struct message *expected, const char *context, BOOL todo, const char *file, int line) { @@ -387,7 +385,7 @@ done: ok_sequence_(seq, index, (exp), (contx), (todo), __FILE__, __LINE__) -static void init_msg_sequences(struct msg_sequence **seq, int n) +static inline void init_msg_sequences(struct msg_sequence **seq, int n) { int i; diff --git a/modules/rostests/winetests/comctl32/pager.c b/modules/rostests/winetests/comctl32/pager.c index 4eb48be116..4766656150 100644 --- a/modules/rostests/winetests/comctl32/pager.c +++ b/modules/rostests/winetests/comctl32/pager.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> - -#include "msg.h" +#include "precomp.h" #define NUM_MSG_SEQUENCES 1 #define PAGER_SEQ_INDEX 0 diff --git a/modules/rostests/winetests/comctl32/precomp.h b/modules/rostests/winetests/comctl32/precomp.h new file mode 100644 index 0000000000..92352b7794 --- /dev/null +++ b/modules/rostests/winetests/comctl32/precomp.h @@ -0,0 +1,25 @@ +#ifndef _COMCTL32_WINETEST_PRECOMP_H_ +#define _COMCTL32_WINETEST_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#define COBJMACROS +#define CONST_VTABLE + +#include <stdio.h> + +#include <wine/test.h> +#include <assert.h> +#include <wingdi.h> +#include <winuser.h> +#include <winnls.h> +#include <winreg.h> +#include <objbase.h> +#include <wine/commctrl.h> + +#include "msg.h" +#include "resources.h" +#include "v6util.h" + +#endif /* !_COMCTL32_WINETEST_PRECOMP_H_ */ diff --git a/modules/rostests/winetests/comctl32/progress.c b/modules/rostests/winetests/comctl32/progress.c index 7f69c35232..506fee007f 100644 --- a/modules/rostests/winetests/comctl32/progress.c +++ b/modules/rostests/winetests/comctl32/progress.c @@ -17,16 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "commctrl.h" - -#include "wine/test.h" - +#include "precomp.h" static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; diff --git a/modules/rostests/winetests/comctl32/propsheet.c b/modules/rostests/winetests/comctl32/propsheet.c index 76e706a7b1..fd9f997dcb 100644 --- a/modules/rostests/winetests/comctl32/propsheet.c +++ b/modules/rostests/winetests/comctl32/propsheet.c @@ -18,16 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> +#include "precomp.h" -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> #include <reactos/undocuser.h> -#include "msg.h" - -#include "resources.h" static HWND parenthwnd; static HWND sheethwnd; diff --git a/modules/rostests/winetests/comctl32/rebar.c b/modules/rostests/winetests/comctl32/rebar.c index 16030e3def..5aa3a1ef5f 100644 --- a/modules/rostests/winetests/comctl32/rebar.c +++ b/modules/rostests/winetests/comctl32/rebar.c @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* make sure the structures work with a comctl32 v5.x */ -#define _WIN32_WINNT 0x500 -#define _WIN32_IE 0x500 - -#include <wine/test.h> - -#include <assert.h> -//#include <stdarg.h> - -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> -//#include <uxtheme.h> +#include "precomp.h" static RECT height_change_notify_rect; static HWND hMainWnd; diff --git a/modules/rostests/winetests/comctl32/status.c b/modules/rostests/winetests/comctl32/status.c index 6db6bf52fa..94345e1a3a 100644 --- a/modules/rostests/winetests/comctl32/status.c +++ b/modules/rostests/winetests/comctl32/status.c @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> +#include "precomp.h" #define SUBCLASS_NAME "MyStatusBar" diff --git a/modules/rostests/winetests/comctl32/subclass.c b/modules/rostests/winetests/comctl32/subclass.c index 720c68e28d..7333c65916 100644 --- a/modules/rostests/winetests/comctl32/subclass.c +++ b/modules/rostests/winetests/comctl32/subclass.c @@ -19,17 +19,13 @@ #define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ +#include "wine/test.h" + #include <assert.h> -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" #include "winuser.h" #include "commctrl.h" -#include "wine/test.h" - static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); diff --git a/modules/rostests/winetests/comctl32/syslink.c b/modules/rostests/winetests/comctl32/syslink.c index 9f7233fae7..028e7a6b96 100644 --- a/modules/rostests/winetests/comctl32/syslink.c +++ b/modules/rostests/winetests/comctl32/syslink.c @@ -17,15 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> - -#include "v6util.h" -#include "msg.h" +#include "precomp.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define NUM_MSG_SEQUENCE 2 diff --git a/modules/rostests/winetests/comctl32/tab.c b/modules/rostests/winetests/comctl32/tab.c index 431a49de17..99f4bc3e89 100644 --- a/modules/rostests/winetests/comctl32/tab.c +++ b/modules/rostests/winetests/comctl32/tab.c @@ -18,16 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -#include <assert.h> -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> -#include <stdio.h> - -#include "msg.h" +#include "precomp.h" #define DEFAULT_MIN_TAB_WIDTH 54 #define TAB_PADDING_X 6 diff --git a/modules/rostests/winetests/comctl32/taskdialog.c b/modules/rostests/winetests/comctl32/taskdialog.c index c937127897..40ca1637c2 100644 --- a/modules/rostests/winetests/comctl32/taskdialog.c +++ b/modules/rostests/winetests/comctl32/taskdialog.c @@ -17,15 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "commctrl.h" - -#include "wine/test.h" -#include "v6util.h" +#include "precomp.h" static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, diff --git a/modules/rostests/winetests/comctl32/toolbar.c b/modules/rostests/winetests/comctl32/toolbar.c index e2c29f45c6..f49cd2ae81 100644 --- a/modules/rostests/winetests/comctl32/toolbar.c +++ b/modules/rostests/winetests/comctl32/toolbar.c @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "commctrl.h" - -#include "resources.h" - -#include "wine/test.h" - -#include "msg.h" +#include "precomp.h" #define PARENT_SEQ_INDEX 0 #define NUM_MSG_SEQUENCES 1 diff --git a/modules/rostests/winetests/comctl32/tooltips.c b/modules/rostests/winetests/comctl32/tooltips.c index 06b49e397c..2cc0210312 100644 --- a/modules/rostests/winetests/comctl32/tooltips.c +++ b/modules/rostests/winetests/comctl32/tooltips.c @@ -17,16 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -#include <assert.h> -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <winnls.h> -#include <commctrl.h> - -#include "resources.h" +#include "precomp.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) diff --git a/modules/rostests/winetests/comctl32/trackbar.c b/modules/rostests/winetests/comctl32/trackbar.c index 0bbe97c54a..9a028003d7 100644 --- a/modules/rostests/winetests/comctl32/trackbar.c +++ b/modules/rostests/winetests/comctl32/trackbar.c @@ -17,15 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/test.h> - -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> -#include <stdio.h> - -#include "msg.h" +#include "precomp.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define NUM_MSG_SEQUENCE 2 diff --git a/modules/rostests/winetests/comctl32/treeview.c b/modules/rostests/winetests/comctl32/treeview.c index 83ba492b7b..e14c33690a 100644 --- a/modules/rostests/winetests/comctl32/treeview.c +++ b/modules/rostests/winetests/comctl32/treeview.c @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "winreg.h" -#include "wine/commctrl.h" - -#include "wine/test.h" -#include "v6util.h" -#include "msg.h" +#include "precomp.h" static const char *TEST_CALLBACK_TEXT = "callback_text"; diff --git a/modules/rostests/winetests/comctl32/updown.c b/modules/rostests/winetests/comctl32/updown.c index fb5ade4a72..e3dde91ebc 100644 --- a/modules/rostests/winetests/comctl32/updown.c +++ b/modules/rostests/winetests/comctl32/updown.c @@ -44,15 +44,7 @@ * - more stuff to test */ -#include <wine/test.h> - -//#include <windows.h> -#include <wingdi.h> -#include <winuser.h> -#include <commctrl.h> -#include <stdio.h> - -#include "msg.h" +#include "precomp.h" #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) diff --git a/modules/rostests/winetests/comctl32/v6util.h b/modules/rostests/winetests/comctl32/v6util.h index 9f5a9c48da..0247df6365 100644 --- a/modules/rostests/winetests/comctl32/v6util.h +++ b/modules/rostests/winetests/comctl32/v6util.h @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #ifdef __i386__ @@ -60,7 +62,7 @@ static const CHAR manifest[] = "</dependency>\n" "</assembly>\n"; -static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) +static inline void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) { HANDLE hKernel32; BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); @@ -81,7 +83,7 @@ static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) DeleteFileA(manifest_name); } -static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) +static inline BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) { HANDLE hKernel32; HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*);

6 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2017