Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 06/06: [RTL] Fix RtlNewSecurityGrantedAccess improperly zeroing output buffer

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4d25d27f67194a236e60… commit c4d25d27f67194a236e60e556925e4ff288a1b3c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Dec 31 11:11:43 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 11:19:36 2018 +0100 [RTL] Fix RtlNewSecurityGrantedAccess improperly zeroing output buffer --- sdk/lib/rtl/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/rtl/security.c b/sdk/lib/rtl/security.c index b6127a034b..c2f5deebfc 100644 --- a/sdk/lib/rtl/security.c +++ b/sdk/lib/rtl/security.c @@ -673,7 +673,7 @@ RtlNewSecurityGrantedAccess(IN ACCESS_MASK DesiredAccess, } /* Check if the SACL right was granted... */ - RtlZeroMemory(&Privileges, Size); + RtlZeroMemory(Privileges, Size); if (Granted) { /* Yes, return it in the structure */

5 years, 8 months

[reactos] 05/06: [IPHLPAPI] Add support for service tags in GetOwnerModuleFromTcp/UdpEntry

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa55bb1bd38607ce2e2fa… commit aa55bb1bd38607ce2e2fa1759e502fd42a8fdb55 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 31 11:08:28 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 11:19:36 2018 +0100 [IPHLPAPI] Add support for service tags in GetOwnerModuleFromTcp/UdpEntry If a service tag is set in owner information, then, we'll query advapi32 and thus services to get the service name instead of the image name --- dll/win32/iphlpapi/iphlpapi_main.c | 98 +++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/dll/win32/iphlpapi/iphlpapi_main.c b/dll/win32/iphlpapi/iphlpapi_main.c index 162731c420..83d53d2b10 100644 --- a/dll/win32/iphlpapi/iphlpapi_main.c +++ b/dll/win32/iphlpapi/iphlpapi_main.c @@ -2347,6 +2347,84 @@ static DWORD GetOwnerModuleFromPidEntry(DWORD OwningPid, TCPIP_OWNER_MODULE_INFO return NO_ERROR; } +static DWORD GetOwnerModuleFromTagEntry(DWORD OwningPid, DWORD OwningTag, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) +{ + UINT Size; + HRESULT Res; + HANDLE hAdvapi32; + WCHAR SysDir[MAX_PATH]; + PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo; + ULONG (NTAPI *_I_QueryTagInformation)(PVOID, DWORD, PVOID); + struct + { + DWORD ProcessId; + DWORD ServiceTag; + DWORD TagType; + PWSTR Buffer; + } ServiceQuery; + + /* First, secure (avoid injections) load advapi32.dll */ + Size = GetSystemDirectoryW(SysDir, MAX_PATH); + if (Size == 0) + { + return GetLastError(); + } + + Res = StringCchCatW(&SysDir[Size], MAX_PATH - Size, L"\\advapi32.dll"); + if (FAILED(Res)) + { + return Res; + } + + hAdvapi32 = GetModuleHandleW(SysDir); + if (hAdvapi32 == NULL) + { + return GetLastError(); + } + + /* Now, we'll query the service associated with the tag */ + _I_QueryTagInformation = (PVOID)GetProcAddress(hAdvapi32, "I_QueryTagInformation"); + if (_I_QueryTagInformation == NULL) + { + return GetLastError(); + } + + /* Set tag and PID for the query */ + ServiceQuery.ProcessId = OwningPid; + ServiceQuery.ServiceTag = OwningTag; + ServiceQuery.TagType = 0; + ServiceQuery.Buffer = NULL; + + /* And query */ + Res = _I_QueryTagInformation(NULL, 1, &ServiceQuery); + if (Res != ERROR_SUCCESS) + { + return Res; + } + + /* Compute service name length */ + Size = wcslen(ServiceQuery.Buffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* We'll copy it twice, so make sure we have enough room */ + if (*pdwSize < sizeof(TCPIP_OWNER_MODULE_BASIC_INFO) + 2 * Size) + { + *pdwSize = sizeof(TCPIP_OWNER_MODULE_BASIC_INFO) + 2 * Size; + LocalFree(ServiceQuery.Buffer); + return ERROR_INSUFFICIENT_BUFFER; + } + + /* Copy back data */ + BasicInfo = Buffer; + BasicInfo->pModuleName = (PVOID)((ULONG_PTR)BasicInfo + sizeof(TCPIP_OWNER_MODULE_BASIC_INFO)); + BasicInfo->pModulePath = (PVOID)((ULONG_PTR)BasicInfo->pModuleName + Size); + wcscpy(BasicInfo->pModuleName, ServiceQuery.Buffer); + wcscpy(BasicInfo->pModulePath, ServiceQuery.Buffer); + *pdwSize = sizeof(TCPIP_OWNER_MODULE_BASIC_INFO) + 2 * Size; + LocalFree(ServiceQuery.Buffer); + + return NO_ERROR; +} + /****************************************************************** * GetOwnerModuleFromTcpEntry (IPHLPAPI.@) * @@ -2368,7 +2446,15 @@ static DWORD GetOwnerModuleFromPidEntry(DWORD OwningPid, TCPIP_OWNER_MODULE_INFO */ DWORD WINAPI GetOwnerModuleFromTcpEntry( PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) { - return GetOwnerModuleFromPidEntry(pTcpEntry->dwOwningPid, Class, Buffer, pdwSize); + /* If we have a service tag, that's a service connection */ + if (pTcpEntry->OwningModuleInfo[0] != 0) + { + return GetOwnerModuleFromTagEntry(pTcpEntry->dwOwningPid, (DWORD)(pTcpEntry->OwningModuleInfo[0]), Class, Buffer, pdwSize); + } + else + { + return GetOwnerModuleFromPidEntry(pTcpEntry->dwOwningPid, Class, Buffer, pdwSize); + } } /****************************************************************** @@ -2392,7 +2478,15 @@ DWORD WINAPI GetOwnerModuleFromTcpEntry( PMIB_TCPROW_OWNER_MODULE pTcpEntry, TCP */ DWORD WINAPI GetOwnerModuleFromUdpEntry( PMIB_UDPROW_OWNER_MODULE pUdpEntry, TCPIP_OWNER_MODULE_INFO_CLASS Class, PVOID Buffer, PDWORD pdwSize) { - return GetOwnerModuleFromPidEntry(pUdpEntry->dwOwningPid, Class, Buffer, pdwSize); + /* If we have a service tag, that's a service connection */ + if (pUdpEntry->OwningModuleInfo[0] != 0) + { + return GetOwnerModuleFromTagEntry(pUdpEntry->dwOwningPid, (DWORD)(pUdpEntry->OwningModuleInfo[0]), Class, Buffer, pdwSize); + } + else + { + return GetOwnerModuleFromPidEntry(pUdpEntry->dwOwningPid, Class, Buffer, pdwSize); + } } static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server, PVOID Data)

5 years, 8 months

[reactos] 04/06: [TCPIP] Return the SubProcessTag when enumerating connections with owner class

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96985e0746fef1fffe45a… commit 96985e0746fef1fffe45ad8274a4533eb0aea14c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 31 10:35:40 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 11:19:36 2018 +0100 [TCPIP] Return the SubProcessTag when enumerating connections with owner class --- drivers/network/tcpip/tcpip/ninfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 8ad01fb413..cb88a2110d 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -251,8 +251,8 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, { if (Class == TcpUdpClassOwner) { - /* FIXME */ RtlZeroMemory(&TcpRow.OwningModuleInfo[0], sizeof(TcpRow.OwningModuleInfo)); + TcpRow.OwningModuleInfo[0] = (ULONG_PTR)AddrFile->SubProcessTag; } Status = InfoCopyOut( (PCHAR)&TcpRow, Size, @@ -295,8 +295,8 @@ TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile, UdpRow.dwFlags = 0; /* FIXME */ if (Class == TcpUdpClassOwner) { - /* FIXME */ RtlZeroMemory(&UdpRow.OwningModuleInfo[0], sizeof(UdpRow.OwningModuleInfo)); + UdpRow.OwningModuleInfo[0] = (ULONG_PTR)AddrFile->SubProcessTag; } Status = InfoCopyOut( (PCHAR)&UdpRow,

5 years, 8 months

[reactos] 03/06: [TCPIP] Save the SubProcessTag when an ADDRESS_FILE is created

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d98001de17b9988296e56… commit d98001de17b9988296e56c223b0344d58686912e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 31 10:21:14 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 11:19:35 2018 +0100 [TCPIP] Save the SubProcessTag when an ADDRESS_FILE is created --- drivers/network/tcpip/include/titypes.h | 1 + drivers/network/tcpip/tcpip/fileobjs.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/drivers/network/tcpip/include/titypes.h b/drivers/network/tcpip/include/titypes.h index e63fad2821..3f75976b4e 100644 --- a/drivers/network/tcpip/include/titypes.h +++ b/drivers/network/tcpip/include/titypes.h @@ -155,6 +155,7 @@ typedef struct _ADDRESS_FILE { IP_ADDRESS AddrCache; /* One entry address cache (destination address of last packet transmitted) */ HANDLE ProcessId; /* Creator process ID */ + PVOID SubProcessTag; /* Creator process tag */ LARGE_INTEGER CreationTime; /* Time of creation */ /* The following members are used to control event notification */ diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c index 30a3939e2b..400f956034 100644 --- a/drivers/network/tcpip/tcpip/fileobjs.c +++ b/drivers/network/tcpip/tcpip/fileobjs.c @@ -10,6 +10,10 @@ #include "precomp.h" +/* FIXME: including pstypes.h without ntifs fails */ +#include <ntifs.h> +#include <ndk/pstypes.h> + /* Uncomment for logging of connections and address files every 10 seconds */ //#define LOG_OBJECTS @@ -425,6 +429,7 @@ NTSTATUS FileOpenAddress( AddrFile->BCast = 1; AddrFile->HeaderIncl = 1; AddrFile->ProcessId = PsGetCurrentProcessId(); + AddrFile->SubProcessTag = ((PTEB)PsGetCurrentThreadTeb())->SubProcessTag; KeQuerySystemTime(&AddrFile->CreationTime); /* Make sure address is a local unicast address or 0 */

5 years, 8 months

[reactos] 02/06: [SDK] Add PsGetCurrentThreadTeb() to the DDK

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a93d83f925f700c4a436… commit 1a93d83f925f700c4a436edca476def1937fd843 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 30 22:47:36 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 11:19:35 2018 +0100 [SDK] Add PsGetCurrentThreadTeb() to the DDK --- ntoskrnl/ps/thread.c | 2 +- sdk/include/xdk/psfuncs.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ps/thread.c b/ntoskrnl/ps/thread.c index 8b0099823b..8045dfba70 100644 --- a/ntoskrnl/ps/thread.c +++ b/ntoskrnl/ps/thread.c @@ -780,7 +780,7 @@ PsGetThreadTeb(IN PETHREAD Thread) /* * @implemented */ -PTEB +PVOID NTAPI PsGetCurrentThreadTeb(VOID) { diff --git a/sdk/include/xdk/psfuncs.h b/sdk/include/xdk/psfuncs.h index fabf9e2324..b59dee4c96 100644 --- a/sdk/include/xdk/psfuncs.h +++ b/sdk/include/xdk/psfuncs.h @@ -327,6 +327,14 @@ PsGetThreadProcessId( IN PETHREAD Thread); #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ +#if (NTDDI_VERSION >= NTDDI_WS03SP1) +NTKERNELAPI +PVOID +NTAPI +PsGetCurrentThreadTeb( + VOID); +#endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */ + #if (NTDDI_VERSION >= NTDDI_VISTA) NTKERNELAPI

5 years, 8 months

[reactos] 01/06: [ADVAPI32_APITEST] Add tests showing that first field of OwningModuleInfo is the tag

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abb6fd83a482deeb9eefa… commit abb6fd83a482deeb9eefa3b31bd52d45217ef66d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 30 22:36:54 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Dec 31 11:19:29 2018 +0100 [ADVAPI32_APITEST] Add tests showing that first field of OwningModuleInfo is the tag Also, show that querying owner information about a connection owned by a service returns the service name, and not the image nor its path. Obviously, that fails in ReactOS. --- modules/rostests/apitests/advapi32/CMakeLists.txt | 3 +- .../rostests/apitests/advapi32/ServiceNetwork.c | 449 +++++++++++++++++++++ modules/rostests/apitests/advapi32/testlist.c | 2 + 3 files changed, 453 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/advapi32/CMakeLists.txt b/modules/rostests/apitests/advapi32/CMakeLists.txt index e34f682676..8d7e56084c 100644 --- a/modules/rostests/apitests/advapi32/CMakeLists.txt +++ b/modules/rostests/apitests/advapi32/CMakeLists.txt @@ -16,12 +16,13 @@ list(APPEND SOURCE SaferIdentifyLevel.c ServiceArgs.c ServiceEnv.c + ServiceNetwork.c svchlp.c precomp.h) add_executable(advapi32_apitest ${SOURCE} testlist.c) target_link_libraries(advapi32_apitest wine ${PSEH_LIB}) set_module_type(advapi32_apitest win32cui) -add_importlibs(advapi32_apitest advapi32 msvcrt kernel32 ntdll) +add_importlibs(advapi32_apitest advapi32 iphlpapi ws2_32 msvcrt kernel32 ntdll) add_pch(advapi32_apitest precomp.h SOURCE) add_rostests_file(TARGET advapi32_apitest) diff --git a/modules/rostests/apitests/advapi32/ServiceNetwork.c b/modules/rostests/apitests/advapi32/ServiceNetwork.c new file mode 100644 index 0000000000..6b5a5676ac --- /dev/null +++ b/modules/rostests/apitests/advapi32/ServiceNetwork.c @@ -0,0 +1,449 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for service networking + * PROGRAMMER: Pierre Schweitzer + */ + +#include "precomp.h" + +#include "svchlp.h" + +#define WIN32_NO_STATUS +#include <iphlpapi.h> +#include <winsock2.h> + +/*** Service part of the test ***/ + +static SERVICE_STATUS_HANDLE status_handle; + +static void +report_service_status(DWORD dwCurrentState, + DWORD dwWin32ExitCode, + DWORD dwWaitHint) +{ + BOOL res; + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + status.dwCurrentState = dwCurrentState; + status.dwWin32ExitCode = dwWin32ExitCode; + status.dwWaitHint = dwWaitHint; + + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + + if ( (dwCurrentState == SERVICE_START_PENDING) || + (dwCurrentState == SERVICE_STOP_PENDING) || + (dwCurrentState == SERVICE_STOPPED) ) + { + status.dwControlsAccepted = 0; + } + else + { + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + } + +#if 0 + if ( (dwCurrentState == SERVICE_RUNNING) || (dwCurrentState == SERVICE_STOPPED) ) + status.dwCheckPoint = 0; + else + status.dwCheckPoint = dwCheckPoint++; +#endif + + res = SetServiceStatus(status_handle, &status); + service_ok(res, "SetServiceStatus(%d) failed: %lu\n", dwCurrentState, GetLastError()); +} + +static VOID WINAPI service_handler(DWORD ctrl) +{ + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + report_service_status(SERVICE_STOP_PENDING, NO_ERROR, 0); + default: + report_service_status(SERVICE_RUNNING, NO_ERROR, 0); + } +} + +static DWORD GetExtendedTcpTableWithAlloc(PVOID *TcpTable, BOOL Order, DWORD Family, TCP_TABLE_CLASS Class) +{ + DWORD ret; + DWORD Size = 0; + + *TcpTable = NULL; + + ret = GetExtendedTcpTable(*TcpTable, &Size, Order, Family, Class, 0); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + *TcpTable = HeapAlloc(GetProcessHeap(), 0, Size); + if (*TcpTable == NULL) + { + return ERROR_OUTOFMEMORY; + } + + ret = GetExtendedTcpTable(*TcpTable, &Size, Order, Family, Class, 0); + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, *TcpTable); + *TcpTable = NULL; + } + } + + return ret; +} + +static DWORD GetExtendedUdpTableWithAlloc(PVOID *UdpTable, BOOL Order, DWORD Family, UDP_TABLE_CLASS Class) +{ + DWORD ret; + DWORD Size = 0; + + *UdpTable = NULL; + + ret = GetExtendedUdpTable(*UdpTable, &Size, Order, Family, Class, 0); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + *UdpTable = HeapAlloc(GetProcessHeap(), 0, Size); + if (*UdpTable == NULL) + { + return ERROR_OUTOFMEMORY; + } + + ret = GetExtendedUdpTable(*UdpTable, &Size, Order, Family, Class, 0); + if (ret != NO_ERROR) + { + HeapFree(GetProcessHeap(), 0, *UdpTable); + *UdpTable = NULL; + } + } + + return ret; +} + +static void +test_tcp(LPWSTR svc_name, DWORD service_tag) +{ + SOCKET sock; + SOCKADDR_IN server; + PMIB_TCPTABLE_OWNER_MODULE TcpTableOwnerMod; + DWORD i, ret; + BOOLEAN Found; + DWORD Pid = GetCurrentProcessId(); + + sock = socket(AF_INET, SOCK_STREAM, 0); + service_ok(sock != INVALID_SOCKET, "Socket creation failed!\n"); + + ZeroMemory(&server, sizeof(SOCKADDR_IN)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(9876); + + ret = bind(sock, (SOCKADDR*)&server, sizeof(SOCKADDR_IN)); + service_ok(ret != SOCKET_ERROR, "binding failed\n"); + + ret = listen(sock, SOMAXCONN); + service_ok(ret != SOCKET_ERROR, "listening failed\n"); + + ret = GetExtendedTcpTableWithAlloc((PVOID *)&TcpTableOwnerMod, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER); + service_ok(ret == ERROR_SUCCESS, "GetExtendedTcpTableWithAlloc failed: %x\n", ret); + if (ret == ERROR_SUCCESS) + { + service_ok(TcpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < TcpTableOwnerMod->dwNumEntries; ++i) + { + if (TcpTableOwnerMod->table[i].dwState == MIB_TCP_STATE_LISTEN && + TcpTableOwnerMod->table[i].dwLocalAddr == 0 && + TcpTableOwnerMod->table[i].dwLocalPort == htons(9876) && + TcpTableOwnerMod->table[i].dwRemoteAddr == 0) + { + Found = TRUE; + break; + } + } + + service_ok(Found, "Our socket wasn't found!\n"); + if (Found) + { + DWORD Size = 0; + PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo = NULL; + + service_ok(TcpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + service_ok((DWORD)(TcpTableOwnerMod->table[i].OwningModuleInfo[0]) == service_tag, "Invalid tag: %x - %x\n", (DWORD)TcpTableOwnerMod->table[i].OwningModuleInfo[0], service_tag); + + ret = GetOwnerModuleFromTcpEntry(&TcpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size); + service_ok(ret == ERROR_INSUFFICIENT_BUFFER, "GetOwnerModuleFromTcpEntry failed with: %x\n", ret); + if (ERROR_INSUFFICIENT_BUFFER == ERROR_INSUFFICIENT_BUFFER) + { + BasicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); + service_ok(BasicInfo != NULL, "HeapAlloc failed\n"); + + ret = GetOwnerModuleFromTcpEntry(&TcpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size); + service_ok(ret == ERROR_SUCCESS, "GetOwnerModuleFromTcpEntry failed with: %x\n", ret); + service_ok(_wcsicmp(svc_name, BasicInfo->pModulePath) == 0, "Mismatching names (%S, %S)\n", svc_name, BasicInfo->pModulePath); + service_ok(_wcsicmp(svc_name, BasicInfo->pModuleName) == 0, "Mismatching names (%S, %S)\n", svc_name, BasicInfo->pModuleName); + } + } + + HeapFree(GetProcessHeap(), 0, TcpTableOwnerMod); + } + + closesocket(sock); +} + +static void +test_udp(LPWSTR svc_name, DWORD service_tag) +{ + SOCKET sock; + SOCKADDR_IN server; + PMIB_UDPTABLE_OWNER_MODULE UdpTableOwnerMod; + DWORD i, ret; + BOOLEAN Found; + DWORD Pid = GetCurrentProcessId(); + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + service_ok(sock != INVALID_SOCKET, "Socket creation failed!\n"); + + ZeroMemory(&server, sizeof(SOCKADDR_IN)); + server.sin_family = AF_INET; + server.sin_addr.s_addr = htonl(INADDR_ANY); + server.sin_port = htons(9876); + + ret = bind(sock, (SOCKADDR*)&server, sizeof(SOCKADDR_IN)); + service_ok(ret != SOCKET_ERROR, "binding failed\n"); + + ret = GetExtendedUdpTableWithAlloc((PVOID *)&UdpTableOwnerMod, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE); + service_ok(ret == ERROR_SUCCESS, "GetExtendedUdpTableWithAlloc failed: %x\n", ret); + if (ret == ERROR_SUCCESS) + { + service_ok(UdpTableOwnerMod->dwNumEntries > 0, "No TCP connections?!\n"); + + Found = FALSE; + for (i = 0; i < UdpTableOwnerMod->dwNumEntries; ++i) + { + if (UdpTableOwnerMod->table[i].dwLocalAddr == 0 && + UdpTableOwnerMod->table[i].dwLocalPort == htons(9876)) + { + Found = TRUE; + break; + } + } + + service_ok(Found, "Our socket wasn't found!\n"); + if (Found) + { + DWORD Size = 0; + PTCPIP_OWNER_MODULE_BASIC_INFO BasicInfo = NULL; + + service_ok(UdpTableOwnerMod->table[i].dwOwningPid == Pid, "Invalid owner\n"); + service_ok((DWORD)(UdpTableOwnerMod->table[i].OwningModuleInfo[0]) == service_tag, "Invalid tag: %x - %x\n", (DWORD)UdpTableOwnerMod->table[i].OwningModuleInfo[0], service_tag); + + ret = GetOwnerModuleFromUdpEntry(&UdpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size); + service_ok(ret == ERROR_INSUFFICIENT_BUFFER, "GetOwnerModuleFromUdpEntry failed with: %x\n", ret); + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + BasicInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); + service_ok(BasicInfo != NULL, "HeapAlloc failed\n"); + + ret = GetOwnerModuleFromUdpEntry(&UdpTableOwnerMod->table[i], TCPIP_OWNER_MODULE_INFO_BASIC, BasicInfo, &Size); + service_ok(ret == ERROR_SUCCESS, "GetOwnerModuleFromUdpEntry failed with: %x\n", ret); + service_ok(_wcsicmp(svc_name, BasicInfo->pModulePath) == 0, "Mismatching names (%S, %S)\n", svc_name, BasicInfo->pModulePath); + service_ok(_wcsicmp(svc_name, BasicInfo->pModuleName) == 0, "Mismatching names (%S, %S)\n", svc_name, BasicInfo->pModuleName); + } + } + + HeapFree(GetProcessHeap(), 0, UdpTableOwnerMod); + } + + closesocket(sock); +} + +static void WINAPI +service_main(DWORD dwArgc, LPWSTR* lpszArgv) +{ + // SERVICE_STATUS_HANDLE status_handle; + PTEB Teb; + WSADATA wsaData; + + UNREFERENCED_PARAMETER(dwArgc); + + /* Register our service for control (lpszArgv[0] holds the service name) */ + status_handle = RegisterServiceCtrlHandlerW(lpszArgv[0], service_handler); + service_ok(status_handle != NULL, "RegisterServiceCtrlHandler failed: %lu\n", GetLastError()); + if (!status_handle) + return; + + /* Report SERVICE_RUNNING status */ + report_service_status(SERVICE_RUNNING, NO_ERROR, 4000); + + /* Check our tag is not 0 */ + Teb = NtCurrentTeb(); + service_ok(Teb->SubProcessTag != 0, "SubProcessTag is not defined!\n"); + + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { + skip("Failed to init WS2\n"); + goto quit; + } + + test_tcp(lpszArgv[0], (DWORD)Teb->SubProcessTag); + test_udp(lpszArgv[0], (DWORD)Teb->SubProcessTag); + + WSACleanup(); +quit: + /* Work is done */ + report_service_status(SERVICE_STOPPED, NO_ERROR, 0); +} + +static BOOL start_service(PCSTR service_nameA, PCWSTR service_nameW) +{ + BOOL res; + + SERVICE_TABLE_ENTRYW servtbl[] = + { + { (PWSTR)service_nameW, service_main }, + { NULL, NULL } + }; + + res = StartServiceCtrlDispatcherW(servtbl); + service_ok(res, "StartServiceCtrlDispatcherW failed: %lu\n", GetLastError()); + return res; +} + + +/*** Tester part of the test ***/ + +static void +my_test_server(PCSTR service_nameA, + PCWSTR service_nameW, + void *param) +{ + BOOL res; + SC_HANDLE hSC = NULL; + SC_HANDLE hService = NULL; + SERVICE_STATUS ServiceStatus; + + /* Open the SCM */ + hSC = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!hSC) + { + skip("OpenSCManagerW failed with error %lu!\n", GetLastError()); + return; + } + + /* First create ourselves as a service running in the default LocalSystem account */ + hService = register_service_exW(hSC, L"ServiceNetwork", service_nameW, NULL, + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_IGNORE, + NULL, NULL, NULL, + NULL, NULL); + if (!hService) + { + skip("CreateServiceW failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + /* Start it */ + if (!StartServiceW(hService, 0, NULL)) + { + skip("StartServiceW failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + /* Wait for the service to stop by itself */ + do + { + Sleep(100); + ZeroMemory(&ServiceStatus, sizeof(ServiceStatus)); + res = QueryServiceStatus(hService, &ServiceStatus); + } while (res && ServiceStatus.dwCurrentState != SERVICE_STOPPED); + ok(res, "QueryServiceStatus failed: %lu\n", GetLastError()); + ok(ServiceStatus.dwCurrentState == SERVICE_STOPPED, "ServiceStatus.dwCurrentState = %lx\n", ServiceStatus.dwCurrentState); + + /* Be sure the service is really stopped */ + res = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus); + if (!res && ServiceStatus.dwCurrentState != SERVICE_STOPPED && + ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && + GetLastError() != ERROR_SERVICE_NOT_ACTIVE) + { + skip("ControlService failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + +#if 0 + trace("Service stopped. Going to restart it...\n"); + + /* Now change the service configuration to make it start under the NetworkService account */ + if (!ChangeServiceConfigW(hService, + SERVICE_NO_CHANGE, + SERVICE_NO_CHANGE, + SERVICE_NO_CHANGE, + NULL, NULL, NULL, NULL, + L"NT AUTHORITY\\NetworkService", L"", + NULL)) + { + skip("ChangeServiceConfigW failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + /* Start it */ + if (!StartServiceW(hService, 0, NULL)) + { + skip("StartServiceW failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + /* Wait for the service to stop by itself */ + do + { + Sleep(100); + ZeroMemory(&ServiceStatus, sizeof(ServiceStatus)); + res = QueryServiceStatus(hService, &ServiceStatus); + } while (res && ServiceStatus.dwCurrentState != SERVICE_STOPPED); + ok(res, "QueryServiceStatus failed: %lu\n", GetLastError()); + ok(ServiceStatus.dwCurrentState == SERVICE_STOPPED, "ServiceStatus.dwCurrentState = %lx\n", ServiceStatus.dwCurrentState); + + /* Be sure the service is really stopped */ + res = ControlService(hService, SERVICE_CONTROL_STOP, &ServiceStatus); + if (!res && ServiceStatus.dwCurrentState != SERVICE_STOPPED && + ServiceStatus.dwCurrentState != SERVICE_STOP_PENDING && + GetLastError() != ERROR_SERVICE_NOT_ACTIVE) + { + skip("ControlService failed with error %lu!\n", GetLastError()); + goto Cleanup; + } +#endif + +Cleanup: + if (hService) + { + res = DeleteService(hService); + ok(res, "DeleteService failed: %lu\n", GetLastError()); + CloseServiceHandle(hService); + } + + if (hSC) + CloseServiceHandle(hSC); +} + +START_TEST(ServiceNetwork) +{ + int argc; + char** argv; + + /* Check whether this test is started as a separated service process */ + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + service_process(start_service, argc, argv); + return; + } + + /* We are started as the real test */ + test_runner(my_test_server, NULL); + // trace("Returned from test_runner\n"); +} diff --git a/modules/rostests/apitests/advapi32/testlist.c b/modules/rostests/apitests/advapi32/testlist.c index 536162388f..dadd2f6ac1 100644 --- a/modules/rostests/apitests/advapi32/testlist.c +++ b/modules/rostests/apitests/advapi32/testlist.c @@ -19,6 +19,7 @@ extern void func_RtlEncryptMemory(void); extern void func_SaferIdentifyLevel(void); extern void func_ServiceArgs(void); extern void func_ServiceEnv(void); +extern void func_ServiceNetwork(void); const struct test winetest_testlist[] = { @@ -38,6 +39,7 @@ const struct test winetest_testlist[] = { "SaferIdentifyLevel", func_SaferIdentifyLevel }, { "ServiceArgs", func_ServiceArgs }, { "ServiceEnv", func_ServiceEnv }, + { "ServiceNetwork", func_ServiceNetwork }, { 0, 0 } };

5 years, 8 months

[reactos] 01/01: [FONT][WIN32SS] Partially implement font/text rotation (#1207)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f757a135192c02a3c41d8… commit f757a135192c02a3c41d8da47eb9dba21d34ebd1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 31 18:56:43 2018 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 31 18:56:43 2018 +0900 [FONT][WIN32SS] Partially implement font/text rotation (#1207) Partially implement font/text rotation by LOGFONT.lfEscapement and improve the rendering image. If the angle was not a multiple of 90 degrees, then the background won't be filled. CORE-11848, CORE-15319 --- win32ss/gdi/ntgdi/freetype.c | 468 +++++++++++++++++++++++++++++-------------- 1 file changed, 323 insertions(+), 145 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3ac442e4ef..dc229a75d5 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -43,6 +43,7 @@ extern const MATRIX gmxWorldToDeviceDefault; extern const MATRIX gmxWorldToPageDefault; +static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; /* HACK!! Fix XFORMOBJ then use 1:16 / 16:1 */ #define gmxWorldToDeviceDefault gmxWorldToPageDefault @@ -650,33 +651,81 @@ InitFontSupport(VOID) return TRUE; } -VOID -FtSetCoordinateTransform( - FT_Face face, - PMATRIX pmx) +VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) { - FT_Matrix ftmatrix; - FLOATOBJ efTemp; + LONG tmAveCharWidth; + TT_OS2 *pOS2; + FT_Fixed XScale; + + *pmat = identityMat; + + if (lfWidth == 0) + return; + + ASSERT_FREETYPE_LOCK_HELD(); + pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2); + if (!pOS2) + return; + + XScale = face->size->metrics.x_scale; + tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6; + if (tmAveCharWidth == 0) + { + tmAveCharWidth = 1; + } + + if (lfWidth == tmAveCharWidth) + return; + + pmat->xx = (FT_Fixed)((1 << 16) * lfWidth / tmAveCharWidth); + pmat->xy = 0; + pmat->yx = 0; + pmat->yy = (FT_Fixed)(1 << 16); +} + +VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) +{ + double radian = (lfEscapement * M_PI) / 180 / 10; + + pmat->xx = (FT_Fixed)(cos(radian) * (1 << 16)); + pmat->xy = (FT_Fixed)(-sin(radian) * (1 << 16)); + pmat->yx = -pmat->xy; + pmat->yy = pmat->xx; +} + +VOID FASTCALL +FtMatrixFromMx(FT_Matrix *pmat, PMATRIX pmx) +{ + FLOATOBJ ef; /* Create a freetype matrix, by converting to 16.16 fixpoint format */ - efTemp = pmx->efM11; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); + ef = pmx->efM11; + FLOATOBJ_MulLong(&ef, 0x00010000); + pmat->xx = FLOATOBJ_GetLong(&ef); - efTemp = pmx->efM12; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); + ef = pmx->efM12; + FLOATOBJ_MulLong(&ef, 0x00010000); + pmat->xy = FLOATOBJ_GetLong(&ef); - efTemp = pmx->efM21; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); + ef = pmx->efM21; + FLOATOBJ_MulLong(&ef, 0x00010000); + pmat->yx = FLOATOBJ_GetLong(&ef); - efTemp = pmx->efM22; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); + ef = pmx->efM22; + FLOATOBJ_MulLong(&ef, 0x00010000); + pmat->yy = FLOATOBJ_GetLong(&ef); +} + +FORCEINLINE VOID FASTCALL +FtSetCoordinateTransform( + FT_Face face, + PMATRIX pmx) +{ + FT_Matrix mat; + FtMatrixFromMx(&mat, pmx); /* Set the transformation matrix */ - FT_Set_Transform(face, &ftmatrix, 0); + FT_Set_Transform(face, &mat, 0); } static BOOL @@ -3512,7 +3561,6 @@ ftGdiGetGlyphOutline( LPMAT2 pmat2, BOOL bIgnoreRotation) { - static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; PDC_ATTR pdcattr; PTEXTOBJ TextObj; PFONTGDI FontGDI; @@ -3639,25 +3687,10 @@ ftGdiGetGlyphOutline( /* World transform */ { FT_Matrix ftmatrix; - FLOATOBJ efTemp; PMATRIX pmx = DC_pmxWorldToDevice(dc); /* Create a freetype matrix, by converting to 16.16 fixpoint format */ - efTemp = pmx->efM11; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); - - efTemp = pmx->efM12; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); - - efTemp = pmx->efM21; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); - - efTemp = pmx->efM22; - FLOATOBJ_MulLong(&efTemp, 0x00010000); - ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); + FtMatrixFromMx(&ftmatrix, pmx); if (memcmp(&ftmatrix, &identityMat, sizeof(identityMat)) != 0) { @@ -3986,7 +4019,7 @@ TextIntGetTextExtentPoint(PDC dc, FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; INT error, glyph_index, i, previous; - ULONGLONG TotalWidth = 0; + ULONGLONG TotalWidth64 = 0; BOOL use_kerning; FT_Render_Mode RenderMode; BOOLEAN Render; @@ -4074,18 +4107,18 @@ TextIntGetTextExtentPoint(PDC dc, { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TotalWidth += delta.x; + TotalWidth64 += delta.x; } - TotalWidth += realglyph->root.advance.x >> 10; + TotalWidth64 += realglyph->root.advance.x >> 10; - if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit) + if (((TotalWidth64 + 32) >> 6) <= MaxExtent && NULL != Fit) { *Fit = i + 1; } if (NULL != Dx) { - Dx[i] = (TotalWidth + 32) >> 6; + Dx[i] = (TotalWidth64 + 32) >> 6; } /* Bold and italic do not use the cache */ @@ -4102,7 +4135,7 @@ TextIntGetTextExtentPoint(PDC dc, descender = FontGDI->tmDescent; /* Units below baseline */ IntUnLockFreeType(); - Size->cx = (TotalWidth + 32) >> 6; + Size->cx = (TotalWidth64 + 32) >> 6; Size->cy = ascender + descender; return TRUE; @@ -5571,6 +5604,14 @@ ScaleLong(LONG lValue, PFLOATOBJ pef) return lValue; } +FORCEINLINE LONG FASTCALL +IntNormalizeAngle(LONG nTenthAngle) +{ + const LONG nFullAngle = 360 * 10; + nTenthAngle %= nFullAngle; + return (nTenthAngle + nFullAngle) % nFullAngle; +} + BOOL APIENTRY GreExtTextOutW( @@ -5598,15 +5639,14 @@ GreExtTextOutW( FT_Face face; FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; - LONGLONG TextLeft, RealXStart; - ULONG TextTop, previous; + LONGLONG TextLeft64, TextTop64, TextWidth64, RealXStart64; + ULONG previous; FT_Bool use_kerning; RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; HBITMAP HSourceGlyph; SURFOBJ *SourceGlyphSurf; SIZEL bitSize; - INT yoff; FONTOBJ *FontObj; PFONTGDI FontGDI; PTEXTOBJ TextObj = NULL; @@ -5617,13 +5657,16 @@ GreExtTextOutW( BOOL DoBreak = FALSE; USHORT DxShift; PMATRIX pmxWorldToDevice; - LONG fixAscender, fixDescender; + LONG lfEscapement, lfWidth; FLOATOBJ Scale; LOGFONTW *plf; BOOL EmuBold, EmuItalic; int thickness; BOOL bResult; - ULONGLONG TextWidth; + INT DY1, DY2; + FT_Matrix mat1, mat2 = identityMat; + FT_Vector vecs[9]; + POINT pts[9]; /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) @@ -5685,7 +5728,7 @@ GreExtTextOutW( } IntLPtoDP(dc, &Start, 1); - RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; + RealXStart64 = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; YStart = Start.y + dc->ptlDCOrig.y; SourcePoint.x = 0; @@ -5762,6 +5805,15 @@ GreExtTextOutW( plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); + if (FT_IS_SCALABLE(face)) + { + lfEscapement = IntNormalizeAngle(plf->lfEscapement); + lfWidth = labs(plf->lfWidth); + } + else + { + lfEscapement = lfWidth = 0; + } if (Render) RenderMode = IntGetFontRenderMode(plf); @@ -5780,43 +5832,51 @@ GreExtTextOutW( { pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtSetCoordinateTransform(face, pmxWorldToDevice); - - fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6; - fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6; } else { pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; FtSetCoordinateTransform(face, pmxWorldToDevice); - - fixAscender = FontGDI->tmAscent << 6; - fixDescender = FontGDI->tmDescent << 6; } /* - * Process the vertical alignment and determine the yoff. + * Process the vertical alignment and determine DY1 and DY2. */ #define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) - yoff = 0; + { + DY1 = FontGDI->tmAscent; + DY2 = FontGDI->tmDescent; + } else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) - yoff = -(fixDescender >> 6); + { + DY1 = FontGDI->tmHeight; + DY2 = 0; + } else /* TA_TOP */ - yoff = fixAscender >> 6; + { + DY1 = 0; + DY2 = FontGDI->tmHeight; + } #undef VALIGN_MASK + IntWidthMatrix(face, &mat1, lfWidth); + FT_Matrix_Multiply(&mat1, &mat2); + FT_Set_Transform(face, &mat2, NULL); + /* * Calculate width of the text. */ - TextWidth = 0; + TextWidth64 = 0; DxShift = fuOptions & ETO_PDY ? 1 : 0; use_kerning = FT_HAS_KERNING(face); previous = 0; if ((fuOptions & ETO_OPAQUE) || - (pdcattr->lTextAlign & (TA_CENTER | TA_RIGHT))) + (pdcattr->lTextAlign & (TA_CENTER | TA_RIGHT)) || + lfEscapement || plf->lfUnderline || plf->lfStrikeOut) { - TextLeft = RealXStart; - TextTop = YStart; + TextLeft64 = RealXStart64; + TextTop64 = YStart << 6; for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); @@ -5850,28 +5910,28 @@ GreExtTextOutW( { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextLeft += delta.x; + TextLeft64 += delta.x; } if (Dx == NULL) { - TextLeft += realglyph->root.advance.x >> 10; + TextLeft64 += realglyph->root.advance.x >> 10; } else { - // FIXME this should probably be a matrix transform with TextTop as well. + // FIXME this should probably be a matrix transform with TextTop64 as well. Scale = pdcattr->mxWorldToDevice.efM11; if (FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale); /* do the shift before multiplying to preserve precision */ FLOATOBJ_MulLong(&Scale, Dx[i << DxShift] << 6); - TextLeft += FLOATOBJ_GetLong(&Scale); + TextLeft64 += FLOATOBJ_GetLong(&Scale); } if (DxShift) { - TextTop -= Dx[2 * i + 1] << 6; + TextTop64 -= Dx[2 * i + 1] << 6; } previous = glyph_index; @@ -5879,7 +5939,7 @@ GreExtTextOutW( FT_Done_Glyph((FT_Glyph)realglyph); } - TextWidth = TextLeft - RealXStart; + TextWidth64 = TextLeft64 - RealXStart64; } /* @@ -5887,13 +5947,13 @@ GreExtTextOutW( */ if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) { - RealXStart -= TextWidth / 2; + RealXStart64 -= TextWidth64 / 2; } else if ((pdcattr->lTextAlign & TA_RIGHT) == TA_RIGHT) { - RealXStart -= TextWidth; - if (((RealXStart + TextWidth + 32) >> 6) <= Start.x + dc->ptlDCOrig.x) - RealXStart += 1 << 6; + RealXStart64 -= TextWidth64; + if (((RealXStart64 + TextWidth64 + 32) >> 6) <= Start.x + dc->ptlDCOrig.x) + RealXStart64 += 1 << 6; } psurf = dc->dclevel.pSurface; @@ -5905,11 +5965,8 @@ GreExtTextOutW( if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) DC_vUpdateTextBrush(dc) ; - if (!face->units_per_EM) - { - thickness = 1; - } - else + thickness = 1; + if (face->units_per_EM) { thickness = face->underline_thickness * face->size->metrics.y_ppem / face->units_per_EM; @@ -5917,15 +5974,93 @@ GreExtTextOutW( thickness = 1; } + IntEscapeMatrix(&mat1, lfEscapement); + FT_Matrix_Multiply(&mat1, &mat2); + FT_Set_Transform(face, &mat2, NULL); + + // background rectangle + vecs[0].x = 0; + vecs[0].y = (DY1 - FontGDI->tmHeight) << 16; // Top Left + vecs[1].x = TextWidth64 << 10; + vecs[1].y = (DY1 - FontGDI->tmHeight) << 16; // Top Right + vecs[2].x = TextWidth64 << 10; + vecs[2].y = DY1 << 16; // Bottom Right + vecs[3].x = 0; + vecs[3].y = DY1 << 16; // Bottom Left + + // the starting point + vecs[4].x = 0; + vecs[4].y = (DY1 - FontGDI->tmAscent) << 16; + + // underline + if (plf->lfUnderline) + { + int position = 0; + if (face->units_per_EM) + { + position = face->underline_position * + face->size->metrics.y_ppem / face->units_per_EM; + } + vecs[5].x = 0; + vecs[5].y = (DY1 - FontGDI->tmAscent + position) << 16; + vecs[6].x = TextWidth64 << 10; + vecs[6].y = (DY1 - FontGDI->tmAscent + position) << 16; + } + + // strike through + if (plf->lfStrikeOut) + { + vecs[7].x = 0; + vecs[7].y = (DY1 - FontGDI->tmAscent + (FontGDI->tmAscent / 3)) << 16; + vecs[8].x = TextWidth64 << 10; + vecs[8].y = (DY1 - FontGDI->tmAscent + (FontGDI->tmAscent / 3)) << 16; + } + + // convert vecs to pts + for (i = 0; i < 9; ++i) + { + FT_Vector_Transform(&vecs[i], &mat1); + pts[i].x = (RealXStart64 >> 6) + (vecs[i].x >> 16); + pts[i].y = YStart - (vecs[i].y >> 16); + } + if (fuOptions & ETO_OPAQUE) { /* Draw background */ RECTL Rect; + INT X1 = ((RealXStart64 + 32) >> 6); - Rect.left = (RealXStart + 32) >> 6; - Rect.top = TextTop + yoff - ((fixAscender + 32) >> 6); - Rect.right = (RealXStart + TextWidth + 32) >> 6; - Rect.bottom = Rect.top + ((fixAscender + fixDescender) >> 6); + switch (lfEscapement) + { + case 0: + Rect.left = X1; + Rect.top = ((TextTop64 + 32) >> 6) - DY1; + Rect.right = (RealXStart64 + TextWidth64 + 32) >> 6; + Rect.bottom = ((TextTop64 + 32) >> 6) + DY2; + break; + case 90 * 10: + Rect.left = X1 - DY1; + Rect.top = ((TextTop64 - TextWidth64 + 32) >> 6); + Rect.right = X1 + DY2; + Rect.bottom = ((TextTop64 + 32) >> 6); + break; + case 180 * 10: + Rect.left = (RealXStart64 - TextWidth64 + 32) >> 6; + Rect.top = ((TextTop64 + 32) >> 6) - DY2; + Rect.right = X1; + Rect.bottom = ((TextTop64 + 32) >> 6) + DY1; + break; + case 270 * 10: + Rect.left = X1 - DY2; + Rect.top = ((TextTop64 + 32) >> 6); + Rect.right = X1 + DY1; + Rect.bottom = ((TextTop64 + TextWidth64 + 32) >> 6); + break; + default: + DPRINT1("FIXME: Not implemented lfEscapement\n"); + RtlZeroMemory(&Rect, sizeof(Rect)); + // FIXME: Use pts[0] ... pts[3] and EngFillPath + } if (dc->fs & (DC_ACCUM_APP | DC_ACCUM_WMGR)) { @@ -5961,24 +6096,22 @@ GreExtTextOutW( EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); - /* Assume success */ - bResult = TRUE; - /* * The main rendering loop. */ - TextLeft = RealXStart; - TextTop = YStart; + bResult = TRUE; + TextLeft64 = pts[4].x << 6; + TextTop64 = pts[4].y << 6; previous = 0; for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); - - if (EmuBold || EmuItalic) - realglyph = NULL; - else + realglyph = NULL; + if (!EmuBold && !EmuItalic && !lfEscapement) + { realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, RenderMode, pmxWorldToDevice); + } if (!realglyph) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -5990,7 +6123,7 @@ GreExtTextOutW( } glyph = face->glyph; - if (EmuBold || EmuItalic) + if (EmuBold || EmuItalic || lfEscapement) { if (EmuBold) FT_GlyphSlot_Embolden(glyph); @@ -6020,15 +6153,15 @@ GreExtTextOutW( { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextLeft += delta.x; + TextLeft64 += delta.x; } - DPRINT("TextLeft: %I64d\n", TextLeft); - DPRINT("TextTop: %lu\n", TextTop); + DPRINT("TextLeft64: %I64d\n", TextLeft64); + DPRINT("TextTop64: %I64d\n", TextTop64); DPRINT("Advance: %d\n", realglyph->root.advance.x); - DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; + DestRect.left = ((TextLeft64 + 32) >> 6) + realglyph->left; DestRect.right = DestRect.left + realglyph->bitmap.width; - DestRect.top = TextTop + yoff - realglyph->top; + DestRect.top = ((TextTop64 + 32) >> 6) - realglyph->top; DestRect.bottom = DestRect.top + realglyph->bitmap.rows; bitSize.cx = realglyph->bitmap.width; @@ -6125,80 +6258,125 @@ GreExtTextOutW( break; } - if (plf->lfUnderline) - { - int i, position; - if (!face->units_per_EM) - { - position = 0; - } - else - { - position = face->underline_position * - face->size->metrics.y_ppem / face->units_per_EM; - } - for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) - { - EngLineTo(SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - (TextLeft >> 6), - TextTop + yoff - position + i, - ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6), - TextTop + yoff - position + i, - NULL, - ROP2_TO_MIX(R2_COPYPEN)); - } - } - if (plf->lfStrikeOut) - { - int i; - for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) - { - EngLineTo(SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - (TextLeft >> 6), - TextTop + yoff - (fixAscender >> 6) / 3 + i, - ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6), - TextTop + yoff - (fixAscender >> 6) / 3 + i, - NULL, - ROP2_TO_MIX(R2_COPYPEN)); - } - } - if (NULL == Dx) { - TextLeft += realglyph->root.advance.x >> 10; - DPRINT("New TextLeft: %I64d\n", TextLeft); + TextLeft64 += realglyph->root.advance.x >> 10; + TextTop64 -= realglyph->root.advance.y >> 10; + DPRINT("New TextLeft64: %I64d\n", TextLeft64); } else { - // FIXME this should probably be a matrix transform with TextTop as well. + // FIXME this should probably be a matrix transform with TextTop64 as well. Scale = pdcattr->mxWorldToDevice.efM11; if (FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale); /* do the shift before multiplying to preserve precision */ FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); - TextLeft += FLOATOBJ_GetLong(&Scale); - DPRINT("New TextLeft2: %I64d\n", TextLeft); + TextLeft64 += FLOATOBJ_GetLong(&Scale); + DPRINT("New TextLeft64 2: %I64d\n", TextLeft64); } if (DxShift) { - TextTop -= Dx[2 * i + 1] << 6; + TextTop64 -= Dx[2 * i + 1] << 6; } previous = glyph_index; /* No cache, so clean up */ - if (EmuBold || EmuItalic) + if (EmuBold || EmuItalic || lfEscapement) { FT_Done_Glyph((FT_Glyph)realglyph); } } + if (plf->lfUnderline || plf->lfStrikeOut) + { + INT x0, y0, x1, y1; + if (pts[0].x < pts[2].x) + { + x0 = pts[0].x; + x1 = pts[2].x; + } + else + { + x0 = pts[2].x; + x1 = pts[0].x; + } + if (pts[0].y < pts[2].y) + { + y0 = pts[0].y; + y1 = pts[2].y; + } + else + { + y0 = pts[2].y; + y1 = pts[0].y; + } + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawStart(dc->ppdev, x0, y0, x1, y1); + } + + if (plf->lfUnderline) + { + INT i, nEscape = lfEscapement % (180 * 10); + for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) + { + if (nEscape < 45 * 10 || nEscape > (180 - 45) * 10) + { + // move vertical + EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + pts[5].x, pts[5].y + i, + pts[6].x, pts[6].y + i, + NULL, ROP2_TO_MIX(R2_COPYPEN)); + } + else + { + // move horizontal + EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + pts[5].x + i, pts[5].y, + pts[6].x + i, pts[6].y, + NULL, ROP2_TO_MIX(R2_COPYPEN)); + } + } + } + + if (plf->lfStrikeOut) + { + INT i, nEscape = lfEscapement % (180 * 10); + for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) + { + if (nEscape < 45 * 10 || nEscape > (180 - 45) * 10) + { + // move vertical + EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + pts[7].x, pts[7].y + i, + pts[8].x, pts[8].y + i, + NULL, ROP2_TO_MIX(R2_COPYPEN)); + } + else + { + // move horizontal + EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + pts[7].x + i, pts[7].y, + pts[8].x + i, pts[8].y, + NULL, + ROP2_TO_MIX(R2_COPYPEN)); + } + } + } + + if (plf->lfUnderline || plf->lfStrikeOut) + { + if (dc->dctype == DCTYPE_DIRECT) + MouseSafetyOnDrawEnd(dc->ppdev); + } + if (pdcattr->lTextAlign & TA_UPDATECP) { pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; }

5 years, 8 months

[reactos] 01/01: [TRANSLATION] Update Chinese translation. (#1205)

by Luo Yufan

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfddf95d6f849b57a3254… commit cfddf95d6f849b57a3254970370e3796b43edccb Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Mon Dec 31 17:47:37 2018 +0800 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 31 18:47:37 2018 +0900 [TRANSLATION] Update Chinese translation. (#1205) [NET][DISKPART][WINLOGON][ACCESS][APPWIZ][DESK][JOY][MMSYS][POWERCFG][SYSDM][NETCFGX][NETID][SAMSRV][TAPIUI][INF] Update Chinese translation. --- base/applications/network/net/lang/zh-TW.rc | 2 +- base/system/diskpart/lang/zh-TW.rc | 4 +- base/system/winlogon/lang/zh-TW.rc | 4 +- dll/cpl/access/lang/zh-TW.rc | 2 +- dll/cpl/appwiz/lang/zh-TW.rc | 2 +- dll/cpl/desk/lang/zh-TW.rc | 2 +- dll/cpl/joy/lang/zh-TW.rc | 2 +- dll/cpl/mmsys/lang/zh-TW.rc | 8 +- dll/cpl/powercfg/lang/zh-TW.rc | 18 ++-- dll/cpl/sysdm/lang/zh-CN.rc | 2 +- dll/win32/netcfgx/lang/zh-TW.rc | 2 +- dll/win32/netid/lang/zh-CN.rc | 2 +- dll/win32/samsrv/lang/zh-TW.rc | 6 +- dll/win32/tapiui/lang/zh-CN.rc | 6 +- dll/win32/tapiui/lang/zh-TW.rc | 122 ++++++++++++++-------------- media/inf/shortcuts.inf | 4 + 16 files changed, 96 insertions(+), 92 deletions(-) diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index fba20506b9..ff067a2add 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -13,7 +13,7 @@ BEGIN IDS_ACCOUNTS_LOCKOUT_THRESHOLD "鎖定閾值" IDS_ACCOUNTS_LOCKOUT_DURATION "鎖定時間 (以分鐘為單位)" IDS_ACCOUNTS_LOCKOUT_WINDOW "鎖定觀察視窗 (以分鐘為單位)" - IDS_ACCOUNTS_COMPUTER_ROLE "計算機角色" + IDS_ACCOUNTS_COMPUTER_ROLE "電腦角色" IDS_ACCOUNTS_PRIMARY_SERVER "主伺服器" IDS_ACCOUNTS_BACKUP_SERVER "備份伺服器" IDS_ACCOUNTS_STANDALONE_SERVER "獨立伺服器" diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index a21a0b1a52..826f52217c 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -12,7 +12,7 @@ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ /T <超時>\t超時秒數，防止 DiskPart 使用重疊。\n\ /?\t\t顯示此幫助訊息。\n\n" IDS_APP_LICENSE "根據 GNU GPLv2 許可\n" - IDS_APP_CURR_COMPUTER "在計算機上: %s\n\n" + IDS_APP_CURR_COMPUTER "在電腦上: %s\n\n" IDS_APP_LEAVING "\n離開 DiskPart 中......\n" IDS_APP_PROMPT "DISKPART> " END @@ -123,7 +123,7 @@ BEGIN IDS_HELP_CMD_DESC_REM "REM\t\t- 無反應。這用來註解指令碼。\n" IDS_HELP_CMD_DESC_REMOVE "REMOVE\t\t- 刪除驅動器號或裝載點指派。\n" IDS_HELP_CMD_DESC_REPAIR "REPAIR\t\t- 修復失敗的成員與 RAID 5 卷。\n" - IDS_HELP_CMD_DESC_RESCAN "RESCAN\t\t- 重新掃描計算機，查找磁碟和卷。\n" + IDS_HELP_CMD_DESC_RESCAN "RESCAN\t\t- 重新掃描電腦，查找磁碟和卷。\n" IDS_HELP_CMD_DESC_RETAIN "RETAIN\t\t- 放置在一個簡單卷下的一個保留的分區。\n" IDS_HELP_CMD_DESC_SAN "SAN\t\t- 顯示或設定當前引導 OS 的 SAN 策略。\n" IDS_HELP_CMD_DESC_SELECT "SELECT\t\t- 重點轉移到一個物件。\n" diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index 6160b9a92d..694d6ca5f0 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -7,7 +7,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPT CAPTION "關機" FONT 9, "新細明體" BEGIN - LTEXT "現在可以安全地關閉計算機了。", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "現在可以安全地關閉電腦了。", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 DEFPUSHBUTTON "重新啟動(&R)", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 68, 14 END @@ -38,7 +38,7 @@ END STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "正在準備網路連線..." - IDS_APPLYINGCOMPUTERSETTINGS "正在應用計算機設定..." + IDS_APPLYINGCOMPUTERSETTINGS "正在應用電腦設定..." IDS_RUNNINGSTARTUPSCRIPTS "正在運行啟動指令碼..." IDS_RUNNINGSHUTDOWNSCRIPTS "正在運行關機指令碼..." IDS_APPLYINGYOURPERSONALSETTINGS "正在應用個人設定..." diff --git a/dll/cpl/access/lang/zh-TW.rc b/dll/cpl/access/lang/zh-TW.rc index 9df242da4b..5edefa1306 100644 --- a/dll/cpl/access/lang/zh-TW.rc +++ b/dll/cpl/access/lang/zh-TW.rc @@ -283,7 +283,7 @@ END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "輔助功能" - IDS_CPLSYSTEMDESCRIPTION "為視覺、聽力和行動能力而調整計算機設定。" + IDS_CPLSYSTEMDESCRIPTION "為視覺、聽力和行動能力而調整電腦設定。" IDS_SENTRY_NONE "[無]" IDS_SENTRY_TITLE "閃爍活動標題欄" IDS_SENTRY_WINDOW "閃爍活動視窗" diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 6397cfadba..ec7c78c638 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -31,7 +31,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "新建快捷方式" FONT 9, "新細明體", 0, 0, 0x0 BEGIN - LTEXT "此精靈幫助您創建本地或網路程式、檔案、目錄、計算機或Internet地址的快捷方式。", -1, 120, 15, 200, 30 + 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 diff --git a/dll/cpl/desk/lang/zh-TW.rc b/dll/cpl/desk/lang/zh-TW.rc index 421c4fd8f4..e5e2a4022f 100644 --- a/dll/cpl/desk/lang/zh-TW.rc +++ b/dll/cpl/desk/lang/zh-TW.rc @@ -269,6 +269,6 @@ STRINGTABLE BEGIN IDS_DISPLAY_SETTINGS "顯示設定" IDS_APPLY_FAILED "應用新設定失敗..." - IDS_APPLY_NEEDS_RESTART "需要重新啟動計算機使更改生效。" + IDS_APPLY_NEEDS_RESTART "需要重新啟動電腦使更改生效。" IDS_TIMEOUTTEXT "在 %d 內還原設定。" END diff --git a/dll/cpl/joy/lang/zh-TW.rc b/dll/cpl/joy/lang/zh-TW.rc index 3961bd5f19..cbe77f94a1 100644 --- a/dll/cpl/joy/lang/zh-TW.rc +++ b/dll/cpl/joy/lang/zh-TW.rc @@ -9,7 +9,7 @@ CAPTION "遊戲控制器" FONT 9, "新細明體" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "這些設定幫助您配置安裝在計算機上的遊戲控制器。", -1, 33, 7, 214, 20, NOT WS_GROUP + LTEXT "這些設定幫助您配置安裝在電腦上的遊戲控制器。", -1, 33, 7, 214, 20, NOT WS_GROUP GROUPBOX "安裝遊戲控制器(&N)", -1, 7, 34, 238, 117 CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 PUSHBUTTON "添加(&A)...", IDC_ADD_BUTTON, 35, 129, 65, 14 diff --git a/dll/cpl/mmsys/lang/zh-TW.rc b/dll/cpl/mmsys/lang/zh-TW.rc index d57f261428..0b0bc22345 100644 --- a/dll/cpl/mmsys/lang/zh-TW.rc +++ b/dll/cpl/mmsys/lang/zh-TW.rc @@ -118,7 +118,7 @@ CAPTION "揚聲器" FONT 9, "新細明體" BEGIN ICON 4379, -1, 7, 8, 20, 20 - LTEXT "請選擇最接近您的計算機設定的揚聲器設定。", -1, 36, 8, 215, 27 + LTEXT "請選擇最接近您的設定電腦的揚聲器設定。", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT LTEXT "揚聲器設定(&P):", 8502, 53, 169, 55, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP @@ -173,11 +173,11 @@ FONT 9, "新細明體" BEGIN GROUPBOX "ReactOS 音訊", 10243, 7, 5, 213, 192 ICON 4393, 10241, 26, 26, 20, 20 - LTEXT "因為 ReactOS 音訊服務無效因此這臺計算機目前無法播放聲音", 10245, 60, 25, 150, 40 + LTEXT "因為 ReactOS 音訊服務無效因此這臺電腦目前無法播放聲音", 10245, 60, 25, 150, 40 AUTOCHECKBOX "啟用ReactOS 音訊(&E)", 10253, 60, 68, 150, 9 LTEXT "注意", 10246, 58, 87, 150, 11 LTEXT "1. 您必須是管理員才能啟用此服務。如果您沒有以管理員身份登入，您將提示輸入管理員名稱和密碼。", 10247, 60, 100, 150, 40 - LTEXT "2. 您啟用ReactOS音訊後，必須重新啟動計算機。", 10248, 60, 140, 150, 40 + LTEXT "2. 您啟用ReactOS音訊後，必須重新啟動電腦。", 10248, 60, 140, 150, 40 END IDD_MULTICHANNEL DIALOGEX 0, 0, 227, 218 @@ -237,7 +237,7 @@ END STRINGTABLE BEGIN IDS_CPLNAME "聲音和音訊裝置" - IDS_CPLDESCRIPTION "更改計算機的聲音方案，或者配置揚聲器和錄音裝置的設定" + IDS_CPLDESCRIPTION "更改電腦的聲音方案，或者配置揚聲器和錄音裝置的設定" IDS_NO_SOUND "(無)" IDS_NO_DEVICES "沒有裝置" 5825 "程式出錯" diff --git a/dll/cpl/powercfg/lang/zh-TW.rc b/dll/cpl/powercfg/lang/zh-TW.rc index a8a6a3df4e..2fe976ece7 100644 --- a/dll/cpl/powercfg/lang/zh-TW.rc +++ b/dll/cpl/powercfg/lang/zh-TW.rc @@ -8,13 +8,13 @@ CAPTION "電源使用方案" FONT 9, "新細明體" BEGIN ICON IDI_ACDC, IDI_ACDC, 7, 7, 28, 22 - LTEXT "請選定對於您使用計算機方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36 + LTEXT "請選定對於您使用電腦方式最適合的電源使用方案。請注意，更改下面的設置將修改選定的方案。", -1, 37, 6, 209, 36 GROUPBOX "電源使用方案(&O)", -1, 6, 43, 240, 50 COMBOBOX IDC_ENERGYLIST, 14, 54, 224, 92, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL PUSHBUTTON "另存爲(&S)...", IDC_SAVEAS_BTN, 109, 72, 70, 14, WS_DISABLED PUSHBUTTON "刪除(&D)", IDC_DELETE_BTN, 183, 72, 55, 14, WS_DISABLED GROUPBOX "未知", IDC_GRPDETAIL, 6, 95, 240, 136 - LTEXT "當計算機:", IDC_SAT, 12, 109, 60, 12 + LTEXT "當電腦:", IDC_SAT, 12, 109, 60, 12 LTEXT "接通電源", IDC_SAC, 123, 110, 45, 15 ICON IDI_AC, IDC_IAC, 97, 108, 21, 20 LTEXT "使用電池", IDC_SDC, 195, 110, 45, 15 @@ -75,14 +75,14 @@ BEGIN LTEXT "請選擇要使用的節能設置。", -1, 37, 6, 207, 20 GROUPBOX "選項", -1, 6, 30, 240, 65 AUTOCHECKBOX "總是在任務欄上顯示圖標(&S)", IDC_SYSTRAYBATTERYMETER, 17, 43, 220, 10, WS_TABSTOP - AUTOCHECKBOX "在計算機從待機狀態恢復時，提示輸入密碼(&P)", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP + AUTOCHECKBOX "在電腦從待機狀態恢復時，提示輸入密碼(&P)", IDC_PASSWORDLOGON, 17, 60, 220, 10, WS_TABSTOP AUTOCHECKBOX "在使用電池時弱顯示(&D)。", IDC_VIDEODIMDISPLAY, 17, 78, 220, 10, WS_TABSTOP GROUPBOX "電源按鈕", -1, 6, 101, 240, 127 - LTEXT "在合上便攜式計算機時(&W):", IDC_SLIDCLOSE, 15, 115, 222, 10 + LTEXT "在合上便攜式電腦時(&W):", IDC_SLIDCLOSE, 15, 115, 222, 10 COMBOBOX IDC_LIDCLOSE, 15, 127, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "在按下計算機電源按鈕時(&E):", IDC_SPOWERBUTTON, 15, 153, 222, 10 + LTEXT "在按下電腦電源按鈕時(&E):", IDC_SPOWERBUTTON, 15, 153, 222, 10 COMBOBOX IDC_POWERBUTTON, 15, 165, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "在按下計算機睡眠按鈕時(&N):", IDC_SSLEEPBUTTON, 15, 191, 222, 10 + LTEXT "在按下電腦睡眠按鈕時(&N):", IDC_SSLEEPBUTTON, 15, 191, 222, 10 COMBOBOX IDC_SLEEPBUTTON, 15, 203, 220, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -92,7 +92,7 @@ CAPTION "休眠" FONT 9, "新細明體" BEGIN ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20 - LTEXT "在計算機休眠時，它將內存中所有信息保存到硬碟上，然後關閉計算機。在退出休眠狀態時，計算機會恢復到原來的狀態。", -1, 37, 6, 210, 35 + LTEXT "在電腦休眠時，它將內存中所有信息保存到硬碟上，然後關閉電腦。在退出休眠狀態時，電腦會恢復到原來的狀態。", -1, 37, 6, 210, 35 GROUPBOX "休眠", -1, 6, 41, 240, 32 AUTOCHECKBOX "啓用休眠(&H)", IDC_HIBERNATEFILE, 17, 55, 210, 10, WS_TABSTOP GROUPBOX "用於休眠的磁碟空間", -1, 6, 80, 240, 76 @@ -100,13 +100,13 @@ BEGIN LTEXT "未知", IDC_FREESPACE, 160, 95, 80, 10 LTEXT "休眠所需的磁碟空間:", -1, 15, 115, 140, 10 LTEXT "未知", IDC_SPACEFORHIBERNATEFILE, 160, 115, 80, 10 - LTEXT "在計算機進入休眠之前，您必須釋放一些磁碟空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20 + LTEXT "在電腦進入休眠之前，您必須釋放一些磁碟空間。", IDC_TOLESSFREESPACE, 15, 135, 224, 20 END STRINGTABLE BEGIN IDS_CPLNAME_1 "電源選項" - IDS_CPLDESCRIPTION_1 "配置計算機的節能設置。" + IDS_CPLDESCRIPTION_1 "配置電腦的節能設置。" IDS_PROCENT "%i%%" IDS_SOUND "聲音" IDS_TEXT "文本" diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 5bd6298ecf..8069f29834 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -50,7 +50,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "高级" FONT 9, "宋体", 0, 0, 0x0 BEGIN - LTEXT "大多数这些设置都需要管理员权限。", IDC_STATIC, 12, 5, 236, 8 + LTEXT "这些设置中的大多数都需要管理员权限。", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "性能", IDC_STATIC, 6, 18, 244, 50 LTEXT "性能选项控制应用程序如何使用内存，这会影响计算机的运行速度。", IDC_STATIC, 16, 29, 228, 17 PUSHBUTTON "设置", IDC_PERFOR, 194, 48, 50, 15 diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index 14ca30aa27..04a4df120c 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -224,7 +224,7 @@ BEGIN IDS_NET_CONNECT "網路連線" IDS_NO_IPADDR_SET "介面卡需要至少一個 IP 地址。請輸入一個。" IDS_NO_SUBMASK_SET "您輸入缺少及其子網掩碼地址。請添加子網掩碼。" - IDS_TCPFILTERDESC "TCP/IP 篩選允許您控制到達您的計算機的 TCP/IP 網路通訊的類型。" + IDS_TCPFILTERDESC "TCP/IP 篩選允許您控制到達您的電腦的 TCP/IP 網路通訊的類型。" IDS_TCPFILTER "TCP/IP 篩選" IDS_IPADDR "IP 地址" IDS_SUBMASK "子網掩碼" diff --git a/dll/win32/netid/lang/zh-CN.rc b/dll/win32/netid/lang/zh-CN.rc index e1e611627e..61a2d0c616 100644 --- a/dll/win32/netid/lang/zh-CN.rc +++ b/dll/win32/netid/lang/zh-CN.rc @@ -5,7 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "计算机名称" +CAPTION "计算机名" FONT 9, "宋体" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON diff --git a/dll/win32/samsrv/lang/zh-TW.rc b/dll/win32/samsrv/lang/zh-TW.rc index 59261ef965..1621bd6b51 100644 --- a/dll/win32/samsrv/lang/zh-TW.rc +++ b/dll/win32/samsrv/lang/zh-TW.rc @@ -8,7 +8,7 @@ BEGIN IDS_GROUP_NONE_NAME "無" IDS_GROUP_NONE_COMMENT "普通使用者" IDS_ALIAS_ADMINISTRATORS_NAME "管理員" - IDS_ALIAS_ADMINISTRATORS_COMMENT "管理員可以無限制地訪問計算機或域。" + IDS_ALIAS_ADMINISTRATORS_COMMENT "管理員可以無限制地訪問電腦或域。" IDS_ALIAS_GUESTS_NAME "來賓" IDS_ALIAS_GUESTS_COMMENT "來賓在默認情況下享有同樣的權利的使用者組的成員。" IDS_ALIAS_POWER_USERS_NAME "超級使用者" @@ -21,7 +21,7 @@ BEGIN * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. */ IDS_USER_ADMINISTRATOR_NAME "Administrator" - IDS_USER_ADMINISTRATOR_COMMENT "用於管理計算機或域的內建帳戶。" + IDS_USER_ADMINISTRATOR_COMMENT "用於管理電腦或域的內建帳戶。" IDS_USER_GUEST_NAME "來賓" - IDS_USER_GUEST_COMMENT "來賓訪問計算機或域的內建帳戶。" + IDS_USER_GUEST_COMMENT "來賓訪問電腦或域的內建帳戶。" END diff --git a/dll/win32/tapiui/lang/zh-CN.rc b/dll/win32/tapiui/lang/zh-CN.rc index 24cf85b035..299d74e25e 100644 --- a/dll/win32/tapiui/lang/zh-CN.rc +++ b/dll/win32/tapiui/lang/zh-CN.rc @@ -27,15 +27,15 @@ BEGIN 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 "国家(地区)(&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 EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL - LTEXT "长途电话的外线号码是(&D):(&D)", -1, 14, 122, 170, 8 + LTEXT "长途电话的外线号码是(&D):", -1, 14, 122, 170, 8 EDITTEXT 1011, 190, 120, 48, 12, ES_AUTOHSCROLL LTEXT "使用此电话公司代码来打长途电话(&E):", -1, 14, 138, 170, 8 EDITTEXT 1059, 190, 136, 48, 12, ES_AUTOHSCROLL diff --git a/dll/win32/tapiui/lang/zh-TW.rc b/dll/win32/tapiui/lang/zh-TW.rc index ef64ee2bb6..b6ddc3eb58 100644 --- a/dll/win32/tapiui/lang/zh-TW.rc +++ b/dll/win32/tapiui/lang/zh-TW.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,24 +24,24 @@ 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 "國家/地區(&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 "若要訪問本地電話的外線電話，請撥(&L):", -1, 14, 106, 170, 8 EDITTEXT 1010, 190, 104, 48, 12, ES_AUTOHSCROLL - LTEXT "要訪問外線長途電話，請先撥:(&D)", -1, 14, 122, 170, 8 + LTEXT "要訪問外線長途電話，請先撥(&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 @@ -56,10 +56,10 @@ CAPTION "區號規則" FONT 9, "新細明體" BEGIN LTEXT "區號規則確定電話號碼的撥號方式從你當前的地區代碼於其他地區代碼和區號中。", 2000, 7, 7, 238, 16 - LTEXT "區號規則:(&C)", -1, 7, 31, 238, 8 + 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,15 +70,15 @@ 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 + 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 "個人ID號 (PIN)(&P):", -1, 7, 145, 91, 8 EDITTEXT 1019, 102, 143, 143, 12, ES_AUTOHSCROLL GROUPBOX "訪問的電話號碼", 2001, 7, 158, 238, 53 LTEXT "長途電話:", -1, 14, 172, 84, 8 @@ -95,11 +95,11 @@ 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 GROUPBOX "電話卡詳細信息", 2001, 7, 105, 238, 66 @@ -113,10 +113,10 @@ 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 "電話卡撥號步驟(&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 @@ -124,9 +124,9 @@ BEGIN 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 107 DIALOGEX 0, 0, 252, 218 @@ -134,10 +134,10 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "國際" FONT 9, "新細明體" BEGIN - LTEXT "國際電話訪問號碼:(&I)", -1, 7, 7, 238, 8 + LTEXT "國際電話訪問號碼(&I):", -1, 7, 7, 238, 8 EDITTEXT 1045, 7, 18, 140, 14, ES_AUTOHSCROLL LTEXT "使用下面的按鈕來輸入打國際電話撥號步驟。當它們出現在你的名片上，按準確順序輸入這些步驟。", 2000, 7, 40, 244, 24 - LTEXT "電話卡撥號步驟:(&R)", -1, 7, 72, 80, 8 + 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 @@ -145,9 +145,9 @@ BEGIN 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 108 DIALOGEX 0, 0, 252, 218 @@ -155,10 +155,10 @@ 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 1008, 7, 18, 140, 14, ES_AUTOHSCROLL LTEXT "使用下面的按鈕來輸入打市內電話撥號步驟。當他們出現在你的名片上，按準確順序輸入這些步驟。來而無需使用您的電話卡打本地電話，請將此部分留爲空白。", 2000, 7, 40, 238, 24 - LTEXT "電話卡撥號步驟:(&R)", -1, 7, 72, 238, 8 + 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 @@ -166,9 +166,9 @@ BEGIN 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 @@ -179,17 +179,17 @@ FONT 9, "新細明體" BEGIN LTEXT "此區號規則只適用於電話的區號和您在下面指定的前綴組合作出。", 2000, 7, 6, 238, 16 LTEXT "要調用的地區代碼:", -1, 7, 31, 110, 8 - LTEXT "地區代碼:(&R)", -1, 7, 47, 36, 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 "要包含的前綴:(&P)", 1057, 26, 117, 119, 8 + 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 + AUTOCHECKBOX "撥打(&D):", 1012, 14, 198, 30, 12 EDITTEXT 1007, 46, 196, 42, 14, ES_AUTOHSCROLL AUTOCHECKBOX "包括地區代碼(&C)", 1029, 14, 214, 85, 12 DEFPUSHBUTTON "確定", 1, 141, 236, 50, 14 @@ -224,7 +224,7 @@ BEGIN 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 "等待一個特定的時間長度(&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 @@ -252,21 +252,21 @@ 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 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "添加提供程序" +CAPTION "添加提供程式" FONT 9, "新細明體" BEGIN - LTEXT "選擇你想從下面列表中安裝的提供程序並單擊添加。", 2000, 7, 7, 241, 8 - LTEXT "電話服務提供程序:(&T)", -1, 7, 23, 144, 10 + 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 DEFPUSHBUTTON "取消", 2, 195, 106, 50, 14 @@ -280,13 +280,13 @@ 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 "你現在在什麼國家/地區(&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)?", -1, 107, 137, 189, 10 EDITTEXT 1010, 107, 149, 45, 12, ES_UPPERCASE | ES_AUTOHSCROLL LTEXT "在此位置的電話系統使用:", -1, 107, 168, 189, 10 AUTORADIOBUTTON "音頻撥號(&T)", 1036, 107, 178, 57, 14, WS_GROUP | NOT WS_TABSTOP @@ -301,11 +301,11 @@ 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 "你現在在什麼國家/地區(&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 AUTORADIOBUTTON "音頻撥號(&T)", 1036, 95, 139, 55, 12, WS_GROUP | NOT WS_TABSTOP @@ -396,7 +396,7 @@ BEGIN 68 "您的國際規則需要您的電話卡國際訪問號碼。" 69 "您的本地規則需要您的電話卡的本地訪問號碼。" 70 "無" - 71 "確實要刪除選定的電話服務提供程序嗎?" + 71 "確實要刪除選定的電話服務提供程式嗎?" 72 "< 沒有服務提供商安裝 >" 73 "您必須輸入此規則適用的前綴。" 74 "數字:(&D)" @@ -408,14 +408,14 @@ BEGIN 80 "是否確實要刪除此區號規則?" 81 "您必須輸入要撥打的號碼。" 82 "您輸入的電話卡名稱已在使用。請輸入一個唯一的名稱。" - 83 "ReactOS 需要從中你將撥號的位置電話信息。如果您取消沒有提供此信息，此程序可能無法正常撥號時。此外，一些應用程式響應您取消此對話方塊由立即重新發佈它。\n確實要取消嗎?" + 83 "ReactOS 需要從中你將撥號的位置電話信息。如果您取消沒有提供此信息，此程式可能無法正常撥號時。此外，一些應用程式響應您取消此對話方塊由立即重新發佈它。\n確實要取消嗎?" 84 "確認取消" 85 "我的位置" 86 "< 沒有服務提供商可用於安裝 >" 87 "您輸入的字符無效。\n\n有效的字符是 0 到 9，A 到 D，*，#，+，!，空格和逗號。" 88 "您必須輸入此位置國際承運人代碼。" 89 "您必須輸入此位置的承運人代碼。" - 90 "此頁正在嘗試進行或監視電話呼叫或其他多媒體連接您的計算機上。\n您想允許它繼續嗎?" + 90 "此頁正在嘗試進行或監視電話呼叫或其他多媒體連接您的電腦上。\n您想允許它繼續嗎?" 91 "此頁正在嘗試訪問您的網絡上的目錄信息。\n你想允許它繼續嗎?" 92 "此頁嘗試訪問或更改網絡會議信息。\n你想允許它繼續嗎?" 93 "此頁嘗試訪問或更改登錄資訊。\n你想允許它繼續嗎?" diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index a03f026391..ffc4dba145 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1508,6 +1508,8 @@ REGEDIT_TITLE=注册表编辑器 REGEDIT_DESC=启动注册表编辑器 DXDIAG_TITLE=ReactX 诊断程序 DXDIAG_DESC=启动 ReactX 诊断程序 +TASKMGR_TITLE=任务管理器 +TASKMGR_DESC=启动任务管理器 MAGNIFY_TITLE=放大镜 MAGNIFY_DESC=放大镜 OSK_TITLE=屏幕键盘 @@ -1572,6 +1574,8 @@ REGEDIT_TITLE=登錄編輯程式 REGEDIT_DESC=啓動登錄編輯程式 DXDIAG_TITLE=ReactX 診斷工具 DXDIAG_DESC=啓動 ReactX 診斷工具 +TASKMGR_TITLE=工作管理員 +TASKMGR_DESC=啟動工作管理員 MAGNIFY_TITLE=放大鏡 MAGNIFY_DESC=放大鏡 OSK_TITLE=螢幕小鍵盤

5 years, 8 months

[reactos] 01/01: [APPWIZ] Do not hardcode the strings (#1208)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96228ccc0ae6ea19f7453… commit 96228ccc0ae6ea19f7453f8329fb6f5968579b7a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Dec 31 08:42:53 2018 +0100 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Dec 31 16:42:53 2018 +0900 [APPWIZ] Do not hardcode the strings (#1208) Let's make those message strings translatable. --- dll/cpl/appwiz/createlink.c | 10 +++++++--- dll/cpl/appwiz/lang/bg-BG.rc | 3 +++ dll/cpl/appwiz/lang/cs-CZ.rc | 3 +++ dll/cpl/appwiz/lang/de-DE.rc | 3 +++ dll/cpl/appwiz/lang/el-GR.rc | 3 +++ dll/cpl/appwiz/lang/en-US.rc | 3 +++ dll/cpl/appwiz/lang/es-ES.rc | 3 +++ dll/cpl/appwiz/lang/et-EE.rc | 3 +++ dll/cpl/appwiz/lang/fr-FR.rc | 3 +++ dll/cpl/appwiz/lang/he-IL.rc | 3 +++ dll/cpl/appwiz/lang/it-IT.rc | 3 +++ dll/cpl/appwiz/lang/ja-JP.rc | 3 +++ dll/cpl/appwiz/lang/no-NO.rc | 3 +++ dll/cpl/appwiz/lang/pl-PL.rc | 3 +++ dll/cpl/appwiz/lang/pt-BR.rc | 3 +++ dll/cpl/appwiz/lang/ro-RO.rc | 3 +++ dll/cpl/appwiz/lang/ru-RU.rc | 3 +++ dll/cpl/appwiz/lang/sk-SK.rc | 3 +++ dll/cpl/appwiz/lang/sq-AL.rc | 3 +++ dll/cpl/appwiz/lang/tr-TR.rc | 3 +++ dll/cpl/appwiz/lang/uk-UA.rc | 3 +++ dll/cpl/appwiz/lang/zh-CN.rc | 3 +++ dll/cpl/appwiz/lang/zh-TW.rc | 3 +++ dll/cpl/appwiz/resource.h | 3 +++ 24 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 5f70b4641f..a35e915f03 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -408,12 +408,14 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) UINT nLength; DWORD attrs; PCREATE_LINK_CONTEXT pContext; + WCHAR szMessage[128]; pContext = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pContext)); if (!pContext) { /* no memory */ - MessageBoxA(hwndCPl, "Out of memory!", NULL, MB_ICONERROR); + LoadStringW(hApplet, IDS_NO_MEMORY, szMessage, _countof(szMessage)); + MessageBoxW(hwndCPl, szMessage, NULL, MB_ICONERROR); return FALSE; } @@ -423,7 +425,8 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) HeapFree(GetProcessHeap(), 0, pContext); /* no directory given */ - MessageBoxA(hwndCPl, "No directory given!", NULL, MB_ICONERROR); + LoadStringW(hApplet, IDS_NO_DIRECTORY, szMessage, _countof(szMessage)); + MessageBoxW(hwndCPl, szMessage, NULL, MB_ICONERROR); return FALSE; } @@ -433,7 +436,8 @@ ShowCreateShortcutWizard(HWND hwndCPl, LPWSTR szPath) HeapFree(GetProcessHeap(), 0, pContext); /* invalid path */ - MessageBoxA(hwndCPl, "Invalid path!", NULL, MB_ICONERROR); + LoadStringW(hApplet, IDS_INVALID_PATH, szMessage, _countof(szMessage)); + MessageBoxW(hwndCPl, szMessage, NULL, MB_ICONERROR); return FALSE; } diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 06c00ea539..4198ecd387 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index f680584e0a..4d0157bc21 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -87,4 +87,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index af95ea7a34..29f55f9f69 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 51b48c935a..4f996bd341 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 38b19d5d19..b84f58d92e 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 9f55f9674a..a26f64ff36 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -88,4 +88,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 95e422bca5..9a28610184 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -89,4 +89,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index dead951efb..3a3b841980 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Échec lors du téléchargement du paquet Gecko. Assurez-vous d'avoir une connexion Internet pour pouvoir le télécharger. L'installation va continuer sans installer Gecko." IDS_CANTMAKEINETSHORTCUT "Échec lors de la création du raccourci Internet." IDS_CANTMAKESHORTCUT "Échec lors de la création du raccourci." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index 2ff33619e0..e4ab1dd5d2 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -83,4 +83,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index 2bb3df36d5..17845eebde 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Lo scaricamento del pacchetto Gecko è fallito. Assicurati che hai una connessione internet per scaricarlo. Il setup procederà senza l'installazione del pacchetto Gecko." IDS_CANTMAKEINETSHORTCUT "La creazione di un collegamento internet è fallita." IDS_CANTMAKESHORTCUT "La creazione di un collegamento è fallita." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index ba852629cd..01ad497655 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index fd37b67a2d..77ac73142b 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index aeeacdd124..b2d9371e60 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -92,4 +92,7 @@ BEGIN IDS_DWL_FAILED "Nie udało się pobrać pakietu Gecko. Upewnij się, że masz połączenie z internetem, aby pobrać pakiet. Instalacja będzie kontynuowana bez pakietu Gecko." IDS_CANTMAKEINETSHORTCUT "Nie można utworzyć skrótu internetowego." IDS_CANTMAKESHORTCUT "Nie można utworzyć skrótu." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index 9d72434002..1d1a267cb3 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -84,4 +84,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 7410c99699..185243b789 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -88,4 +88,7 @@ BEGIN IDS_DWL_FAILED "Descărcarea pachetului Gecko a eșuat. Asigurați-vă că aveți conexiune la internet pentru a putea descărca. Asistentul va continua fără a instala pachetul Gecko." IDS_CANTMAKEINETSHORTCUT "Eșec în crearea scurtăturii la Internet." IDS_CANTMAKESHORTCUT "Eșec în crearea scurtăturii." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index f440f30ace..59b6710f9d 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -82,4 +82,7 @@ BEGIN IDS_DWL_FAILED "Не удалось скачать пакет установки Gecko, проверьте ваше подключение к сети интернет. Установка будет продолжена без включения пакета Gecko." IDS_CANTMAKEINETSHORTCUT "Не удалось создать ярлык интернета." IDS_CANTMAKESHORTCUT "Не удалось создать ярлык." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index e17a74484f..ab136de8f3 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -86,4 +86,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index cc374b659a..161f72f7e7 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -86,4 +86,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index 3e3c2b3ade..34f4f76f9e 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -84,4 +84,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index c6973974b6..4b5fef4fc2 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -90,4 +90,7 @@ BEGIN IDS_DWL_FAILED "Не вдалося завантажити пакет встановки Gecko. Перевірте ваше підключення до мережі інтернет. Встановка буде продовжена без включення пакета Gecko." IDS_CANTMAKEINETSHORTCUT "Не вдалося створити ярлик інтернету." IDS_CANTMAKESHORTCUT "Не вдалося створити ярлик." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 22deec74bb..a14128d0d4 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -91,4 +91,7 @@ BEGIN IDS_DWL_FAILED "无法下载 Gecko 安装包。请确保您有互联网连接才能进行下载。安装程序将在不安装 Gecko 的情况下继续。" IDS_CANTMAKEINETSHORTCUT "无法创建 Internet 快捷方式" IDS_CANTMAKESHORTCUT "无法创建快捷方式。" + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index 02c360daa9..6397cfadba 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -89,4 +89,7 @@ BEGIN IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NO_MEMORY "No memory could be allocated!" + IDS_NO_DIRECTORY "No directory given!" + IDS_INVALID_PATH "The given path is invalid!" END diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h index c4119aa4bc..d91a360e17 100644 --- a/dll/cpl/appwiz/resource.h +++ b/dll/cpl/appwiz/resource.h @@ -25,6 +25,9 @@ #define IDS_NEW_INTERNET_SHORTCUT 2023 #define IDS_CANTMAKEINETSHORTCUT 2024 #define IDS_CANTMAKESHORTCUT 2025 +#define IDS_NO_MEMORY 2026 +#define IDS_NO_DIRECTORY 2027 +#define IDS_INVALID_PATH 2028 #define IDS_DOWNLOADING 14 #define IDS_INSTALLING 15

5 years, 8 months

[reactos] 05/05: [SERVICES] Properly check again PID

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c10901966e233dbc3bcb2… commit c10901966e233dbc3bcb25a33a8161a5c34009e9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 30 21:25:48 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 30 21:44:40 2018 +0100 [SERVICES] Properly check again PID This fixes services not being found. With that commit and the previous one, I_QueryTagInformation is now fully functionnal and properly returns service name for a specific tag --- base/system/services/database.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 60e6d4bea1..11e0d0d676 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -147,7 +147,8 @@ ScmGetServiceImageByImagePath(LPWSTR lpImagePath) DWORD -ScmGetServiceNameFromTag(PTAG_INFO_NAME_FROM_TAG_IN_PARAMS InParams, PTAG_INFO_NAME_FROM_TAG_OUT_PARAMS *OutParams) +ScmGetServiceNameFromTag(IN PTAG_INFO_NAME_FROM_TAG_IN_PARAMS InParams, + OUT PTAG_INFO_NAME_FROM_TAG_OUT_PARAMS *OutParams) { PLIST_ENTRY ServiceEntry; PSERVICE CurrentService; @@ -172,7 +173,7 @@ ScmGetServiceNameFromTag(PTAG_INFO_NAME_FROM_TAG_IN_PARAMS InParams, PTAG_INFO_N { CurrentImage = CurrentService->lpImage; /* And matching the PID */ - if (CurrentImage->hProcess == (HANDLE)InParams->dwPid) + if (CurrentImage->dwProcessId == InParams->dwPid) { break; } @@ -220,7 +221,10 @@ Cleanup: /* If failure, free allocated memory */ if (dwError != ERROR_SUCCESS) { - MIDL_user_free(OutBuffer); + if (OutBuffer != NULL) + { + MIDL_user_free(OutBuffer); + } } /* Return error/success */

5 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018