Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: ! Fix build of tracert
by Timo Kreuzer 06 Jan '18

06 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5985fe613bf17d20b8861… commit 5985fe613bf17d20b886106ec047a8e97baa2bb5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jan 4 18:29:11 2018 +0100 ! Fix build of tracert # Conflicts: # sdk/include/psdk/ipexport.h --- sdk/include/psdk/ipexport.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sdk/include/psdk/ipexport.h b/sdk/include/psdk/ipexport.h index 608952eec8..98cd3a9b82 100644 --- a/sdk/include/psdk/ipexport.h +++ b/sdk/include/psdk/ipexport.h @@ -37,6 +37,19 @@ struct ip_option_information unsigned char* OptionsData; }; +#if defined(_WIN64) + +struct ip_option_information32 +{ + unsigned char Ttl; + unsigned char Tos; + unsigned char Flags; + unsigned char OptionsSize; + unsigned char* POINTER_32 OptionsData; +}; + +#endif // _WIN64 + #define IP_FLAG_DF 0x2 #define IP_OPT_EOL 0 @@ -75,9 +88,11 @@ struct icmp_echo_reply32 unsigned short DataSize; unsigned short Reserved; void* POINTER_32 Data; - struct ip_option_information Options; + struct ip_option_information32 Options; }; +typedef struct ip_option_information32 IP_OPTION_INFORMATION32, *PIP_OPTION_INFORMATION32; + typedef struct icmp_echo_reply32 ICMP_ECHO_REPLY32, *PICMP_ECHO_REPLY32; #endif

1 0

[reactos] 01/01: [FLTMGR] Properly allocate CCB in CreatePortCCB()
by Pierre Schweitzer 06 Jan '18

06 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48382d1448a72011fb9fc… commit 48382d1448a72011fb9fc6279fae35ac35131a0e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 6 13:54:21 2018 +0100 [FLTMGR] Properly allocate CCB in CreatePortCCB() CID 1427031 --- drivers/filters/fltmgr/Messaging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index 6a40e0d8c1..d30292a5a3 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -817,7 +817,7 @@ CreatePortCCB(_In_ PFLT_PORT_OBJECT PortObject) PPORT_CCB PortCCB; /* Allocate a CCB struct to hold the client port object info */ - PortCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(PPORT_CCB), FM_TAG_CCB); + PortCCB = ExAllocatePoolWithTag(NonPagedPool, sizeof(PORT_CCB), FM_TAG_CCB); if (PortCCB) { /* Initialize the structure */ @@ -828,4 +828,4 @@ CreatePortCCB(_In_ PFLT_PORT_OBJECT PortObject) } return PortCCB; -} \ No newline at end of file +}

1 0

[reactos] 01/01: [NTOS:CM] Improve code in cmsysini.c (#216)
by Colin Finck 06 Jan '18

06 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5d366b2000be1915be3c… commit f5d366b2000be1915be3c48a5afb5535fb6e316e Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Jan 6 13:27:41 2018 +0100 [NTOS:CM] Improve code in cmsysini.c (#216) Based on an original patch by Timo Kreuzer, with modifications by me to adapt it to latest HEAD and use a single exit path through the Cleanup label. This reliably frees all allocated handles. The original code returns STATUS_SUCCESS for many cases. This has been preserved. In the future, it should be checked though whether returning success is appropriate for all these cases. CORE-6844 --- ntoskrnl/config/cmsysini.c | 256 ++++++++++++++++++++++++--------------------- 1 file changed, 136 insertions(+), 120 deletions(-) diff --git a/ntoskrnl/config/cmsysini.c b/ntoskrnl/config/cmsysini.c index a433485eb2..b95610552a 100644 --- a/ntoskrnl/config/cmsysini.c +++ b/ntoskrnl/config/cmsysini.c @@ -530,7 +530,10 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) CHAR ValueInfoBuffer[128]; PKEY_VALUE_FULL_INFORMATION ValueInfo; WCHAR UnicodeBuffer[128]; - HANDLE SelectHandle, KeyHandle, ConfigHandle = NULL, ProfileHandle = NULL; + HANDLE SelectHandle = NULL; + HANDLE KeyHandle = NULL; + HANDLE ConfigHandle = NULL; + HANDLE ProfileHandle = NULL; HANDLE ParentHandle = NULL; ULONG ControlSet, HwProfile; NTSTATUS Status; @@ -538,69 +541,76 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock) PLOADER_PARAMETER_EXTENSION LoaderExtension; PAGED_CODE(); - /* Open the select key */ - InitializeObjectAttributes(&ObjectAttributes, - &SelectName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); - if (!NT_SUCCESS(Status)) + /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ + if (LoaderBlock->RegistryBase == NULL) { - /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ - if (!LoaderBlock->RegistryBase) + /* Build the ControlSet001 key */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\System\\ControlSet001"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + &Disposition); + if (!NT_SUCCESS(Status)) { - /* Build the ControlSet001 key */ - RtlInitUnicodeString(&KeyName, - L"\\Registry\\Machine\\System\\ControlSet001"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtCreateKey(&KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - &Disposition); - if (!NT_SUCCESS(Status)) return Status; - - /* Create the Hardware Profile keys */ - Status = CmpCreateHardwareProfile(KeyHandle); - if (!NT_SUCCESS(Status)) - return Status; - - /* Don't need the handle */ - ZwClose(KeyHandle); + DPRINT1("Failed to create ControlSet001 key: 0x%lx\n", Status); + goto Cleanup; + } - /* Use hard-coded setting */ - ControlSet = 1; - goto UseSet; + /* Create the Hardware Profile keys */ + Status = CmpCreateHardwareProfile(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create Hardware profile keys: 0x%lx\n", Status); + goto Cleanup; } - /* Fail for real boots */ - return Status; + /* Use hard-coded setting */ + ControlSet = 1; } + else + { + /* Open the select key */ + InitializeObjectAttributes(&ObjectAttributes, + &SelectName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open select key: 0x%lx\n", Status); + goto Cleanup; + } - /* Open the current value */ - RtlInitUnicodeString(&KeyName, L"Current"); - Status = NtQueryValueKey(SelectHandle, - &KeyName, - KeyValueFullInformation, - ValueInfoBuffer, - sizeof(ValueInfoBuffer), - &ResultLength); - NtClose(SelectHandle); - if (!NT_SUCCESS(Status)) return Status; + /* Open the current value */ + RtlInitUnicodeString(&KeyName, L"Current"); + Status = NtQueryValueKey(SelectHandle, + &KeyName, + KeyValueFullInformation, + ValueInfoBuffer, + sizeof(ValueInfoBuffer), + &ResultLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open the Current value: 0x%lx\n", Status); + goto Cleanup; + } - /* Get the actual value pointer, and get the control set ID */ - ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; - ControlSet = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + /* Get the actual value pointer, and get the control set ID */ + ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; + ControlSet = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); + } /* Create the current control set key */ -UseSet: RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\System\\CurrentControlSet"); InitializeObjectAttributes(&ObjectAttributes, @@ -615,15 +625,19 @@ UseSet: NULL, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, &Disposition); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + goto Cleanup; /* Sanity check */ ASSERT(Disposition == REG_CREATED_NEW_KEY); /* Initialize the target link name */ - RtlStringCbPrintfW(UnicodeBuffer, sizeof(UnicodeBuffer), - L"\\Registry\\Machine\\System\\ControlSet%03ld", - ControlSet); + Status = RtlStringCbPrintfW(UnicodeBuffer, sizeof(UnicodeBuffer), + L"\\Registry\\Machine\\System\\ControlSet%03ld", + ControlSet); + if (!NT_SUCCESS(Status)) + goto Cleanup; + RtlInitUnicodeString(&KeyName, UnicodeBuffer); /* Set the value */ @@ -633,7 +647,8 @@ UseSet: REG_LINK, KeyName.Buffer, KeyName.Length); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + goto Cleanup; /* Get the configuration database key */ InitializeObjectAttributes(&ObjectAttributes, @@ -642,18 +657,17 @@ UseSet: KeyHandle, NULL); Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes); - NtClose(KeyHandle); /* Check if we don't have one */ if (!NT_SUCCESS(Status)) { /* Cleanup and exit */ - ConfigHandle = NULL; + Status = STATUS_SUCCESS; goto Cleanup; } /* ReactOS Hack: Hard-code current to 001 for SetupLdr */ - if (!LoaderBlock->RegistryBase) + if (LoaderBlock->RegistryBase == NULL) { HwProfile = 0; } @@ -672,7 +686,11 @@ UseSet: ValueInfo = (PKEY_VALUE_FULL_INFORMATION)ValueInfoBuffer; /* Check if we failed or got a non DWORD-value */ - if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) goto Cleanup; + if (!(NT_SUCCESS(Status)) || (ValueInfo->Type != REG_DWORD)) + { + Status = STATUS_SUCCESS; + goto Cleanup; + } /* Get the hadware profile */ HwProfile = *(PULONG)((PUCHAR)ValueInfo + ValueInfo->DataOffset); @@ -691,7 +709,7 @@ UseSet: if (!NT_SUCCESS(Status)) { /* Exit and clean up */ - ParentHandle = NULL; + Status = STATUS_SUCCESS; goto Cleanup; } @@ -712,7 +730,7 @@ UseSet: if (!NT_SUCCESS (Status)) { /* Cleanup and exit */ - ProfileHandle = 0; + Status = STATUS_SUCCESS; goto Cleanup; } @@ -758,19 +776,20 @@ UseSet: REG_LINK, KeyName.Buffer, KeyName.Length); - NtClose(KeyHandle); } - /* Close every opened handle */ + Status = STATUS_SUCCESS; + Cleanup: + /* Close every opened handle */ + if (SelectHandle) NtClose(SelectHandle); + if (KeyHandle) NtClose(KeyHandle); if (ConfigHandle) NtClose(ConfigHandle); if (ProfileHandle) NtClose(ProfileHandle); if (ParentHandle) NtClose(ParentHandle); DPRINT("CmpCreateControlSet() done\n"); - - /* Return success */ - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -844,15 +863,14 @@ NTAPI INIT_FUNCTION CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + static const UNICODE_STRING HiveName = RTL_CONSTANT_STRING(L"SYSTEM"); PVOID HiveBase; ANSI_STRING LoadString; PVOID Buffer; ULONG Length; NTSTATUS Status; - BOOLEAN Allocate; UNICODE_STRING KeyName; PCMHIVE SystemHive = NULL; - UNICODE_STRING HiveName = RTL_CONSTANT_STRING(L"SYSTEM"); PSECURITY_DESCRIPTOR SecurityDescriptor; PAGED_CODE(); @@ -872,58 +890,44 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) RtlInitEmptyUnicodeString(&CmpLoadOptions, Buffer, (USHORT)Length); /* Add the load options and null-terminate */ - RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); + Status = RtlAnsiStringToUnicodeString(&CmpLoadOptions, &LoadString, FALSE); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + CmpLoadOptions.Buffer[LoadString.Length] = UNICODE_NULL; CmpLoadOptions.Length += sizeof(WCHAR); /* Get the System Hive base address */ HiveBase = LoaderBlock->RegistryBase; - if (HiveBase) - { - /* Import it */ - Status = CmpInitializeHive(&SystemHive, - HINIT_MEMORY, - HIVE_NOLAZYFLUSH, - HFILE_TYPE_LOG, - HiveBase, - NULL, - NULL, - NULL, - &HiveName, - 2); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Set the hive filename */ - RtlCreateUnicodeString(&SystemHive->FileFullPath, - L"\\SystemRoot\\System32\\Config\\SYSTEM"); - - /* We imported, no need to create a new hive */ - Allocate = FALSE; - /* Manually set the hive as volatile, if in LiveCD mode */ - if (CmpShareSystemHives) SystemHive->Hive.HiveFlags = HIVE_VOLATILE; - } - else + Status = CmpInitializeHive(&SystemHive, + HiveBase ? HINIT_MEMORY : HINIT_CREATE, + HIVE_NOLAZYFLUSH, + HFILE_TYPE_LOG, + HiveBase, + NULL, + NULL, + NULL, + &HiveName, + HiveBase ? 2 : 0); + if (!NT_SUCCESS(Status)) { - /* Create it */ - Status = CmpInitializeHive(&SystemHive, - HINIT_CREATE, - HIVE_NOLAZYFLUSH, - HFILE_TYPE_LOG, - NULL, - NULL, - NULL, - NULL, - &HiveName, - 0); - if (!NT_SUCCESS(Status)) return FALSE; + return FALSE; + } - /* Set the hive filename */ - RtlCreateUnicodeString(&SystemHive->FileFullPath, - L"\\SystemRoot\\System32\\Config\\SYSTEM"); + /* Set the hive filename */ + Status = RtlCreateUnicodeString(&SystemHive->FileFullPath, L"\\SystemRoot\\System32\\Config\\SYSTEM"); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } - /* Tell CmpLinkHiveToMaster to allocate a hive */ - Allocate = TRUE; + /* Manually set the hive as volatile, if in Live CD mode */ + if (HiveBase && CmpShareSystemHives) + { + SystemHive->Hive.HiveFlags = HIVE_VOLATILE; } /* Save the boot type */ @@ -949,11 +953,12 @@ CmpInitializeSystemHive(IN PLOADER_PARAMETER_BLOCK LoaderBlock) SecurityDescriptor = CmpHiveRootSecurityDescriptor(); /* Attach it to the system key */ + /* Let CmpLinkHiveToMaster allocate a new hive if we got none from the LoaderBlock. */ RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\SYSTEM"); Status = CmpLinkHiveToMaster(&KeyName, NULL, SystemHive, - Allocate, + !HiveBase, SecurityDescriptor); /* Free the security descriptor */ @@ -1233,6 +1238,7 @@ CmpGetRegistryPath(OUT PWCHAR ConfigPath) return STATUS_SUCCESS; } +_Function_class_(KSTART_ROUTINE) VOID NTAPI CmpLoadHiveThread(IN PVOID StartContext) @@ -1896,11 +1902,21 @@ CmGetSystemDriverList(VOID) /* Get the entry */ DriverEntry = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_LIST_ENTRY, Link); - /* Allocate the path for the caller and duplicate the registry path */ + /* Allocate the path for the caller */ ServicePath[i] = ExAllocatePool(NonPagedPool, sizeof(UNICODE_STRING)); - RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DriverEntry->RegistryPath, - ServicePath[i]); + if (!ServicePath[i]) + { + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 2, 1, 0, 0); + } + + /* Duplicate the registry path */ + Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DriverEntry->RegistryPath, + ServicePath[i]); + if (!NT_SUCCESS(Status)) + { + KeBugCheckEx(CONFIG_INITIALIZATION_FAILED, 2, 1, 0, 0); + } } /* Terminate the list */

1 0

[reactos] 01/01: [USETUP] When opening the target file for dropping readonly mode only use required access. This avoids the open failing on certain file systems where GENERIC_WRITE access would be denied for a readonly file. This is an addendum to 82f44a2.
by Pierre Schweitzer 06 Jan '18

06 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc8ccc6eb88702bfa4716… commit cc8ccc6eb88702bfa471617a1cbb5c9adb349115 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 6 12:11:02 2018 +0100 [USETUP] When opening the target file for dropping readonly mode only use required access. This avoids the open failing on certain file systems where GENERIC_WRITE access would be denied for a readonly file. This is an addendum to 82f44a2. CORE-14158 --- base/setup/usetup/filesup.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 65a372a337..4238557bbe 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -355,9 +355,9 @@ SetupCopyFile( { FILE_BASIC_INFORMATION FileBasicInfo; - /* Reattempt to open it */ + /* Reattempt to open it with limited access */ Status = NtCreateFile(&FileHandleDest, - GENERIC_WRITE | SYNCHRONIZE, + FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, NULL, @@ -369,10 +369,7 @@ SetupCopyFile( FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); - /* Fail for real if we cannot open it that way - * XXX: actually, we should try to refine access rights - * to only have write_attributes, should be enough - */ + /* Fail for real if we cannot open it that way */ if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName);

1 0

[reactos] 01/01: [DRWTSN32] Implement basic crash report functionality
by Mark Jansen 06 Jan '18

06 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=280d7a97758b28d078124… commit 280d7a97758b28d078124f17eb61b5c9d4a30d2d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jan 6 11:47:54 2018 +0100 [DRWTSN32] Implement basic crash report functionality On application crash, drwtsn32 will attach to the application and try to get a dump, consisting of: - List of loaded modules - List of loaded threads - Per thread, a stacktrace - Per thread, a small hexdump from the stack - Per thread, a dump of the most common registers This dump is saved to the desktop, and the user is notified of the dump being dropped there. CORE-14180 #145 --- base/applications/CMakeLists.txt | 1 + base/applications/drwtsn32/CMakeLists.txt | 18 +++ base/applications/drwtsn32/drwtsn32.cpp | 158 +++++++++++++++++++++ base/applications/drwtsn32/drwtsn32.h | 68 +++++++++ base/applications/drwtsn32/main.cpp | 222 ++++++++++++++++++++++++++++++ base/applications/drwtsn32/precomp.h | 28 ++++ base/applications/drwtsn32/stacktrace.cpp | 139 +++++++++++++++++++ base/applications/drwtsn32/sysinfo.cpp | 115 ++++++++++++++++ 8 files changed, 749 insertions(+) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index d25fa3e039..2af017dff5 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -6,6 +6,7 @@ add_subdirectory(charmap) add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) +add_subdirectory(drwtsn32) add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) diff --git a/base/applications/drwtsn32/CMakeLists.txt b/base/applications/drwtsn32/CMakeLists.txt new file mode 100644 index 0000000000..3a7e93f736 --- /dev/null +++ b/base/applications/drwtsn32/CMakeLists.txt @@ -0,0 +1,18 @@ + +PROJECT(drwtsn32) + +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS WITH_STL) + +list(APPEND CPP_SOURCE + drwtsn32.cpp + main.cpp + stacktrace.cpp + sysinfo.cpp + drwtsn32.h + precomp.h) + +add_executable(drwtsn32 ${CPP_SOURCE}) +add_pch(drwtsn32 precomp.h CPP_SOURCE) +set_module_type(drwtsn32 win32gui) +add_importlibs(drwtsn32 dbghelp psapi advapi32 shell32 msvcrt user32 kernel32 ntdll) +add_cd_file(TARGET drwtsn32 DESTINATION reactos/system32 FOR all) diff --git a/base/applications/drwtsn32/drwtsn32.cpp b/base/applications/drwtsn32/drwtsn32.cpp new file mode 100644 index 0000000000..b667dd723c --- /dev/null +++ b/base/applications/drwtsn32/drwtsn32.cpp @@ -0,0 +1,158 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Debug loop + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" +#include <psapi.h> + +#define MS_VC_EXCEPTION_THREAD_NAME 0x406d1388 + +ModuleData::ModuleData(void* addr) +{ + BaseAddress = addr; + Size = 0; + Unloaded = false; +} + +void ModuleData::Update(HANDLE hProcess) +{ + MODULEINFO mi = {0}; + GetModuleInformation(hProcess, (HMODULE)BaseAddress, &mi, sizeof(mi)); + assert(BaseAddress == mi.lpBaseOfDll); + Size = mi.SizeOfImage; + + ModuleName.resize(MAX_PATH); + DWORD dwLen = GetModuleFileNameExA(hProcess, (HMODULE)BaseAddress, &ModuleName[0], ModuleName.size()); + ModuleName.resize(dwLen); +} + + +ThreadData::ThreadData(HANDLE handle) + : Handle(handle) +{ + memset(&Context, 0, sizeof(Context)); +} + +void ThreadData::Update() +{ + Context.ContextFlags = CONTEXT_INTEGER | CONTEXT_CONTROL | CONTEXT_DEBUG_REGISTERS; + GetThreadContext(Handle, &Context); +} + +DumpData::DumpData() + :ProcessID(0) + ,ThreadID(0) + ,ProcessHandle(NULL) + ,Event(NULL) + ,FirstBPHit(false) +{ + memset(&ExceptionInfo, 0, sizeof(ExceptionInfo)); +} + + +bool UpdateFromEvent(DEBUG_EVENT& evt, DumpData& data) +{ + switch(evt.dwDebugEventCode) + { + case CREATE_PROCESS_DEBUG_EVENT: + { + data.ProcessPath.resize(MAX_PATH); + DWORD len = GetModuleFileNameExA(evt.u.CreateProcessInfo.hProcess, NULL, &data.ProcessPath[0], data.ProcessPath.size()); + if (len) + { + data.ProcessPath.resize(len); + std::string::size_type pos = data.ProcessPath.find_last_of("\\/"); + if (pos != std::string::npos) + data.ProcessName = data.ProcessPath.substr(pos+1); + } + else + { + data.ProcessPath = "??"; + } + if (data.ProcessName.empty()) + data.ProcessName = data.ProcessPath; + + CloseHandle(evt.u.CreateProcessInfo.hFile); + data.ProcessID = evt.dwProcessId; + data.ProcessHandle = evt.u.CreateProcessInfo.hProcess; + data.Threads[evt.dwThreadId] = ThreadData(evt.u.CreateProcessInfo.hThread); + } + break; + case CREATE_THREAD_DEBUG_EVENT: + data.Threads[evt.dwThreadId] = ThreadData(evt.u.CreateThread.hThread); + break; + case EXIT_THREAD_DEBUG_EVENT: + { + ThreadMap::iterator it = data.Threads.find(evt.dwThreadId); + if (it != data.Threads.end()) + { + data.Threads.erase(it); + } + } + break; + case LOAD_DLL_DEBUG_EVENT: + CloseHandle(evt.u.LoadDll.hFile); + for (size_t n = 0; n < data.Modules.size(); ++n) + { + if (data.Modules[n].BaseAddress == evt.u.LoadDll.lpBaseOfDll) + { + data.Modules[n].Unloaded = false; + return true; + } + } + data.Modules.push_back(ModuleData(evt.u.LoadDll.lpBaseOfDll)); + break; + case UNLOAD_DLL_DEBUG_EVENT: + for (size_t n = 0; n < data.Modules.size(); ++n) + { + if (data.Modules[n].BaseAddress == evt.u.UnloadDll.lpBaseOfDll) + data.Modules[n].Unloaded = true; + } + break; + case OUTPUT_DEBUG_STRING_EVENT: // ignore + break; + case EXCEPTION_DEBUG_EVENT: + if (evt.u.Exception.dwFirstChance) + { + switch(evt.u.Exception.ExceptionRecord.ExceptionCode) + { + case EXCEPTION_BREAKPOINT: + if (!data.FirstBPHit) + { + data.FirstBPHit = true; + + if (data.Event) + { + SetEvent(data.Event); + CloseHandle(data.Event); + data.Event = NULL; + } + return true; + } + break; + case MS_VC_EXCEPTION_THREAD_NAME: + /* Thread name */ + return true; + case DBG_CONTROL_C: + case DBG_CONTROL_BREAK: + return true; + } + } + data.ExceptionInfo = evt.u.Exception; + data.ThreadID = evt.dwThreadId; + return false; + case EXIT_PROCESS_DEBUG_EVENT: + //assert(FALSE); + return false; + case RIP_EVENT: + //assert(FALSE); + return false; + default: + assert(false); + } + return true; +} + diff --git a/base/applications/drwtsn32/drwtsn32.h b/base/applications/drwtsn32/drwtsn32.h new file mode 100644 index 0000000000..4d161ffe2a --- /dev/null +++ b/base/applications/drwtsn32/drwtsn32.h @@ -0,0 +1,68 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Project header + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#pragma once + + +struct ModuleData +{ + std::string ModuleName; + void *BaseAddress; + DWORD Size; + bool Unloaded; + + + ModuleData(void* addr); + void Update(HANDLE hProcess); +}; + +struct ThreadData +{ + HANDLE Handle; + CONTEXT Context; + + ThreadData(HANDLE handle = NULL); + + void Update(); +}; + +typedef std::vector<ModuleData> ModuleList; +typedef std::map<DWORD, ThreadData> ThreadMap; + +class DumpData +{ +public: + std::string ProcessPath; + std::string ProcessName; + DWORD ProcessID; + DWORD ThreadID; + HANDLE ProcessHandle; + ModuleList Modules; + ThreadMap Threads; + EXCEPTION_DEBUG_INFO ExceptionInfo; + HANDLE Event; + bool FirstBPHit; + + DumpData(); +}; + +#define NEWLINE "\r\n" + +/* main.cpp */ +void xfprintf(FILE* stream, const char *fmt, ...); + +/* drwtsn32.cpp */ +bool UpdateFromEvent(DEBUG_EVENT& evt, DumpData& data); + +/* sysinfo.cpp */ +void PrintSystemInfo(FILE* output, DumpData& data); + +/* stacktrace.cpp */ +void BeginStackBacktrace(DumpData& data); +void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread); +void EndStackBacktrace(DumpData& data); + diff --git a/base/applications/drwtsn32/main.cpp b/base/applications/drwtsn32/main.cpp new file mode 100644 index 0000000000..2ac1e057e1 --- /dev/null +++ b/base/applications/drwtsn32/main.cpp @@ -0,0 +1,222 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Entrypoint / main print function + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" +#include <winuser.h> +#include <algorithm> +#include <shlobj.h> +#include <strsafe.h> +#include <tlhelp32.h> +#include <conio.h> + + +static const char szUsage[] = "Usage: DrWtsn32 [-i] [-g] [-p dddd] [-e dddd] [-?]\n" + " -i: Install DrWtsn32 as the postmortem debugger\n" + " -g: Ignored, Provided for compatibility with WinDbg and CDB.\n" + " -p dddd: Attach to process dddd.\n" + " -e dddd: Signal the event dddd.\n" + " -?: This help.\n"; + +extern "C" +NTSYSAPI ULONG NTAPI vDbgPrintEx(_In_ ULONG ComponentId, _In_ ULONG Level, _In_z_ PCCH Format, _In_ va_list ap); +#define DPFLTR_ERROR_LEVEL 0 + +void xfprintf(FILE* stream, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stream, fmt, ap); + vDbgPrintEx(-1, DPFLTR_ERROR_LEVEL, fmt, ap); +} + + + +static bool SortModules(const ModuleData& left, const ModuleData& right) +{ + return left.BaseAddress < right.BaseAddress; +} + + +void PrintBugreport(FILE* output, DumpData& data) +{ + PrintSystemInfo(output, data); + xfprintf(output, NEWLINE "*----> Task List <----*" NEWLINE NEWLINE); + HANDLE hSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + if (hSnap != INVALID_HANDLE_VALUE) + { + PROCESSENTRY32 pe; + pe.dwSize = sizeof(pe); + if (Process32First(hSnap, &pe)) + { + do + { + xfprintf(output, "%5d: %s" NEWLINE, pe.th32ProcessID, pe.szExeFile); + } while (Process32Next(hSnap, &pe)); + } + CloseHandle(hSnap); + } + + xfprintf(output, NEWLINE "*----> Module List <----*" NEWLINE NEWLINE); + std::sort(data.Modules.begin(), data.Modules.end(), SortModules); + + ModuleData mainModule(NULL); + mainModule.Update(data.ProcessHandle); + xfprintf(output, "(%p - %p) %s" NEWLINE, + mainModule.BaseAddress, + (PBYTE)mainModule.BaseAddress + mainModule.Size, + data.ProcessPath.c_str()); + + for (size_t n = 0; n < data.Modules.size(); ++n) + { + ModuleData& mod = data.Modules[n]; + if (!mod.Unloaded) + { + mod.Update(data.ProcessHandle); + xfprintf(output, "(%p - %p) %s" NEWLINE, + mod.BaseAddress, + (PBYTE)mod.BaseAddress + mod.Size, + mod.ModuleName.c_str()); + } + } + + BeginStackBacktrace(data); + for (ThreadMap::iterator it = data.Threads.begin(); it != data.Threads.end(); ++it) + { + it->second.Update(); + + xfprintf(output, NEWLINE "State Dump for Thread Id 0x%x" NEWLINE NEWLINE, it->first); + const CONTEXT& ctx = it->second.Context; + if (ctx.ContextFlags & CONTEXT_INTEGER) + xfprintf(output, "eax:%p ebx:%p ecx:%p edx:%p esi:%p edi:%p" NEWLINE, + ctx.Eax, ctx.Ebx, ctx.Ecx, ctx.Edx, ctx.Esi, ctx.Edi); + if (ctx.ContextFlags & CONTEXT_CONTROL) + xfprintf(output, "eip:%p esp:%p ebp:%p" NEWLINE, + ctx.Eip, ctx.Esp, ctx.Ebp); + if (ctx.ContextFlags & CONTEXT_DEBUG_REGISTERS) + xfprintf(output, "dr0:%p dr1:%p dr2:%p dr3:%p dr6:%p dr7:%p" NEWLINE, + ctx.Dr0, ctx.Dr1, ctx.Dr2, ctx.Dr3, ctx.Dr6, ctx.Dr7); + + PrintStackBacktrace(output, data, it->second); + } + EndStackBacktrace(data); +} + + +int abort(FILE* output, int err) +{ + if (output != stdout) + fclose(output); + else + _getch(); + + return err; +} + +int main(int argc, char* argv[]) +{ + DWORD pid = 0; + char Buffer[MAX_PATH+55]; + char Filename[50]; + FILE* output = NULL; + SYSTEMTIME st; + DumpData data; + + + for (int n = 0; n < argc; ++n) + { + char* arg = argv[n]; + + if (!strcmp(arg, "-i")) + { + /* FIXME: Installs as the postmortem debugger. */ + } + else if (!strcmp(arg, "-g")) + { + } + else if (!strcmp(arg, "-p")) + { + if (n + 1 < argc) + { + pid = strtoul(argv[n+1], NULL, 10); + n++; + } + } + else if (!strcmp(arg, "-e")) + { + if (n + 1 < argc) + { + data.Event = (HANDLE)strtoul(argv[n+1], NULL, 10); + n++; + } + } + else if (!strcmp(arg, "-?")) + { + MessageBoxA(NULL, szUsage, "DrWtsn32", MB_OK); + return abort(output, 0); + } + else if (!strcmp(arg, "/?")) + { + xfprintf(stdout, "%s\n", szUsage); + return abort(stdout, 0); + } + } + + if (!pid) + { + MessageBoxA(NULL, szUsage, "DrWtsn32", MB_OK); + return abort(stdout, 0); + } + + GetLocalTime(&st); + + if (SHGetFolderPathA(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, Buffer) == S_OK && + SUCCEEDED(StringCchPrintfA(Filename, _countof(Filename), "Appcrash_%d-%02d-%02d_%02d-%02d-%02d.txt", + st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond))) + { + StringCchCatA(Buffer, _countof(Buffer), "\\"); + StringCchCatA(Buffer, _countof(Buffer), Filename); + output = fopen(Buffer, "wb"); + } + if (!output) + output = stdout; + + + if (!DebugActiveProcess(pid)) + return abort(output, -2); + + /* We should not kill it? */ + DebugSetProcessKillOnExit(FALSE); + + DEBUG_EVENT evt; + if (!WaitForDebugEvent(&evt, 30000)) + return abort(output, -3); + + assert(evt.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT); + + while (UpdateFromEvent(evt, data)) + { + ContinueDebugEvent(evt.dwProcessId, evt.dwThreadId, DBG_CONTINUE); + + if (!WaitForDebugEvent(&evt, 30000)) + return abort(output, -4); + } + + PrintBugreport(output, data); + + TerminateProcess(data.ProcessHandle, data.ExceptionInfo.ExceptionRecord.ExceptionCode); + + std::string Message = "The application '"; + Message += data.ProcessName; + Message += "' has just crashed :(\n"; + Message += "Information about this crash is saved to:\n"; + Message += Filename; + Message += "\nThis file is stored on your desktop."; + MessageBoxA(NULL, Message.c_str(), "Sorry!", MB_OK); + + return abort(output, 0); +} diff --git a/base/applications/drwtsn32/precomp.h b/base/applications/drwtsn32/precomp.h new file mode 100644 index 0000000000..8e456c79a7 --- /dev/null +++ b/base/applications/drwtsn32/precomp.h @@ -0,0 +1,28 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Precompiled Header + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#ifndef _DRWTSN32_PRECOMP_H_ +#define _DRWTSN32_PRECOMP_H_ + +#include <ntstatus.h> +#define WIN32_NO_STATUS + +#include <windef.h> +#include <winbase.h> +#include <winver.h> + +#include <string> +#include <vector> +#include <map> +#include <stdio.h> +#include <assert.h> + +#include "drwtsn32.h" + +typedef LONG NTSTATUS; + +#endif // _DRWTSN32_PRECOMP_H_ diff --git a/base/applications/drwtsn32/stacktrace.cpp b/base/applications/drwtsn32/stacktrace.cpp new file mode 100644 index 0000000000..a867150ca4 --- /dev/null +++ b/base/applications/drwtsn32/stacktrace.cpp @@ -0,0 +1,139 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Print a stacktrace + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" +#include <dbghelp.h> + + +void BeginStackBacktrace(DumpData& data) +{ + DWORD symOptions = SymGetOptions(); + symOptions |= SYMOPT_UNDNAME | SYMOPT_AUTO_PUBLICS | SYMOPT_DEFERRED_LOADS; + SymSetOptions(symOptions); + SymInitialize(data.ProcessHandle, NULL, TRUE); +} + +void EndStackBacktrace(DumpData& data) +{ + SymCleanup(data.ProcessHandle); +} + +static char ToChar(UCHAR data) +{ + if (data < 0xa) + return '0' + data; + else if (data <= 0xf) + return 'a' + data - 0xa; + return '?'; +} + +void PrintStackBacktrace(FILE* output, DumpData& data, ThreadData& thread) +{ + DWORD MachineType; + STACKFRAME64 StackFrame = { { 0 } }; + +#ifdef _M_X64 + MachineType = IMAGE_FILE_MACHINE_AMD64; + StackFrame.AddrPC.Offset = thread.Context.Rip; + StackFrame.AddrPC.Mode = AddrModeFlat; + StackFrame.AddrStack.Offset = thread.Context.Rsp; + StackFrame.AddrStack.Mode = AddrModeFlat; + StackFrame.AddrFrame.Offset = thread.Context.Rbp; + StackFrame.AddrFrame.Mode = AddrModeFlat; +#else + MachineType = IMAGE_FILE_MACHINE_I386; + StackFrame.AddrPC.Offset = thread.Context.Eip; + StackFrame.AddrPC.Mode = AddrModeFlat; + StackFrame.AddrStack.Offset = thread.Context.Esp; + StackFrame.AddrStack.Mode = AddrModeFlat; + StackFrame.AddrFrame.Offset = thread.Context.Ebp; + StackFrame.AddrFrame.Mode = AddrModeFlat; +#endif + + +#define STACKWALK_MAX_NAMELEN 512 + char buf[sizeof(SYMBOL_INFO) + STACKWALK_MAX_NAMELEN] = {0}; + SYMBOL_INFO* sym = (SYMBOL_INFO *)buf; + IMAGEHLP_MODULE64 Module = { 0 }; + sym->SizeOfStruct = sizeof(sym); + + /* FIXME: Disasm function! */ + + xfprintf(output, NEWLINE "*----> Stack Back Trace <----*" NEWLINE NEWLINE); + bool first = true; + ULONG_PTR LastFrame = StackFrame.AddrFrame.Offset - 8; + while(StackWalk64(MachineType, data.ProcessHandle, thread.Handle, &StackFrame, &thread.Context, + NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL)) + { + if (!StackFrame.AddrPC.Offset) + break; + + if (LastFrame >= StackFrame.AddrFrame.Offset) + break; + + LastFrame = StackFrame.AddrFrame.Offset; + + if (first) + { + xfprintf(output, "FramePtr ReturnAd Param#1 Param#2 Param#3 Param#4 Function Name" NEWLINE); + first = false; + } + + Module.SizeOfStruct = sizeof(Module); + DWORD64 ModBase = SymGetModuleBase64(data.ProcessHandle, StackFrame.AddrPC.Offset); + if (!SymGetModuleInfo64(data.ProcessHandle, ModBase, &Module)) + strcpy(Module.ModuleName, "<nomod>"); + + memset(sym, '\0', sizeof(*sym) + STACKWALK_MAX_NAMELEN); + sym->SizeOfStruct = sizeof(*sym); + sym->MaxNameLen = STACKWALK_MAX_NAMELEN; + DWORD64 displacement; + + if (!SymFromAddr(data.ProcessHandle, StackFrame.AddrPC.Offset, &displacement, sym)) + strcpy(sym->Name, "<nosymbols>"); + + xfprintf(output, "%p %p %p %p %p %p %s!%s" NEWLINE, + (ULONG_PTR)StackFrame.AddrFrame.Offset, (ULONG_PTR)StackFrame.AddrPC.Offset, + (ULONG_PTR)StackFrame.Params[0], (ULONG_PTR)StackFrame.Params[1], + (ULONG_PTR)StackFrame.Params[2], (ULONG_PTR)StackFrame.Params[3], + Module.ModuleName, sym->Name); + } + + UCHAR stackData[0x10 * 10]; + DWORD dwSizeRead; + if (!ReadProcessMemory(data.ProcessHandle, (LPCVOID)thread.Context.Esp, stackData, sizeof(stackData), &dwSizeRead)) + return; + + xfprintf(output, NEWLINE "*----> Raw Stack Dump <----*" NEWLINE NEWLINE); + for (size_t n = 0; n < sizeof(stackData); n += 0x10) + { + char HexData1[] = "?? ?? ?? ?? ?? ?? ?? ??"; + char HexData2[] = "?? ?? ?? ?? ?? ?? ?? ??"; + char AsciiData1[] = "????????"; + char AsciiData2[] = "????????"; + + for (size_t j = 0; j < 8; ++j) + { + size_t idx = j + n; + if (idx < dwSizeRead) + { + HexData1[j * 3] = ToChar(stackData[idx] >> 4); + HexData1[j * 3 + 1] = ToChar(stackData[idx] & 0xf); + AsciiData1[j] = isprint(stackData[idx]) ? stackData[idx] : '.'; + } + idx += 8; + if (idx < dwSizeRead) + { + HexData2[j * 3] = ToChar(stackData[idx] >> 4); + HexData2[j * 3 + 1] = ToChar(stackData[idx] & 0xf); + AsciiData2[j] = isprint(stackData[idx]) ? stackData[idx] : '.'; + } + } + + xfprintf(output, "%p %s - %s %s%s" NEWLINE, thread.Context.Esp+n, HexData1, HexData2, AsciiData1, AsciiData2); + } +} diff --git a/base/applications/drwtsn32/sysinfo.cpp b/base/applications/drwtsn32/sysinfo.cpp new file mode 100644 index 0000000000..7cad0cab5a --- /dev/null +++ b/base/applications/drwtsn32/sysinfo.cpp @@ -0,0 +1,115 @@ +/* + * PROJECT: Dr. Watson crash reporter + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Output system info + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" +#include <winreg.h> +#include <reactos/buildno.h> + +static const char* Exception2Str(DWORD code) +{ + switch (code) + { + case EXCEPTION_ACCESS_VIOLATION: return "EXCEPTION_ACCESS_VIOLATION"; + case EXCEPTION_DATATYPE_MISALIGNMENT: return "EXCEPTION_DATATYPE_MISALIGNMENT"; + case EXCEPTION_BREAKPOINT: return "EXCEPTION_BREAKPOINT"; + case EXCEPTION_SINGLE_STEP: return "EXCEPTION_SINGLE_STEP"; + case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: return "EXCEPTION_ARRAY_BOUNDS_EXCEEDED"; + case EXCEPTION_FLT_DENORMAL_OPERAND: return "EXCEPTION_FLT_DENORMAL_OPERAND"; + case EXCEPTION_FLT_DIVIDE_BY_ZERO: return "EXCEPTION_FLT_DIVIDE_BY_ZERO"; + case EXCEPTION_FLT_INEXACT_RESULT: return "EXCEPTION_FLT_INEXACT_RESULT"; + case EXCEPTION_FLT_INVALID_OPERATION: return "EXCEPTION_FLT_INVALID_OPERATION"; + case EXCEPTION_FLT_OVERFLOW: return "EXCEPTION_FLT_OVERFLOW"; + case EXCEPTION_FLT_STACK_CHECK: return "EXCEPTION_FLT_STACK_CHECK"; + case EXCEPTION_FLT_UNDERFLOW: return "EXCEPTION_FLT_UNDERFLOW"; + case EXCEPTION_INT_DIVIDE_BY_ZERO: return "EXCEPTION_INT_DIVIDE_BY_ZERO"; + case EXCEPTION_INT_OVERFLOW: return "EXCEPTION_INT_OVERFLOW"; + case EXCEPTION_PRIV_INSTRUCTION: return "EXCEPTION_PRIV_INSTRUCTION"; + case EXCEPTION_IN_PAGE_ERROR: return "EXCEPTION_IN_PAGE_ERROR"; + case EXCEPTION_ILLEGAL_INSTRUCTION: return "EXCEPTION_ILLEGAL_INSTRUCTION"; + case EXCEPTION_NONCONTINUABLE_EXCEPTION: return "EXCEPTION_NONCONTINUABLE_EXCEPTION"; + case EXCEPTION_STACK_OVERFLOW: return "EXCEPTION_STACK_OVERFLOW"; + case EXCEPTION_INVALID_DISPOSITION: return "EXCEPTION_INVALID_DISPOSITION"; + case EXCEPTION_GUARD_PAGE: return "EXCEPTION_GUARD_PAGE"; + case EXCEPTION_INVALID_HANDLE: return "EXCEPTION_INVALID_HANDLE"; + } + + return "--"; +} + +static void ReadKey(HKEY hKey, const char* ValueName, char* Buffer, DWORD size) +{ + DWORD dwType; + LSTATUS ret = RegQueryValueExA(hKey, ValueName, NULL, &dwType, (LPBYTE)Buffer, &size); + if (ret != ERROR_SUCCESS || dwType != REG_SZ) + Buffer[0] = '\0'; +} + +void PrintSystemInfo(FILE* output, DumpData& data) +{ + SYSTEMTIME LocalTime; + GetLocalTime(&LocalTime); + xfprintf(output, NEWLINE "ReactOS " KERNEL_VERSION_STR " DrWtsn32" NEWLINE NEWLINE); + xfprintf(output, "Application exception occurred:" NEWLINE); + xfprintf(output, " App: %s (pid=%d, tid=0x%x)" NEWLINE, data.ProcessName.c_str(), data.ProcessID, data.ThreadID); + xfprintf(output, " When: %d/%d/%d @ %02d:%02d:%02d.%d" NEWLINE, + LocalTime.wDay, LocalTime.wMonth, LocalTime.wYear, + LocalTime.wHour, LocalTime.wMinute, LocalTime.wSecond, LocalTime.wMilliseconds); + DWORD ExceptionCode = data.ExceptionInfo.ExceptionRecord.ExceptionCode; + xfprintf(output, " Exception number: 0x%8x (%s)" NEWLINE, ExceptionCode, Exception2Str(ExceptionCode)); + + char Buffer[MAX_PATH]; + DWORD count = sizeof(Buffer); + xfprintf(output, NEWLINE "*----> System Information <----*" NEWLINE NEWLINE); + if (GetComputerNameA(Buffer, &count)) + xfprintf(output, " Computer Name: %s" NEWLINE, Buffer); + count = sizeof(Buffer); + if (GetUserNameA(Buffer, &count)) + xfprintf(output, " User Name: %s" NEWLINE, Buffer); + + + SYSTEM_INFO info; + GetSystemInfo(&info); + xfprintf(output, " Number of Processors: %d" NEWLINE, info.dwNumberOfProcessors); + + HKEY hKey; + LONG ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", + 0, KEY_READ, &hKey); + if (ret == ERROR_SUCCESS) + { + DWORD dwType; + count = sizeof(Buffer); + ret = RegQueryValueExA(hKey, "Identifier", NULL, &dwType, (LPBYTE)Buffer, &count); + if (ret == ERROR_SUCCESS && dwType == REG_SZ) + { + Buffer[count] = '\0'; + xfprintf(output, " Processor Type: %s" NEWLINE, Buffer); + } + RegCloseKey(hKey); + } + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKey); + if (ret == ERROR_SUCCESS) + { + char Version[50]; + ReadKey(hKey, "ProductName", Buffer, sizeof(Buffer)); + ReadKey(hKey, "CurrentVersion", Version, sizeof(Version)); + xfprintf(output, " %s Version: %s" NEWLINE, Buffer, Version); + ReadKey(hKey, "BuildLab", Buffer, sizeof(Buffer)); + xfprintf(output, " BuildLab: %s" NEWLINE, Buffer); + ReadKey(hKey, "CSDVersion", Buffer, sizeof(Buffer)); + if (Buffer[0]) + xfprintf(output, " Service Pack: %s" NEWLINE, Buffer); + ReadKey(hKey, "CurrentType", Buffer, sizeof(Buffer)); + xfprintf(output, " Current Type: %s" NEWLINE, Buffer); + ReadKey(hKey, "RegisteredOrganization", Buffer, sizeof(Buffer)); + xfprintf(output, " Registered Organization: %s" NEWLINE, Buffer); + ReadKey(hKey, "RegisteredOwner", Buffer, sizeof(Buffer)); + xfprintf(output, " Registered Owner: %s" NEWLINE, Buffer); + + RegCloseKey(hKey); + } +}

1 0

[reactos] 01/01: [TRANSLATION] Improve Simplified Chinese Translations (#265)
by Luo Yufan 05 Jan '18

05 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59aa6b9e741ea216612bf… commit 59aa6b9e741ea216612bfd001ae6f5c4cc21b131 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Fri Jan 5 21:15:03 2018 +0800 [TRANSLATION] Improve Simplified Chinese Translations (#265) * Update Simplified Chinese translation of SYSSETUP * Update Simplified Chinese translations and font settings. * Update Translation of SHELL32. --- dll/cpl/appwiz/lang/zh-CN.rc | 34 +++-- dll/cpl/desk/lang/zh-CN.rc | 3 +- dll/cpl/intl/lang/zh-CN.rc | 16 +- dll/cpl/joy/lang/zh-CN.rc | 8 +- dll/cpl/sysdm/lang/zh-CN.rc | 29 ++-- dll/cpl/timedate/lang/zh-CN.rc | 8 +- dll/cpl/usrmgr/lang/zh-CN.rc | 22 +-- dll/cpl/wined3dcfg/lang/zh-CN.rc | 2 +- dll/win32/setupapi/lang/zh-CN.rc | 25 ++-- dll/win32/shell32/lang/zh-CN.rc | 12 +- dll/win32/syssetup/lang/zh-CN.rc | 70 ++++----- dll/win32/tapiui/lang/zh-CN.rc | 314 +++++++++++++++++++-------------------- 12 files changed, 275 insertions(+), 268 deletions(-) diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 47f22f320d..9a07ba1ecb 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -2,15 +2,17 @@ * Simplified Chinese resource for appwiz (dll/cpl/appwiz/lang/zh-CN.rc) * * TRANSLATOR: Jingjing Fu (jingjingf AT 188.com) + * Luo Yufan (njlyf2011(a)hotmail.com) * CREATED: 2009-04-25 + * UPDATED: 2018-01-05 */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_FIRSTPAGE DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建连接" -FONT 9, "新細明體", 0, 0, 0x0 +CAPTION "创建快捷方式" +FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "Text1", -1, 115, 15, 160, 24 LTEXT "Text2", -1, 115, 35, 160, 17 @@ -18,8 +20,8 @@ END IDD_SUBMIT_REPORT DIALOGEX 0, 0, 380, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建连接" -FONT 9, "新細明體", 0, 0, 0x0 +CAPTION "创建快捷方式" +FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "Text1",-1,10,0,225,40 LTEXT "Text2",-1,10,40,120,20 @@ -28,11 +30,11 @@ END IDD_SHORTCUT_LOCATION DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "新建快捷方式" -FONT 9, "新細明體", 0, 0, 0x0 +CAPTION "创建快捷方式" +FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "此向导帮助您创建本地或网络程序、文件、目录、计算机或Internet地址的快捷方式。", -1, 120, 15, 200, 30 - LTEXT "输入项目位置：", -1, 120, 50, 120, 10 + LTEXT "此向导帮助您创建本地或网络程序、文件、目录、计算机或 Internet 地址的快捷方式。", -1, 120, 15, 200, 30 + LTEXT "请输入项目位置：", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "浏览...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "点击“下一步”继续。", -1, 120, 97, 162, 10 @@ -41,7 +43,7 @@ END IDD_SHORTCUT_FINISH DIALOGEX 0, 0, 340, 200 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "选择程序标题" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "输入快捷方式名称(&T)：", -1, 120, 15, 150, 10 EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT @@ -51,7 +53,7 @@ END IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "删除快捷方式/文件夹" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "从「开始」菜单中删除项目，选择项目并单击删除。(&T)", -1, 10, 10, 192, 16 CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | @@ -63,9 +65,9 @@ END ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko 安装包" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN - CONTROL "ReactOS找不到这嵌入 HTML 的应用程序正常工作所需的Wine Gecko包。 ReactOS 可以自动下载，并为您安装。", + CONTROL "ReactOS 无法找到使内嵌 HTML 的应用程序正常工作的 Wine Gecko 包。ReactOS 能为您自动下载并安装。", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "安装(&I)", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -76,13 +78,13 @@ STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "添加/删除程序" IDS_CPLSYSTEMDESCRIPTION "设置程序和快捷方式" - IDS_CREATE_SHORTCUT "建立快捷方式" + IDS_CREATE_SHORTCUT "创建快捷方式" IDS_ERROR_NOT_FOUND "找不到文件 %s" END STRINGTABLE BEGIN - IDS_DOWNLOADING "下载中..." - IDS_INSTALLING "安装中..." - IDS_INVALID_SHA "意外的下载了的文件的校验和。中止安装已损坏的文件。" + IDS_DOWNLOADING "正在下载..." + IDS_INSTALLING "正在安装..." + IDS_INVALID_SHA "下载的文件校验和错误。中止安装已损坏的文件。" END diff --git a/dll/cpl/desk/lang/zh-CN.rc b/dll/cpl/desk/lang/zh-CN.rc index e01fa875bb..15c121b48d 100644 --- a/dll/cpl/desk/lang/zh-CN.rc +++ b/dll/cpl/desk/lang/zh-CN.rc @@ -3,6 +3,7 @@ * (简体中文资源) * by zhangbing 2008 <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> * Updated: 2009-04-26 Jingjing Fu <jingjingf AT 188.com> + * 2018-01-05 Luo Yufan <njlyf2011(a)hotmail.com> */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -272,5 +273,5 @@ BEGIN IDS_DISPLAY_SETTINGS "显示设置" IDS_APPLY_FAILED "应用新设置失败..." IDS_APPLY_NEEDS_RESTART "需要重新启动计算机使更改生效。" - IDS_TIMEOUTTEXT "Revert to previous settings in %d seconds." + IDS_TIMEOUTTEXT "%d 秒内恢复" END diff --git a/dll/cpl/intl/lang/zh-CN.rc b/dll/cpl/intl/lang/zh-CN.rc index 27acc6d1ba..2cb05a1c0f 100644 --- a/dll/cpl/intl/lang/zh-CN.rc +++ b/dll/cpl/intl/lang/zh-CN.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "区域选项" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "标准和格式", -1, 5, 5, 234, 162 LTEXT "这个选项影响到某些程序如何格式化数字、货币、时间和日期。", -1, 14, 17, 220, 25 @@ -31,7 +31,7 @@ END IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "语言" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "文字服务和输入语言", -1, 5, 5, 234, 52 LTEXT "要查看用来输入文字的语言和方法，请单击“详细信息”。", -1, 12, 15, 220, 18 @@ -45,7 +45,7 @@ END IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "高级" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "非 Unicode 程序的语言", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT @@ -60,7 +60,7 @@ END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "数字" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "示例", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE LTEXT "正:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -90,7 +90,7 @@ END IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "货币" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "示例", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "正:", -1, 13, 21, 31, 10, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -116,7 +116,7 @@ END IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "时间" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "示例", -1, 7, 7, 230, 33, WS_CHILD | WS_VISIBLE LTEXT "时间示例:", -1, 13, 21, 54, 10, WS_CHILD | WS_VISIBLE | WS_GROUP @@ -141,7 +141,7 @@ END IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "日期" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "日历", -1, 7, 7, 230, 74 LTEXT "当键入的年份是两位数字时，将其显示为在这些年之间(&Y):", -1, 13, 18, 215, 8 @@ -174,7 +174,7 @@ END IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "排序" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "排序", -1, 7, 7, 230, 74 LTEXT "排序方法改变程序排序字符、字词、文件和文件夹的方式。", -1, 14, 17, 220, 25 diff --git a/dll/cpl/joy/lang/zh-CN.rc b/dll/cpl/joy/lang/zh-CN.rc index 80ee7d8edf..56b0266f9c 100644 --- a/dll/cpl/joy/lang/zh-CN.rc +++ b/dll/cpl/joy/lang/zh-CN.rc @@ -10,7 +10,7 @@ IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "游戏控制器" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 LTEXT "这些设置帮助您配置安装在计算机上的游戏控制器。", -1, 33, 7, 214, 20, NOT WS_GROUP @@ -28,7 +28,7 @@ IDD_ADD DIALOGEX 0, 0, 265, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "添加游戏控制器" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 LTEXT "请在下面列表中选择游戏控制器并单击“确定”。如果您的游戏控制器不在列表中，单击“自定义”。", -1, 35, 7, 210, 33 @@ -47,7 +47,7 @@ IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "自定义游戏控制器" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "特殊特性", -1, 7, 7, 245, 52 AUTORADIOBUTTON "游戏杆(&J)", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 @@ -71,7 +71,7 @@ IDD_ADVANCED DIALOGEX 0, 0, 220, 86 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP CAPTION "高级设置" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 DEFPUSHBUTTON "确定", IDOK, 106, 65, 50, 14 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 88275096af..c4bb5e7f58 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -1,11 +1,12 @@ /* Simplified Chinese translation by Jingjing Fu (jingjingf AT 188.com) 2009-05-02 */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "系统:", IDC_STATIC, 4, 132, 32, 9 @@ -26,7 +27,7 @@ END IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "硬件" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN GROUPBOX "设备管理器", IDC_STATIC, 6, 7, 244, 61 ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON @@ -45,7 +46,7 @@ END IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "高级" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "要进行大多数改动，您必须作为管理员登录。", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "性能", IDC_STATIC, 6, 18, 244, 50 @@ -65,7 +66,7 @@ END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "系统设置" -FONT 9, "新細明體", 0, 0, 0x1 +FONT 9, "宋体", 0, 0, 0x1 BEGIN GROUPBOX "版本信息", IDC_STATIC, 6, 3, 210, 73 CONTROL "报告为工作站(&R)", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 @@ -76,7 +77,7 @@ END IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "硬件配置文件" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON LTEXT "可以为不同的硬件配置创建硬件配置文件。在启动时，可以选择希望使用的配置文件。", IDC_STATIC, 46, 11, 188, 25 @@ -103,7 +104,7 @@ END IDD_HARDWAREPROFILE DIALOGEX 0, 0, 212, 188 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "常规" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN ICON IDI_HARDPROF, IDC_STATIC, 10, 10, 18, 20, SS_ICON LTEXT "", IDC_HWPPROP_PROFILE, 48, 16, 150, 8 @@ -123,7 +124,7 @@ END IDD_COPYPROFILE DIALOGEX 12, 26, 256, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "复制配置文件" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN LTEXT "从:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_COPYPROFILEFROM, 30, 10, 160, 10 @@ -136,7 +137,7 @@ END IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "重命名配置文件" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN LTEXT "从:", IDC_STATIC, 5, 10, 20, 8 LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 @@ -149,7 +150,7 @@ END IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "用户配置文件" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON LTEXT "用户配置文件保存桌面设置和其他与您的用户帐户有关的信息。可在您使用的每台计算机上创建不同的配置文件，或选定一个漫游配置文件用在您使用的每台计算机上。", IDC_STATIC, 40, 11, 211, 35 @@ -168,7 +169,7 @@ END IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "启动和故障恢复" -FONT 9, "新細明體" +FONT 9, "宋体" BEGIN GROUPBOX "系统启动", IDC_STATIC, 7, 12, 238, 95 LTEXT "默认操作系统(&S):", IDC_STATIC, 14, 26, 100, 8 @@ -201,7 +202,7 @@ END IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "虚拟内存" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "驱动器 [卷标]", IDC_STATIC, 12, 5, 96, 9 LTEXT "页面文件大小(MB)", IDC_STATIC, 115, 5, 96, 9 @@ -233,7 +234,7 @@ END IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "环境变量" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN GROUPBOX "用户变量", IDC_STATIC, 7, 12, 238, 100 CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | @@ -254,7 +255,7 @@ END IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "编辑变量" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "变量名称(&N):", IDC_STATIC, 7, 14, 68, 8 EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL @@ -266,7 +267,7 @@ END IDD_LICENCE DIALOGEX 6, 5, 267, 159 CAPTION "协议" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 STYLE DS_SHELLFONT | WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU BEGIN EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE diff --git a/dll/cpl/timedate/lang/zh-CN.rc b/dll/cpl/timedate/lang/zh-CN.rc index 8098cbd1fc..bd6567314e 100644 --- a/dll/cpl/timedate/lang/zh-CN.rc +++ b/dll/cpl/timedate/lang/zh-CN.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "时间和日期" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN GROUPBOX "日期(&D)", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -20,7 +20,7 @@ END IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "时区" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE @@ -31,7 +31,7 @@ END IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Internet 时间" -FONT 9, "新細明體", 0, 0, 0x0 +FONT 9, "宋体", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "自动与 Internet 时间服务器同步(&S)", @@ -52,6 +52,6 @@ BEGIN IDS_TIMEZONEUNKNOWN "未知" IDS_INETTIMESUCSYNC "时间已成功同步，在 %s 在 %s 在 %s" IDS_INETTIMENEXTSYNC "下次同步:%s 在 %s" - IDS_INETTIMESYNCING "请等待，ReactOS 正在同步 %s" + IDS_INETTIMESYNCING "请稍候，ReactOS 正在同步 %s" IDS_INETTIMEERROR "在 ReactOS 同步时发生了一个错误。%s" END diff --git a/dll/cpl/usrmgr/lang/zh-CN.rc b/dll/cpl/usrmgr/lang/zh-CN.rc index 448400188f..c014e9340c 100644 --- a/dll/cpl/usrmgr/lang/zh-CN.rc +++ b/dll/cpl/usrmgr/lang/zh-CN.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_USERS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "用户" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE @@ -21,7 +21,7 @@ END IDD_GROUPS DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "小组" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE @@ -33,7 +33,7 @@ END IDD_EXTRA DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "额外" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "这个空间是故意留空", IDC_STATIC, 66, 90, 112, 8 END @@ -41,7 +41,7 @@ END IDD_USER_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 LTEXT "全名:", -1, 7, 46, 63, 8 @@ -58,7 +58,7 @@ END IDD_USER_MEMBERSHIP DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "会员" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "成员:", -1, 7, 7, 170, 8 CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | @@ -70,7 +70,7 @@ END IDD_USER_PROFILE DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "配置文件" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN GROUPBOX "用户配置文件", -1, 7, 7, 238, 54 LTEXT "配置文件路径:", -1, 16, 22, 55, 8 @@ -90,7 +90,7 @@ END IDD_GROUP_GENERAL DIALOGEX 0, 0, 252, 223 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 LTEXT "描述:", -1, 7, 45, 46, 8 @@ -105,7 +105,7 @@ END IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 267, 74 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "更换密码" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN EDITTEXT IDC_EDIT_PASSWORD1, 107, 7, 153, 14, ES_AUTOHSCROLL | ES_PASSWORD RTEXT "新密码:", -1, 7, 10, 96, 8 @@ -118,7 +118,7 @@ END IDD_USER_NEW DIALOGEX 0, 0, 267, 200 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "新用户" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN EDITTEXT IDC_USER_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL RTEXT "用户名称:", -1, 7, 10, 96, 8 @@ -141,7 +141,7 @@ END IDD_GROUP_NEW DIALOGEX 0, 0, 267, 74 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "新组" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN EDITTEXT IDC_GROUP_NEW_NAME, 107, 7, 153, 14, ES_AUTOHSCROLL RTEXT "组名:", -1, 7, 10, 96, 8 @@ -154,7 +154,7 @@ END IDD_USER_ADD_MEMBERSHIP DIALOGEX 0, 0, 252, 223 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "组成员身份" -FONT 8, "新細明體" +FONT 8, "宋体" BEGIN LTEXT "成员:", -1, 7, 7, 56, 8 CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | diff --git a/dll/cpl/wined3dcfg/lang/zh-CN.rc b/dll/cpl/wined3dcfg/lang/zh-CN.rc index 9eb3222aef..17f713a17f 100644 --- a/dll/cpl/wined3dcfg/lang/zh-CN.rc +++ b/dll/cpl/wined3dcfg/lang/zh-CN.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "常规" -FONT 8, "新細明體" +FONT 9, "宋体" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 GROUPBOX "着色器", -1, 5, 25, 230, 80 diff --git a/dll/win32/setupapi/lang/zh-CN.rc b/dll/win32/setupapi/lang/zh-CN.rc index 15212a10de..7a6002c6bc 100644 --- a/dll/win32/setupapi/lang/zh-CN.rc +++ b/dll/win32/setupapi/lang/zh-CN.rc @@ -1,4 +1,5 @@ /* Simplified Chinese translation by Henry Tang Ih 2015 (henrytang2(a)hotmail.com) */ +/* Improved by Luo Yufan (njlyf2011(a)hotmail.com) */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED @@ -10,36 +11,36 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "资料来源：", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "目的地：", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "目标：", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDPROMPTFORDISK DIALOG 0, 0, 260, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Files Needed" +CAPTION "所需文件" FONT 9, "宋体" BEGIN - LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "插入厂商的安装盘，然后确定已在下面选定正确的驱动器。", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "厂商文件复制来源:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 - DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "确定", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "取消", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "浏览...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END STRINGTABLE BEGIN - IDS_PROMPTDISK "The file '%1' on %2 is needed" - IDS_UNKNOWN "Unknown" - IDS_COPYFROM "Copy files from:" - IDS_INFO "Type the path where the file is located, and then click OK." + IDS_PROMPTDISK "需要 %2 上的文件 '%1'。" + IDS_UNKNOWN "未知" + IDS_COPYFROM "文件复制来源:" + IDS_INFO "输入文件所在的路径，然后单击“确定”。" END STRINGTABLE BEGIN - IDS_QUERY_REBOOT_TEXT "您的计算机需要重新启动才能完成安装。您要继续吗？" + IDS_QUERY_REBOOT_TEXT "您的计算机需要重新启动才能完成安装，您要继续吗？" IDS_QUERY_REBOOT_CAPTION "重新启动" IDS_INF_FILE "安装程序信息" END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 71b8dc948a..8072464090 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -422,10 +422,10 @@ BEGIN AUTORADIOBUTTON "在不同窗口中打开不同的文件夹(&W)", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 GROUPBOX "打开项目的方式", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 - AUTORADIOBUTTON "通过单击打开项目（指向时选定）(&s)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "通过单击打开项目(指向时选定)(&s)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "根据浏览器设置给图标标题加下划线(&B)", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 AUTORADIOBUTTON "仅当指向图标标题时加下划线(&P)", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 - AUTORADIOBUTTON "双击要打开的项目（单击时选定）(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 + AUTORADIOBUTTON "双击要打开的项目(单击时选定)(&D)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 PUSHBUTTON "还原为默认值(&R)", 14011, 180, 180, 60, 14, WS_TABSTOP END @@ -436,7 +436,7 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN GROUPBOX "视图", -1, 7, 10, 249, 60 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "您可以应用您正在使用此文件夹的\n所有文件夹的视图（如详细信息或平铺)。", -1, 60, 20, 180, 20 + 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 @@ -516,7 +516,7 @@ BEGIN AUTORADIOBUTTON "选择要执行的操作(&P):", 1005, 14, 54, 202, 10, WS_GROUP CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107 AUTORADIOBUTTON "每次选择操作提示我(&C)", 1006, 14, 177, 202, 10 - PUSHBUTTON "还原默认值(&R）", 1008, 108, 197, 110, 14, WS_DISABLED + PUSHBUTTON "还原默认值(&R)", 1008, 108, 197, 110, 14, WS_DISABLED END IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207 @@ -723,8 +723,8 @@ BEGIN IDS_SHUTDOWN_PROMPT "是否关闭系统?" /* Run File dialog */ - IDS_RUNDLG_ERROR "无法显示运行文件对话框（内部错误）" - IDS_RUNDLG_BROWSE_ERROR "无法显示浏览对话框（内部错误）" + IDS_RUNDLG_ERROR "无法显示运行文件对话框 (内部错误)" + IDS_RUNDLG_BROWSE_ERROR "无法显示浏览对话框 (内部错误)" IDS_RUNDLG_BROWSE_CAPTION "浏览" IDS_RUNDLG_BROWSE_FILTER "可执行文件 (*.exe)\0*.exe\0所有文件 (*.*)\0*.*\0" diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 51fa6289f4..08755621d5 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -1,30 +1,32 @@ +/* Improved by Luo Yufan 2017-01-05 (njlyf2011(a)hotmail.com) */ + LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导" +CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - LTEXT "欢迎使用ReactOS安装向导。", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "安装向导将在计算机上安装 ReactOS 。\n它需要搜集有关您的和计算机的信息，\n以便正确安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 + LTEXT "欢迎使用 ReactOS 安装程序。", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "安装程序将在您的计算机上安装 ReactOS 操作系统。\n它需要搜集有关您的和计算机的信息，\n以便正确安装 ReactOS。", IDC_STATIC, 115, 40, 195, 100 LTEXT "要继续，请单击“下一步”。.", IDC_STATIC, 115, 169, 195, 17 END IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导 " +CAPTION "ReactOS 安装程序 " FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "ReactOS 的开发人员就以下的自由软件项目表示感谢。在建立 ReactOS 时使用了其中的代码 :", IDC_STATIC, 15, 7, 286, 19 + LTEXT "ReactOS 开发者就以下的自由软件项目表示感谢。在构建 ReactOS 时使用了其中的代码 :", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS 是基于GPL协议发布的，因此如果您需要再用或重新发布 ReactOS (或部分)必须遵循GPL许可。", IDC_STATIC, 15, 110, 227, 19 - PUSHBUTTON "查看GPL(&V)...", IDC_VIEWGPL, 245, 110, 65, 15 - LTEXT "继续安装单击 “ 下一步 ” 。", IDC_STATIC, 15, 136, 195, 17 + LTEXT "ReactOS 是基于 GPL 许可证发布的，因此如果您需要二次开发或重新发布 ReactOS (或部分)必须遵循 GPL 许可证。", IDC_STATIC, 15, 110, 227, 19 + PUSHBUTTON "查看 GPL(&V)...", IDC_VIEWGPL, 245, 110, 65, 15 + LTEXT "请单击“下一步”继续安装。", IDC_STATIC, 15, 136, 195, 17 END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导 " +CAPTION "ReactOS 安装程序 " FONT 9, "宋体" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 @@ -37,16 +39,16 @@ END IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导 " +CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "请输入不超过63个字符的计算机名。每一个在您网络上的计算机都必须有一个唯一的名称。", IDC_STATIC, 54, 7, 250, 24 + LTEXT "请输入不超过 63 个字符的计算机名。每一个在您网络上的计算机都必须有一个唯一的名称。", IDC_STATIC, 54, 7, 250, 24 LTEXT "计算机名(&C):", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "安装程序会创建一个称为 Administrator (系统管理员)的用户帐户。需要完全控制计算机时，可以使用这个帐户。", IDC_STATIC, 54, 57, 250, 25 - LTEXT "请键入不超过127个字符的系统管理员密码。", IDC_STATIC, 54, 87, 250, 8 + LTEXT "请键入不超过 127 个字符的系统管理员密码。", IDC_STATIC, 54, 87, 250, 8 LTEXT "系统管理员密码(&A):", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "确认密码(&O):", IDC_STATIC, 54, 123, 75, 8 @@ -55,7 +57,7 @@ END IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导 " +CAPTION "ReactOS 安装程序 " FONT 9, "宋体" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 @@ -71,7 +73,7 @@ END IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导 " +CAPTION "ReactOS 安装程序 " FONT 9, "宋体" BEGIN ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 @@ -85,16 +87,16 @@ END IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "磊灿", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "经典主题", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装向导 " +CAPTION "ReactOS 安装程序 " FONT 9, "宋体" BEGIN LTEXT "", IDC_ACTIVITY, 53, 7, 253, 20 @@ -104,13 +106,13 @@ END IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 安装完成 " +CAPTION "正在完成 ReactOS 安装 " FONT 9, "宋体" BEGIN - LTEXT "正在完成 ReactOS 安装向导", IDC_FINISHTITLE,115, 8, 195, 24 + LTEXT "正在完成 ReactOS 安装程序", IDC_FINISHTITLE,115, 8, 195, 24 LTEXT "ReactOS 安装程序已顺利完成。\n\n要重新启动计算机，请单击“完成”。", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "如果驱动器里有CD，请将其取出要重新启动计算机，请单击“完成”。", IDC_STATIC, 115, 160, 195, 17 + LTEXT "如果驱动器里有 CD，请将其取出要重新启动计算机，并单击“完成”。", IDC_STATIC, 115, 160, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230 @@ -124,7 +126,7 @@ END IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 37 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "请等待..." +CAPTION "请稍候..." FONT 9, "宋体", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS @@ -139,21 +141,21 @@ BEGIN IDS_OWNERSUBTITLE "安装程序将使用您提供的个人信息，自定义您的 ReactOS 软件。" IDS_COMPUTERTITLE "计算机名和系统管理员密码" IDS_COMPUTERSUBTITLE "您必须提供计算机名和系统管理员密码。" - IDS_LOCALETITLE "区域设置 " + IDS_LOCALETITLE "区域设置" IDS_LOCALESUBTITLE "您可以为不同的区域和语言自定义 ReactOS。" IDS_DATETIMETITLE "日期和时间 " IDS_DATETIMESUBTITLE "为您的计算机配置正确的日期和时间。" - IDS_PROCESSTITLE "正在安装" + IDS_PROCESSTITLE "注册组件" IDS_PROCESSSUBTITLE "正在完成 ReactOS 最后的安装" - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." + IDS_THEMESELECTIONTITLE "外观" + IDS_THEMESELECTIONSUBTITLE "请选择主题:" END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS 安装程序" - IDS_UNKNOWN_ERROR "未知的错误" - IDS_REGISTERING_COMPONENTS "请稍候，安装程序正在安装组件。" + IDS_UNKNOWN_ERROR "未知错误" + IDS_REGISTERING_COMPONENTS "请稍候，安装程序正在注册组件。" IDS_LOADLIBRARY_FAILED "LoadLibrary 失败: " IDS_GETPROCADDR_FAILED "GetProcAddr 失败: " IDS_REGSVR_FAILED "DllRegisterServer 失败: " @@ -172,18 +174,18 @@ END STRINGTABLE BEGIN - IDS_WZD_NAME "请填写您的姓名否则安装程序无法继续" - IDS_WZD_SETCOMPUTERNAME "请输入有效的计算机名" - IDS_WZD_COMPUTERNAME "请填写计算机名否则安装程序无法继续" + IDS_WZD_NAME "请填写您的姓名，否则安装程序无法继续" + IDS_WZD_SETCOMPUTERNAME "请输入有效的计算机名。" + IDS_WZD_COMPUTERNAME "请填写计算机名，否则安装程序无法继续。" IDS_WZD_PASSWORDEMPTY "请输入密码" - IDS_WZD_PASSWORDMATCH "您两次输入的密码不一致请重新输入" - IDS_WZD_PASSWORDCHAR "密码中包含无效字符，请重新输入" + IDS_WZD_PASSWORDMATCH "您两次输入的密码不一致，请重新输入。" + IDS_WZD_PASSWORDCHAR "密码中包含无效字符，请重新输入。" IDS_WZD_LOCALTIME "安装程序无法设置本地时间" END STRINGTABLE BEGIN - IDS_STATUS_INSTALL_DEV "安装设备驱动程序..." + IDS_STATUS_INSTALL_DEV "正在安装驱动程序..." END /* ATTENTION: Synchronize the translation of these strings with shell32 */ diff --git a/dll/win32/tapiui/lang/zh-CN.rc b/dll/win32/tapiui/lang/zh-CN.rc index 55cf3305b2..24cf85b035 100644 --- a/dll/win32/tapiui/lang/zh-CN.rc +++ b/dll/win32/tapiui/lang/zh-CN.rc @@ -9,10 +9,10 @@ FONT 9, "宋体" BEGIN ICON 201, 2000, 7, 7, 21, 20 LTEXT "下面的列表显示您指定的位置。选择您拨号的位置。", -1, 35, 7, 210, 16 - LTEXT "地点位置:(&L)", -1, 7, 35, 210, 8 + LTEXT "地点位置(&L):", -1, 7, 35, 210, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000011D, 7, 46, 238, 105, WS_EX_CLIENTEDGE - PUSHBUTTON "新建...(&N)", 1030, 87, 155, 50, 14 - PUSHBUTTON "编辑...(&E)", 1031, 141, 155, 50, 14 + PUSHBUTTON "新建(&N)...", 1030, 87, 155, 50, 14 + PUSHBUTTON "编辑(&E)...", 1031, 141, 155, 50, 14 PUSHBUTTON "删除(&D)", 1032, 195, 155, 50, 14 LTEXT "要拨的电话号码:", 1052, 7, 181, 100, 8 LTEXT "", 1053, 14, 195, 224, 16 @@ -24,27 +24,27 @@ CAPTION "常规" FONT 9, "宋体" BEGIN ICON 202, 2000, 7, 7, 20, 20 - LTEXT "地点位置名称:(&N)", -1, 35, 11, 56, 8, SS_CENTERIMAGE + LTEXT "位置名称(&N):", -1, 35, 11, 56, 8, SS_CENTERIMAGE EDITTEXT 1038, 96, 8, 149, 14, ES_AUTOHSCROLL - LTEXT "指定从中你将拨号的位置。", 2001, 7, 33, 238, 8 - LTEXT "国家/地区:(&R)", -1, 7, 49, 161, 8 + LTEXT "指定拨号位置。", 2001, 7, 33, 238, 8 + LTEXT "国家(地区):(&R)", -1, 7, 49, 161, 8 COMBOBOX 1006, 7, 60, 175, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "地区代码:(&C)", -1, 190, 49, 48, 8 + LTEXT "区号:(&C)", -1, 190, 49, 48, 8 EDITTEXT 1034, 190, 60, 48, 12, ES_AUTOHSCROLL GROUPBOX "拨号规则", 2002, 7, 80, 238, 92 - LTEXT "当从该位置拨号，使用以下规则:", 2003, 14, 92, 224, 8 - LTEXT "若要访问本地电话的外线电话，请拨:(&L)", -1, 14, 106, 170, 8 + LTEXT "从此位置拨号时，使用下面的规则:", 2003, 14, 92, 224, 8 + LTEXT "本地电话的外线号码是(&L):", -1, 14, 106, 170, 8 EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL - LTEXT "要访问外线长途电话，请先拨:(&D)", -1, 14, 122, 170, 8 + LTEXT "长途电话的外线号码是(&D):(&D)", -1, 14, 122, 170, 8 EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL - LTEXT "使用此载波码来打长途电话:(&E)", -1, 14, 138, 170, 8 + LTEXT "使用此电话公司代码来打长途电话(&E):", -1, 14, 138, 170, 8 EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL - LTEXT "使用此载波码来打国际电话:(&I)", -1, 14, 154, 170, 8 + LTEXT "使用此电话公司代码来打国际电话(&I):", -1, 14, 154, 170, 8 EDITTEXT 1060, 190, 152, 48, 12, ES_AUTOHSCROLL - AUTOCHECKBOX "若要禁用呼叫等待，请拨打:(&W)", 1035, 14, 177, 170, 10 + AUTOCHECKBOX "要禁用呼叫等待功能，请拨(&W):", 1035, 14, 177, 170, 10 COMBOBOX 1013, 190, 176, 48, 73, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL - LTEXT "使用拨号:", -1, 14, 195, 40, 8 - AUTORADIOBUTTON "语气(&T)", 1036, 58, 194, 50, 10, NOT WS_TABSTOP + LTEXT "拨号方法:", -1, 14, 195, 40, 8 + AUTORADIOBUTTON "音频(&T)", 1036, 58, 194, 50, 10, NOT WS_TABSTOP AUTORADIOBUTTON "脉冲(&P)", 1037, 112, 194, 50, 10, NOT WS_TABSTOP LTEXT "要拨的电话号码:", 1052, 7, 219, 100, 8 LTEXT "", 1053, 14, 232, 224, 16 @@ -55,11 +55,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "区号规则" FONT 9, "宋体" BEGIN - LTEXT "区号规则确定电话号码的拨号方式从你当前的地区代码于其他地区代码和区号中。", 2000, 7, 7, 238, 16 - LTEXT "区号规则:(&C)", -1, 7, 31, 238, 8 + LTEXT "区号规则决定从您当前的区号到其它区号和您的区号内的拨号方法。", 2000, 7, 7, 238, 16 + LTEXT "区号规则(&C):", -1, 7, 31, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000801D, 7, 42, 238, 99, WS_EX_CLIENTEDGE - PUSHBUTTON "新建...(&N)", 1030, 87, 147, 50, 14 - PUSHBUTTON "编辑...(&E)", 1031, 141, 147, 50, 14 + PUSHBUTTON "新建(&N)...", 1030, 87, 147, 50, 14 + PUSHBUTTON "编辑(&E)...", 1031, 141, 147, 50, 14 PUSHBUTTON "删除(&D)", 1032, 195, 147, 50, 14 GROUPBOX "描述", 2006, 7, 166, 238, 45 LTEXT "", 1039, 14, 180, 224, 24 @@ -70,17 +70,17 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "电话卡" FONT 9, "宋体" BEGIN - LTEXT "选择您将使用的电话卡，或单击新建添加不同的卡。", 2000, 7, 7, 238, 8 - LTEXT "卡类型:(&T)", -1, 7, 23, 238, 8 + LTEXT "选择您要使用的电话卡，或单击“新建”来添加不同的卡。", 2000, 7, 7, 238, 8 + LTEXT "卡类型(&T):", -1, 7, 23, 238, 8 CONTROL "", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 34, 238, 63, WS_EX_CLIENTEDGE - PUSHBUTTON "新建...(&N)", 1030, 87, 103, 50, 14 - PUSHBUTTON "编辑...(&E)", 1031, 141, 103, 50, 14 + PUSHBUTTON "新建(&N)...", 1030, 87, 103, 50, 14 + PUSHBUTTON "编辑(&E)...", 1031, 141, 103, 50, 14 PUSHBUTTON "删除(&D)", 1032, 195, 103, 50, 14 LTEXT "帐号:(&C)", -1, 7, 127, 91, 8 EDITTEXT 1018, 102, 125, 143, 12, ES_AUTOHSCROLL - LTEXT "个人ID号 (PIN):(&P)", -1, 7, 145, 91, 8 + LTEXT "个人识别码(PIN)(&P):", -1, 7, 145, 91, 8 EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL - GROUPBOX "访问的电话号码", 2001, 7, 158, 238, 53 + GROUPBOX "访问电话号码", 2001, 7, 158, 238, 53 LTEXT "长途电话:", -1, 14, 172, 84, 8 LTEXT "", 1042, 102, 172, 136, 8 LTEXT "国际电话:", -1, 14, 184, 84, 8 @@ -95,13 +95,13 @@ CAPTION "常规" FONT 9, "宋体" BEGIN ICON 203, 2000, 7, 7, 20, 20 - LTEXT "电话卡名:(&C)", -1, 35, 12, 64, 8, SS_CENTERIMAGE + LTEXT "电话卡名(&C):", -1, 35, 12, 64, 8, SS_CENTERIMAGE EDITTEXT 1047, 105, 9, 140, 14, ES_AUTOHSCROLL - LTEXT "帐号:(&N)", -1, 7, 35, 238, 8 + LTEXT "帐号(&N):", -1, 7, 35, 238, 8 EDITTEXT 1018, 7, 46, 116, 14, ES_AUTOHSCROLL - LTEXT "个人识别号码 (PIN):(&P)", -1, 7, 68, 238, 8 + LTEXT "个人识别码(PIN)(&P):", -1, 7, 68, 238, 8 EDITTEXT 1019, 7, 80, 116, 14, ES_AUTOHSCROLL - LTEXT "此电话卡将时使用:", 1056, 14, 117, 224, 8 + LTEXT "在如下情况下使用电话卡:", 1056, 14, 117, 224, 8 GROUPBOX "电话卡详细信息", 2001, 7, 105, 238, 66 LTEXT "", 1000, 22, 131, 216, 8 LTEXT "", 1001, 22, 143, 216, 8 @@ -113,20 +113,20 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "长途" FONT 9, "宋体" BEGIN - LTEXT "长途电话访问号码:(&L)", -1, 7, 7, 238, 8 + LTEXT "长途访问号码(&L):", -1, 7, 7, 238, 8 EDITTEXT 1044, 7, 18, 140, 14, ES_AUTOHSCROLL - LTEXT "使用下面的按钮来输入打长途电话拨号步骤。当它们出现在你的名片上，按准确顺序输入这些步骤。", 2000, 7, 40, 238, 24 - LTEXT "电话卡拨号步骤:(&R)", -1, 7, 72, 80, 8 + LTEXT "使用下面的按钮来输入打长途电话的步骤。请严格按您的电话卡上的步骤来输入。", 2000, 7, 40, 238, 24 + LTEXT "电话卡拨号步骤(&R):", -1, 7, 72, 80, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE - PUSHBUTTON "向上移动(&U)", 1022, 195, 83, 50, 14 - PUSHBUTTON "向下移动(&M)", 1023, 195, 101, 50, 14 + PUSHBUTTON "上移(&U)", 1022, 195, 83, 50, 14 + PUSHBUTTON "下移(&M)", 1023, 195, 101, 50, 14 PUSHBUTTON "删除(&D)", 1024, 195, 119, 50, 14 PUSHBUTTON "访问号码(&N)", 1025, 7, 161, 90, 14 PUSHBUTTON "帐号(&C)", 1018, 101, 161, 90, 14 - PUSHBUTTON "密码(&P)", 1019, 7, 179, 90, 14 - PUSHBUTTON "目标号码...(&E)", 1020, 101, 179, 90, 14 - PUSHBUTTON "等待提示...(&W)", 1017, 7, 197, 90, 14 - PUSHBUTTON "指定数字...(&S)", 1021, 101, 197, 90, 14 + PUSHBUTTON "PIN(&P)", 1019, 7, 179, 90, 14 + PUSHBUTTON "目标号码(&E)...", 1020, 101, 179, 90, 14 + PUSHBUTTON "等待提示(&W)...", 1017, 7, 197, 90, 14 + PUSHBUTTON "指定数字(&S)...", 1021, 101, 197, 90, 14 END 107 DIALOGEX 0, 0, 252, 218 @@ -136,18 +136,18 @@ FONT 9, "宋体" BEGIN LTEXT "国际电话访问号码:(&I)", -1, 7, 7, 238, 8 EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL - LTEXT "使用下面的按钮来输入打国际电话拨号步骤。当它们出现在你的名片上，按准确顺序输入这些步骤。", 2000, 7, 40, 244, 24 + LTEXT "使用下面的按钮来输入打国际长途电话的步骤。请严格按您的电话卡上的步骤来输入。", 2000, 7, 40, 244, 24 LTEXT "电话卡拨号步骤:(&R)", -1, 7, 72, 80, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE - PUSHBUTTON "向上移动(&U)", 1022, 195, 83, 50, 14 - PUSHBUTTON "向下移动(&M)", 1023, 195, 101, 50, 14 + PUSHBUTTON "上移(&U)", 1022, 195, 83, 50, 14 + PUSHBUTTON "下移(&M)", 1023, 195, 101, 50, 14 PUSHBUTTON "删除(&D)", 1024, 195, 119, 50, 14 PUSHBUTTON "访问号码(&N)", 1025, 7, 161, 90, 14 PUSHBUTTON "帐号(&C)", 1018, 101, 161, 90, 14 - PUSHBUTTON "密码(&P)", 1019, 7, 179, 90, 14 - PUSHBUTTON "目标号码...(&E)", 1020, 101, 179, 90, 14 - PUSHBUTTON "等待提示...(&W)", 1017, 7, 197, 90, 14 - PUSHBUTTON "指定数字...(&S)", 1021, 101, 197, 90, 14 + PUSHBUTTON "PIIN(&P)", 1019, 7, 179, 90, 14 + PUSHBUTTON "目标号码(&E)...", 1020, 101, 179, 90, 14 + PUSHBUTTON "等待提示(&W)...", 1017, 7, 197, 90, 14 + PUSHBUTTON "指定数字(&S)...", 1021, 101, 197, 90, 14 END 108 DIALOGEX 0, 0, 252, 218 @@ -157,44 +157,44 @@ FONT 9, "宋体" BEGIN LTEXT "本地电话访问号码:(&L)", -1, 7, 7, 238, 8 EDITTEXT 1008, 7, 18, 140, 14, ES_AUTOHSCROLL - LTEXT "使用下面的按钮来输入打市内电话拨号步骤。当他们出现在你的名片上，按准确顺序输入这些步骤。来而无需使用您的电话卡打本地电话，请将此部分留为空白。", 2000, 7, 40, 238, 24 - LTEXT "电话卡拨号步骤:(&R)", -1, 7, 72, 238, 8 + LTEXT "使用下面的按钮来输入打本地电话的步骤。请严格按您的电话卡上的步骤来输入。如果您不用电话卡来打本地电话，就把处留为空白。", 2000, 7, 40, 238, 24 + LTEXT "电话卡拨号步骤(&R):", -1, 7, 72, 238, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000400D, 7, 83, 184, 74, WS_EX_CLIENTEDGE - PUSHBUTTON "向上移动(&U)", 1022, 195, 83, 50, 14 - PUSHBUTTON "向下移动(&M)", 1023, 195, 101, 50, 14 + PUSHBUTTON "上移(&U)", 1022, 195, 83, 50, 14 + PUSHBUTTON "下移(&M)", 1023, 195, 101, 50, 14 PUSHBUTTON "删除(&D)", 1024, 195, 119, 50, 14 PUSHBUTTON "访问号码(&N)", 1025, 7, 161, 90, 14 PUSHBUTTON "帐号(&C)", 1018, 101, 161, 90, 14 PUSHBUTTON "密码(&P)", 1019, 7, 179, 90, 14 - PUSHBUTTON "目标号码...(&E)", 1020, 101, 179, 90, 14 - PUSHBUTTON "等待提示...(&W)", 1017, 7, 197, 90, 14 - PUSHBUTTON "指定数字...(&S)", 1021, 101, 197, 90, 14 + PUSHBUTTON "目标号码(&E)...", 1020, 101, 179, 90, 14 + PUSHBUTTON "等待提示(&W)...", 1017, 7, 197, 90, 14 + PUSHBUTTON "指定数字(&S)...", 1021, 101, 197, 90, 14 END 109 DIALOGEX 0, 0, 252, 257 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP -CAPTION "新的区号规则" +CAPTION "新建区号规则" FONT 9, "宋体" BEGIN - LTEXT "此区号规则只适用于电话的区号和您在下面指定的前缀组合作出。", 2000, 7, 6, 238, 16 - LTEXT "要调用的地区代码:", -1, 7, 31, 110, 8 - LTEXT "地区代码:(&R)", -1, 7, 47, 36, 8 + LTEXT "此区号规则只适用于拨包括下面指定的区号和前缀的电话。", 2000, 7, 6, 238, 16 + LTEXT "您在拨的区号:", -1, 7, 31, 110, 8 + LTEXT "区号(&R):", -1, 7, 47, 36, 8 EDITTEXT 1034, 46, 44, 50, 14, ES_AUTOHSCROLL - LTEXT "指定要用于此区号规则的前缀。", -1, 14, 78, 224, 8 - AUTORADIOBUTTON "包含此区号之内的所有前缀(&I)", 1014, 14, 90, 224, 12, NOT WS_TABSTOP - AUTORADIOBUTTON "在下面的列表中包括唯一的前缀:(&O)", 1015, 14, 104, 224, 12, NOT WS_TABSTOP + LTEXT "指定用于此区号规则的前缀。", -1, 14, 78, 224, 8 + AUTORADIOBUTTON "此区号中包含所有前缀(&I)", 1014, 14, 90, 224, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "只包含下列前缀(&O):", 1015, 14, 104, 224, 12, NOT WS_TABSTOP LTEXT "要包含的前缀:(&P)", 1057, 26, 117, 119, 8 CONTROL "List1", 1033, "SysListView32", WS_BORDER | WS_TABSTOP | 0x0000411D, 25, 128, 66, 32, WS_EX_CLIENTEDGE - PUSHBUTTON "添加...(&A)", 1005, 95, 128, 50, 14 + PUSHBUTTON "添加(&A)...", 1005, 95, 128, 50, 14 PUSHBUTTON "删除(&E)", 1024, 95, 146, 50, 14 - LTEXT "当拨号电话号码包含上述前缀:", -1, 14, 184, 224, 8 - AUTOCHECKBOX "拨打:(&D)", 1012, 14, 198, 30, 12 + LTEXT "当拨含有上列前缀的电话号码时:", -1, 14, 184, 224, 8 + AUTOCHECKBOX "拨号:(&D)", 1012, 14, 198, 30, 12 EDITTEXT 1007, 46, 196, 42, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "包括地区代码(&C)", 1029, 14, 214, 85, 12 + AUTOCHECKBOX "包含区号(&C)", 1029, 14, 214, 85, 12 DEFPUSHBUTTON "确定", 1, 141, 236, 50, 14 PUSHBUTTON "取消", 2, 195, 236, 50, 14 - RTEXT "地区代码", 2001, 133, 31, 51, 8 + RTEXT "区号", 2001, 133, 31, 51, 8 LTEXT "前缀", 2002, 200, 31, 45, 8 CONTROL "", 2003, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 180, 41, 1, 6 CONTROL "", 2004, "STATIC", SS_BLACKFRAME | SS_SUNKEN, 203, 41, 1, 6 @@ -221,10 +221,10 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "等待" FONT 9, "宋体" BEGIN - LTEXT "选择提示继续拨号序列之前等待的类型。", 2000, 7, 7, 238, 16 + LTEXT "选择在继续拨号序列前等待的提示类型。", 2000, 7, 7, 238, 16 AUTORADIOBUTTON "等待拨号音(&D)", 1009, 7, 31, 238, 10, WS_GROUP - AUTORADIOBUTTON "等待完成语音消息(&V)", 1016, 7, 47, 238, 10, NOT WS_TABSTOP - AUTORADIOBUTTON "等待一个特定的时间长度:(&T)", 1048, 7, 63, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "等待留言结束(&V)", 1016, 7, 47, 238, 10, NOT WS_TABSTOP + AUTORADIOBUTTON "等待定长的时间(&T):", 1048, 7, 63, 238, 10, NOT WS_TABSTOP EDITTEXT 1050, 18, 77, 36, 14, ES_AUTOHSCROLL | WS_GROUP CONTROL "Spin1", 1049, "msctls_updown32", 0x00000036, 42, 78, 11, 14 LTEXT "秒(&S)", -1, 58, 81, 187, 8 @@ -238,8 +238,8 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "目标号码" FONT 9, "宋体" BEGIN - LTEXT "此步骤将把您将拨入电话卡序列的目标数。当拨打目标号码，你想拨数中的哪些部分?:", 2000, 7, 7, 238, 24 - AUTOCHECKBOX "拨打国家/地区代码(&C)", 1027, 7, 39, 238, 10 + LTEXT "此步骤将把您要拨的目标电话号码放在电话卡序列中。当拨目标电话号码时，您要拨号码的哪一部分?", 2000, 7, 7, 238, 24 + AUTOCHECKBOX "拨国家(地区)号(&C)", 1027, 7, 39, 238, 10 AUTOCHECKBOX "拨区号(&A)", 1034, 7, 55, 238, 10 AUTOCHECKBOX "拨号码(&N)", 1008, 7, 71, 238, 10, WS_DISABLED DEFPUSHBUTTON "确定", 1, 141, 92, 50, 14 @@ -252,12 +252,12 @@ CAPTION "高级" FONT 9, "宋体" BEGIN ICON 201, 2000, 7, 7, 20, 20 - LTEXT "在此计算机上安装下列电话服务提供程序:", -1, 40, 7, 205, 8 - LTEXT "提供商:(&P)", -1, 7, 35, 238, 8 + LTEXT "下面的电话服务提供程序已安装到此计算机上:", -1, 40, 7, 205, 8 + LTEXT "提供程序:(&P)", -1, 7, 35, 238, 8 LISTBOX 1033, 7, 46, 238, 147, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | WS_TABSTOP - PUSHBUTTON "添加...(&D)", 1005, 87, 197, 50, 14 + PUSHBUTTON "添加(&D)...", 1005, 87, 197, 50, 14 PUSHBUTTON "删除(&R)", 1024, 141, 197, 50, 14 - PUSHBUTTON "配置...(&C)", 1031, 195, 197, 50, 14 + PUSHBUTTON "配置(&C)...", 1031, 195, 197, 50, 14 END 114 DIALOGEX 20, 15, 252, 127 @@ -265,7 +265,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL CAPTION "添加提供程序" FONT 9, "宋体" BEGIN - LTEXT "选择你想从下面列表中安装的提供程序并单击添加。", 2000, 7, 7, 241, 8 + LTEXT "从下面列表中选择您想安装的提供程序，然后单击“添加”。", 2000, 7, 7, 241, 8 LTEXT "电话服务提供程序:(&T)", -1, 7, 23, 144, 10 LISTBOX 1055, 7, 34, 238, 74, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "添加(&A)", 1005, 141, 106, 50, 14 @@ -279,16 +279,16 @@ CAPTION "位置信息" FONT 9, "宋体" BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 10, 10, 88, 155 - LTEXT "您可以使任何电话或调制解调器的连接之前，电脑需要以下有关您当前的位置信息。", 2000, 107, 15, 188, 25 - LTEXT "你现在在什么国家/地区?(&W)", -1, 107, 43, 189, 10 + LTEXT "在您做任何电话或调制解调器连接之前，ReactOS 需要知道关于您当前位置的信息。", 2000, 107, 15, 188, 25 + LTEXT "目前所在的国家(地区)(&W):", -1, 107, 43, 189, 10 COMBOBOX 1006, 107, 55, 180, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "现在你的是什么区号 (或城市代码) ?(&C)", -1, 107, 74, 189, 10 + LTEXT "您的区号(或城市号)是什么(&C)?", -1, 107, 74, 189, 10 EDITTEXT 1034, 107, 87, 45, 12, ES_AUTOHSCROLL - LTEXT "如果您需要指定承运人代码，是什么?(&R)", -1, 107, 105, 189, 10 + LTEXT "如果您想指定一电话公司代码，它是什么(&R)?", -1, 107, 105, 189, 10 EDITTEXT 1058, 106, 118, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "如果你拨一个号码才能拨打外线，它是什么?(&O)", -1, 107, 137, 189, 10 + LTEXT "您拨外线需要先拨哪个号码(&O)?(&O)", -1, 107, 137, 189, 10 EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "在此位置的电话系统使用:", -1, 107, 168, 189, 10 + LTEXT "本地电话系统使用:", -1, 107, 168, 189, 10 AUTORADIOBUTTON "音频拨号(&T)", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "脉冲拨号(&P)", 1037, 175, 178, 57, 14, NOT WS_TABSTOP DEFPUSHBUTTON "确定", 1, 192, 204, 50, 14 @@ -300,14 +300,14 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 9, "宋体" BEGIN CONTROL 302, 302, "STATIC", SS_BITMAP, 0, 0, 88, 155 - LTEXT "您可以使任何电话或调制解调器的连接之前，电脑需要以下有关您当前的位置信息。", 2000, 95, 2, 188, 25 - LTEXT "你现在在什么国家/地区?(&W)", -1, 95, 30, 188, 10 + LTEXT "在您做任何电话或调制解调器连接之前，ReactOS 需要知道关于您当前位置的信息。", 2000, 95, 2, 188, 25 + LTEXT "目前所在的国家(地区)(&W):", -1, 95, 30, 188, 10 COMBOBOX 1006, 95, 41, 177, 68, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL - LTEXT "现在你的是什么区号 (或城市代码) ?(&C)", -1, 95, 61, 188, 10 + LTEXT "您的区号(或城市号)是什么(&C)?", -1, 95, 61, 188, 10 EDITTEXT 1034, 95, 73, 40, 14, ES_AUTOHSCROLL - LTEXT "如果你拨一个号码才能拨打外线，它是什么?(&O)", -1, 95, 96, 188, 10 + LTEXT "您拨外线需要先拨哪个号码(&O)?", -1, 95, 96, 188, 10 EDITTEXT 1010, 95, 107, 40, 14, ES_UPPERCASE | ES_AUTOHSCROLL - LTEXT "在此位置的电话系统使用:", -1, 95, 129, 159, 10 + LTEXT "本地电话系统使用:", -1, 95, 129, 159, 10 AUTORADIOBUTTON "音频拨号(&T)", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "脉冲拨号(&P)", 1037, 155, 139, 55, 12, NOT WS_TABSTOP END @@ -319,7 +319,7 @@ FONT 9, "宋体" BEGIN ICON 504, 501, 13, 14, 21, 20 LTEXT "", 502, 47, 15, 180, 32 - AUTOCHECKBOX "在将来，一直信任此页(&I)", 503, 50, 47, 147, 12 + AUTOCHECKBOX "在将来一直信任此页(&I)", 503, 50, 47, 147, 12 DEFPUSHBUTTON "确定(&O)", 505, 110, 65, 50, 14 PUSHBUTTON "取消(&C)", 506, 164, 65, 50, 14 END @@ -327,13 +327,13 @@ END STRINGTABLE BEGIN 1 "电话和调制解调器选项" - 2 "配置拨号规则和使用调制解调器的属性。" + 2 "为您使用的调制解调器配置拨号规则和属性。" 3 "位置" - 4 "若要创建一个新的位置，单击新建。" - 5 "新位置" + 4 "要创建一个新位置，请单击“新建”。" + 5 "新地点" 6 "编辑位置" - 7 "新名片" - 8 "编辑名片" + 7 "新电话卡" + 8 "编辑电话卡" 9 "区号" 10 "前缀" 11 "规则" @@ -342,87 +342,87 @@ BEGIN 14 "您输入的字符无效。\n\n有效的字符是 0 到 9." 15 "您输入的字符无效。" 16 "拨打 %1" - 17 "拨打 %1 再加上区号" - 18 "拨打区号" - 19 "拨打号码而已" - 20 "全部" + 17 "拨打 %1 和区号" + 18 "拨区号" + 19 "仅拨号码" + 20 "所有" 21 "选择" 22 "编辑区号规则" - 23 "上面可以查看其描述的列表中选择一个规则或单击新建添加一个规则。" - 24 "拨打 '%2' 再加上之前的所有 %1 区号之内的电话号码的区号。" - 25 "%1 区号之内的电话号码前拨打 '%2'。" - 26 "拨 %1 区号之内的电话号码前区码。" - 27 "拨 %1 区号之内的电话号码。" - 28 "拨打 '%2' 再加上之前的 %1 区号之内的电话号码包含您指定的前缀的区号。" - 29 "拨打 '%2' 的数字前调用包含您指定的前缀 %1 区号之内。" - 30 "拨区号之前的 %1 区号之内的电话号码包含您指定的前缀。" - 31 "拨号包含您指定的前缀的 %1 区号之内的电话号码。" - 32 "拨打所有其它区号之内先 '1' 并且包括所有前缀的区号。" + 23 "选择以上列表中的一个规则查看其描述或单击“新建”添加一个规则。" + 24 "在拨 %1 区号之内的电话号码时先拨“%2”和区号。" + 25 "在拨 %1 区号之内的电话号码时先拨“%2”。" + 26 "在拨 %1 区号之内的电话号码时先拨区号。" + 27 "在拨 %1 区号之内的电话号码时可直接拨号。" + 28 "在拨 %1 区号之内的电话号码时先拨“%2”和区号，拨包括您指定的前缀。" + 29 "在拨 %1 区号之内的电话号码时先拨“%2”和区号，拨包括您指定的前缀。" + 30 "在拨 %1 区号之内的电话号码时先拨区号，拨包括您指定的前缀。" + 31 "在拨 %1 区号之内的电话号码时先拨区号，拨包括您指定的前缀。" + 32 "在拨所有其它区号之内先拨“1”，并且包括所有前缀的区号。" 33 "添加前缀" - 34 "输入用空格或逗号分隔的一个或多个前缀。" - 35 "指定位数" - 36 "输入一个或多个数字 (包括 * 和 #) 要拨打。" - 37 "你试着输入一个无效字符。\n\n有效的字符是 0 到 9 和空格。" - 38 "等待 %1! d!秒。" - 39 "先拨访问号码。" - 40 "拨号的帐号。" - 41 "拨号的 PIN 号码。" + 34 "键入一个或多个前缀，用空格或逗号分开。" + 35 "指定数字" + 36 "请键入要拨的一个或多个数字 (包括 * 和 #)。" + 37 "您尝试键入一个无效的字符。\n\n有效的字符为从 0 至 9 之间的数字和空格。" + 38 "等待 %1! d! 秒钟。" + 39 "拨访问号码。" + 40 "拨帐户号码。" + 41 "拨 PIN 号码。" 42 "等待拨号音。" 43 "等待留言结束。" - 44 "拨打国家/地区代码、区号和号码。" - 45 "拨国家 (地区) 代码和号码。" + 44 "拨国家(地区)号、区号和号码。" + 45 "拨国家(地区)号和号码。" 46 "拨区号和号码。" - 47 "拨打国家/地区代码。" + 47 "拨国家(地区)号。" 48 "拨区号。" - 49 "拨打号码。" - 50 "拨打长途电话中。" - 51 "拨打国际电话中。" - 52 "拨打本地电话中。" - 53 "没有定义为应如何使用此电话卡的规则。" - 54 "您必须输入此位置的长途载体代码。" - 55 "您必须输入此位置的名称。" - 56 "您必须输入此位置的地区代码。" - 57 "您必须选择要拨打要禁用呼叫等待的号码。" - 58 "您打的电话必须选择国家或地区。" - 59 "缺少的信息" - 60 "你所输入的位置名称已在使用。请输入一个唯一的名称。" - 61 "此电话卡缺少一些必需的信息。使用此卡，请单击编辑，提供更多的信息，或选择另一个卡。" - 62 "您必须选择一个默认电话卡。从列表中，选择一个卡，或单击新建创建一个新的卡。" - 63 "您必须输入电话卡名称。" - 64 "您必须输入帐户号码。" - 65 "您必须输入的 PIN 号码。" - 66 "没有定义该电话卡的规则。若要创建一个规则，请选择长途、国际或本地电话选项卡。" - 67 "你长途规则需要您的电话卡长途访问号码。" - 68 "您的国际规则需要您的电话卡国际访问号码。" + 49 "拨号。" + 50 "拨长途电话。" + 51 "拨国际长途。" + 52 "拨打本地电话。" + 53 "没有定义如何使用这个电话卡的规则。" + 54 "您必须输入此位置的长途电话公司代码。" + 55 "您必须输入这个位置的名称。" + 56 "您必须输入这个位置的区号。" + 57 "您必须选择要拨的号码才能禁用呼叫等待。" + 58 "您必须选择您的拨号所在地的国家(地区)。" + 59 "缺少信息" + 60 "您键入的位置名称已经处于使用中。请键入一个唯一的名称。" + 61 "这个电话卡丢失了一些所需的信息。要使用这个卡，请单击“编辑”以提供详细信息，或选择另一个卡。" + 62 "您必须选择一个默认电话卡。从列表中选择一个卡，或单击“新建”创建一个新卡。" + 63 "您必须键入电话卡的名称。" + 64 "您必须键入帐户号码。" + 65 "您必须键入 PIN 号。" + 66 "这个电话卡没有定义规则。要创建一个规则，请选择长途、国际或本地呼叫选项卡。" + 67 "您的长途规则需要您的电话卡的长途访问号码。" + 68 "您的国际规则需要您的电话卡的国际访问号码。" 69 "您的本地规则需要您的电话卡的本地访问号码。" 70 "无" - 71 "确实要删除选定的电话服务提供程序吗?" - 72 "< 没有服务提供商安装 >" - 73 "您必须输入此规则适用的前缀。" - 74 "数字:(&D)" - 75 "前缀:(&P)" - 76 "你试着输入一个无效字符。\n\n有效的字符是 0 至 9，空格和逗号。" + 71 "确实想删除选定的电话服务提供程序吗?" + 72 "<未安装服务提供程序>" + 73 "您必须键入使用这个规则的前缀。" + 74 "数字(&D):" + 75 "前缀(&P):" + 76 "您尝试键入一个无效的字符。\n\n有效的字符为从 0 至 9 之间的数字和空格。" 77 "确认删除" - 78 "是否确实要删除此位置?" - 79 "确实要删除此电话卡吗?" - 80 "是否确实要删除此区号规则?" - 81 "您必须输入要拨打的号码。" - 82 "您输入的电话卡名称已在使用。请输入一个唯一的名称。" - 83 "ReactOS 需要从中你将拨号的位置电话信息。如果您取消没有提供此信息，此程序可能无法正常拨号时。此外，一些应用程序响应您取消此对话框由立即重新发布它。\n确实要取消吗?" + 78 "您确实是要删除这个位置吗?" + 79 "您确实是要删除这个电话卡吗?" + 80 "您确实是要删除这个区号编码规则吗?" + 81 "您必须键入数字号码才可拨号。" + 82 "您键入的电话卡名称已经处于使用中。请键入一个唯一的名称。" + 83 "ReactOS 需要有关您拨号位置的电话信息才能正常运行。如果您不提供这个信息而取消，此程序在拨号时可能不能正常运行。而且，某些应用程序对您取消这个对话框的反应是立即重新发布它。\n您确实要取消吗?" 84 "确认取消" 85 "我的位置" - 86 "< 没有服务提供商可用于安装 >" + 86 "<此安装没有可用的服务提供程序>" 87 "您输入的字符无效。\n\n有效的字符是 0 到 9，A 到 D，*，#，+，!，空格和逗号。" - 88 "您必须输入此位置国际承运人代码。" - 89 "您必须输入此位置的承运人代码。" - 90 "此页正在尝试进行或监视电话呼叫或其他多媒体连接您的计算机上。\n您想允许它继续吗?" - 91 "此页正在尝试访问您的网络上的目录信息。\n你想允许它继续吗?" - 92 "此页尝试访问或更改网络会议信息。\n你想允许它继续吗?" - 93 "此页尝试访问或更改注册表信息。\n你想允许它继续吗?" - 1064 "不能打开电话和调制解调器控制面板。你可能有问题启动电话服务。" + 88 "您必须键入此位置的国际电话公司代码。" + 89 "您必须键入此位置的电话公司代码。" + 90 "此页尝试在您的计算机上进行或监视电话呼叫或其他多媒体连接。\n您想允许它继续吗?" + 91 "此页尝试访问您的网络上的目录信息。\n您想允许它继续吗?" + 92 "此页尝试访问或更改网络会议信息。\n您想允许它继续吗?" + 93 "此页尝试访问或更改注册表信息。\n您想允许它继续吗?" + 1064 "不能打开电话和调制解调器控制面板。您开始电话服务可能有问题。" 1065 "删除提供商" 15800 "23" - 15801 "0,""None (Direct Dial)"","""","""","""","""","""","""","""","""",1" + 15801 "0,""无 (直接拨)"","""","""","""","""","""","""","""","""",1" 15802 "1,""AT&T Direct Dial via 1010ATT1"","""",""G"",""J1FG"",""J011EFG"","""","""",""1010288"",""1010288"",1" 15803 "2,""AT&T via 1010ATT0"","""",""G"",""J0FG$TH"",""J01EFG$TH"","""","""",""1010288"",""1010288"",1" 15804 "3,""AT&T via 1-800-321-0288"","""",""G"",""J$TFG$TH"",""J$T01EFG$TH"","""","""",""18003210288"",""18003210288"",1"

1 0

[reactos] 01/01: [SHELL32] CMenuToolbarBase: Use COLOR_MENUTEXT color for the text color in normal menu items. CORE-13855
by Giannis Adamopoulos 05 Jan '18

05 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6719230378fd49e61059… commit a6719230378fd49e610593c2b7e45ac331017c86 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Fri Jan 5 11:53:35 2018 +0200 [SHELL32] CMenuToolbarBase: Use COLOR_MENUTEXT color for the text color in normal menu items. CORE-13855 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 40dd12fc9a..909c5fb21f 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -206,6 +206,9 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } else { + // Set the text color, will be used by the internal drawing code + cdraw->clrText = GetSysColor(COLOR_MENUTEXT); + // Remove HOT and CHECKED flags (will restore HOT if necessary) cdraw->nmcd.uItemState &= ~CDIS_HOT;

1 0

[reactos] 01/01: [COMCTL32] tab: Use DrawThemeText when drawing text with themes. CORE-13855
by Giannis Adamopoulos 04 Jan '18

04 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695147eaacf99d47e771b… commit 695147eaacf99d47e771b063cd896b5379488ca8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 4 23:25:37 2018 +0200 [COMCTL32] tab: Use DrawThemeText when drawing text with themes. CORE-13855 --- dll/win32/comctl32/tab.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dll/win32/comctl32/tab.c b/dll/win32/comctl32/tab.c index 0a191c04c7..c5e3a8672f 100644 --- a/dll/win32/comctl32/tab.c +++ b/dll/win32/comctl32/tab.c @@ -1534,6 +1534,9 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect HPEN holdPen; INT oldBkMode; HFONT hOldFont; +#ifdef __REACTOS__ +HTHEME theme = GetWindowTheme (infoPtr->hwnd); +#endif /* if (drawRect == NULL) */ { @@ -1904,6 +1907,29 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect TRACE("for <%s>, c_o_h=%d, c_o_v=%d, draw=(%s), textlen=%d\n", debugstr_w(item->pszText), center_offset_h, center_offset_v, wine_dbgstr_rect(drawRect), (rcText.right-rcText.left)); +#ifdef __REACTOS__ + if (theme && item->pszText) + { + int partIndex = iItem == infoPtr->iSelected ? TABP_TABITEM : TABP_TOPTABITEM; + int stateId = TIS_NORMAL; + + if (iItem == infoPtr->iSelected) + stateId = TIS_SELECTED; + else if (iItem == infoPtr->iHotTracked) + stateId = TIS_HOT; + else if (iItem == infoPtr->uFocus) + stateId = TIS_FOCUSED; + + DrawThemeText(theme, + hdc, + partIndex, + stateId, + item->pszText, + lstrlenW(item->pszText), + DT_LEFT | DT_SINGLELINE, 0, drawRect); + } + else +#endif if (item->pszText) { DrawTextW

1 0

[reactos] 01/01: [USETUP] When overwriting a file, if open fails, it might be because the file is readonly. In such situation, try to drop the readonly attribute before overwritting the file.
by Pierre Schweitzer 04 Jan '18

04 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82f44a2107d7eb79f1e3a… commit 82f44a2107d7eb79f1e3a4af196e2e007a166e57 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Jan 4 21:47:59 2018 +0100 [USETUP] When overwriting a file, if open fails, it might be because the file is readonly. In such situation, try to drop the readonly attribute before overwritting the file. This fixes setup not being able to overwrite FAT bootcode when reusing a FAT partition already installed without reformatting. CORE-14158 --- base/setup/usetup/filesup.c | 68 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index bed30c418d..65a372a337 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -348,8 +348,72 @@ SetupCopyFile( 0); if (!NT_SUCCESS(Status)) { - DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); - goto unmapsrcsec; + /* Open may have failed because the file to overwrite + * is in readonly mode + */ + if (Status == STATUS_ACCESS_DENIED) + { + FILE_BASIC_INFORMATION FileBasicInfo; + + /* Reattempt to open it */ + Status = NtCreateFile(&FileHandleDest, + GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OPEN, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + /* Fail for real if we cannot open it that way + * XXX: actually, we should try to refine access rights + * to only have write_attributes, should be enough + */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); + goto unmapsrcsec; + } + + /* Zero our basic info, just to set attributes */ + RtlZeroMemory(&FileBasicInfo, sizeof(FileBasicInfo)); + /* Reset attributes to normal, no read-only */ + FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + /* We basically don't care about whether it succeed: + * if it didn't, later open will fail + */ + NtSetInformationFile(FileHandleDest, &IoStatusBlock, &FileBasicInfo, + sizeof(FileBasicInfo), FileBasicInformation); + + /* Close file */ + NtClose(FileHandleDest); + + /* And re-attempt overwrite */ + Status = NtCreateFile(&FileHandleDest, + GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + 0, + FILE_OVERWRITE_IF, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + } + + /* We failed */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateFile failed: %x, %wZ\n", Status, &FileName); + goto unmapsrcsec; + } } RegionSize = (ULONG)PAGE_ROUND_UP(FileStandard.EndOfFile.u.LowPart);

1 0

[reactos] 01/01: [NTOS:EX] Don't dereference ExpCritSecOutOfMemoryEvent when it was never referenced.
by Timo Kreuzer 04 Jan '18

04 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f555c102b79f675c57118… commit f555c102b79f675c571187c84a54b76b5bd9e652 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 22 10:57:40 2017 +0200 [NTOS:EX] Don't dereference ExpCritSecOutOfMemoryEvent when it was never referenced. --- ntoskrnl/ex/keyedevt.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ex/keyedevt.c b/ntoskrnl/ex/keyedevt.c index 6bb2769e34..110b2c3ee7 100644 --- a/ntoskrnl/ex/keyedevt.c +++ b/ntoskrnl/ex/keyedevt.c @@ -457,8 +457,11 @@ NtWaitForKeyedEvent( /* Do the wait */ Status = ExpWaitForKeyedEvent(KeyedEvent, Key, Alertable, Timeout); - /* Dereference the keyed event */ - ObDereferenceObject(KeyedEvent); + if (Handle != NULL) + { + /* Dereference the keyed event */ + ObDereferenceObject(KeyedEvent); + } /* Return the status */ return Status; @@ -523,8 +526,11 @@ NtReleaseKeyedEvent( /* Do the wait */ Status = ExpReleaseKeyedEvent(KeyedEvent, Key, Alertable, Timeout); - /* Dereference the keyed event */ - ObDereferenceObject(KeyedEvent); + if (Handle != NULL) + { + /* Dereference the keyed event */ + ObDereferenceObject(KeyedEvent); + } /* Return the status */ return Status;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs