Ros-diffs June 2023

ros-diffs@reactos.org

20 participants
155 discussions

[reactos] 01/01: [NET] Add the net session command
by Eric Kohl 22 Jun '23

22 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a38b133dd1379417889ad… commit a38b133dd1379417889ad165650748e01add7dd1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 22 12:40:46 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 22 12:40:46 2023 +0200 [NET] Add the net session command --- base/applications/network/net/CMakeLists.txt | 1 + base/applications/network/net/cmdSession.c | 154 +++++++++++++++++++++++++++ base/applications/network/net/main.c | 2 +- base/applications/network/net/net.h | 3 + 4 files changed, 159 insertions(+), 1 deletion(-) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index bac107000f2..a990a9c2f6f 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND SOURCE cmdHelpMsg.c cmdLocalGroup.c cmdPause.c + cmdSession.c cmdShare.c cmdStart.c cmdStatistics.c diff --git a/base/applications/network/net/cmdSession.c b/base/applications/network/net/cmdSession.c new file mode 100644 index 00000000000..90763b31ac6 --- /dev/null +++ b/base/applications/network/net/cmdSession.c @@ -0,0 +1,154 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: base/applications/network/net/cmdSession.c + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "net.h" + +static +VOID +SecondsToDurationString( + _Out_ PWSTR DurationString, + _In_ size_t DurationStringSize, + _In_ DWORD dwDuration) +{ + DWORD dwHours, dwRemainingSeconds, dwMinutes, dwSeconds; + + dwHours = dwDuration / 3600; + dwRemainingSeconds = dwDuration % 3600; + dwMinutes = dwRemainingSeconds / 60; + dwSeconds = dwRemainingSeconds % 60; + + StringCchPrintfW(DurationString, DurationStringSize, L"%02lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds); +} + + +NET_API_STATUS +EnumSessions( + _In_ PWSTR pszComputerName, + _In_ BOOL bList) +{ + PSESSION_INFO_2 pBuffer = NULL; + WCHAR DurationBuffer[10]; + DWORD dwRead = 0, dwTotal = 0, i; + DWORD ResumeHandle = 0; + NET_API_STATUS Status; + + Status = NetSessionEnum(pszComputerName, + NULL, + NULL, + 2, + (LPBYTE*)&pBuffer, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &ResumeHandle); + if ((Status != NERR_Success) && (Status != ERROR_MORE_DATA)) + { +// PrintMessageStringV(3502, Status); + ConPrintf(StdOut, L"System error %lu has occurred.\n\n", Status); + return Status; + } + + if (dwTotal == 0) + { + PrintMessageString(3683); + } + else + { + ConPuts(StdOut, L"\n"); + PrintMessageString(4750); + PrintPadding(L'-', 79); + ConPuts(StdOut, L"\n"); + + for (i = 0; i < dwRead; i++) + { + if (pBuffer[i].sesi2_cname) + { + SecondsToDurationString(DurationBuffer, + ARRAYSIZE(DurationBuffer), + pBuffer[i].sesi2_idle_time); + + ConPrintf(StdOut, L"%-22.22s %-20.20s %-17.17s %-5lu %-8.8s\n", + pBuffer[i].sesi2_cname, + pBuffer[i].sesi2_username, + pBuffer[i].sesi2_cltype_name, + pBuffer[i].sesi2_num_opens, + DurationBuffer); + } + } + } + + NetApiBufferFree(pBuffer); + + return NERR_Success; +} + + +INT +cmdSession( + _In_ INT argc, + _In_ WCHAR **argv) +{ + PWSTR pszComputerName = NULL; + BOOL bList = FALSE; + BOOL bDelete = FALSE; + INT i = 0; + NET_API_STATUS Status; + INT result = 0; + + for (i = 2; i < argc; i++) + { + if (argv[i][0] == L'\\' && argv[i][1] == L'\\' && pszComputerName == NULL) + { + pszComputerName = argv[i]; + i++; + } + else if (_wcsicmp(argv[i], L"/list") == 0) + { + bList = TRUE; + continue; + } + else if (_wcsicmp(argv[i], L"/delete") == 0) + { + bDelete = TRUE; + continue; + } + else if (_wcsicmp(argv[i], L"/help") == 0) + { + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); + PrintNetMessage(MSG_SESSION_SYNTAX); + PrintNetMessage(MSG_SESSION_HELP); + return 0; + } + else + { + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); + PrintNetMessage(MSG_SESSION_SYNTAX); + return 1; + } + } + + if (bDelete) + Status = NetSessionDel(pszComputerName, NULL, NULL); + else + Status = EnumSessions(pszComputerName, bList); + + if (Status == NERR_Success) + { + PrintErrorMessage(ERROR_SUCCESS); + } + else + { + PrintErrorMessage(Status); + result = 1; + } + + return result; +} + +/* EOF */ diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index af56a0cbc2d..2da58adf5d8 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -30,7 +30,7 @@ COMMAND cmds[] = {L"helpmsg", cmdHelpMsg}, {L"localgroup", cmdLocalGroup}, {L"pause", cmdPause}, - {L"session", unimplemented}, + {L"session", cmdSession}, {L"share", cmdShare}, {L"start", cmdStart}, {L"statistics", cmdStatistics}, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index 7840027bd1a..a3659f73b33 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -22,6 +22,8 @@ #include <lm.h> #include <ndk/rtlfuncs.h> +#include <strsafe.h> + #include <conutils.h> #include <net_msg.h> @@ -82,6 +84,7 @@ INT cmdHelp(INT argc, WCHAR **argv); INT cmdHelpMsg(INT argc, WCHAR **argv); INT cmdLocalGroup(INT argc, WCHAR **argv); INT cmdPause(INT argc, WCHAR **argv); +INT cmdSession(INT argc, WCHAR **argv); INT cmdShare(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStatistics(INT argc, WCHAR **argv);

1 0

[reactos] 01/01: [IPCONFIG] Convert more strings to resources
by Eric Kohl 22 Jun '23

22 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0b40ce52074cb2e03ac0… commit b0b40ce52074cb2e03ac0028d9cbfd9731442a0e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 22 10:19:01 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 22 10:19:01 2023 +0200 [IPCONFIG] Convert more strings to resources --- base/applications/network/ipconfig/ipconfig.c | 44 +++++++++++------------- base/applications/network/ipconfig/lang/bg-BG.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/de-DE.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/el-GR.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/en-US.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/es-ES.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/fr-FR.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/id-ID.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/it-IT.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/no-NO.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/pl-PL.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/ro-RO.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/ru-RU.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/sk-SK.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/sq-AL.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/sv-SE.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/tr-TR.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/uk-UA.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/zh-CN.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/zh-TW.rc | 23 +++++++++++++ base/applications/network/ipconfig/resource.h | 22 +++++++++++- 21 files changed, 478 insertions(+), 25 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 7a151f2559f..584ca887e94 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -908,6 +908,9 @@ DisplayDnsRecord( IN6_ADDR Addr6; DNS_STATUS Status; + ConResPrintf(StdOut, IDS_DNSNAME, pszName); + ConResPrintf(StdOut, IDS_DNSLINE); + pQueryResults = NULL; Status = DnsQuery_W(pszName, wType, @@ -919,48 +922,41 @@ DisplayDnsRecord( { if (Status == DNS_ERROR_RCODE_NAME_ERROR) { - _tprintf(_T("\t%ls\n"), pszName); - _tprintf(_T("\t----------------------------------------\n")); _tprintf(_T("\tName does not exist\n\n")); } else if (Status == DNS_INFO_NO_RECORDS) { - _tprintf(_T("\t%ls\n"), pszName); - _tprintf(_T("\t----------------------------------------\n")); _tprintf(_T("\tNo records of type %s\n\n"), GetRecordTypeName(wType)); } return; } - _tprintf(_T("\t%ls\n"), pszName); - _tprintf(_T("\t----------------------------------------\n")); - pThisRecord = pQueryResults; while (pThisRecord != NULL) { pNextRecord = pThisRecord->pNext; - _tprintf(_T("\tRecord Name . . . . . : %ls\n"), pThisRecord->pName); - _tprintf(_T("\tRecord Type . . . . . : %hu\n"), pThisRecord->wType); - _tprintf(_T("\tTime To Live. . . . . : %lu\n"), pThisRecord->dwTtl); - _tprintf(_T("\tData Length . . . . . : %hu\n"), pThisRecord->wDataLength); + ConResPrintf(StdOut, IDS_DNSRECORDNAME, pThisRecord->pName); + ConResPrintf(StdOut, IDS_DNSRECORDTYPE, pThisRecord->wType); + ConResPrintf(StdOut, IDS_DNSRECORDTTL, pThisRecord->dwTtl); + ConResPrintf(StdOut, IDS_DNSRECORDLENGTH, pThisRecord->wDataLength); switch (pThisRecord->Flags.S.Section) { case DnsSectionQuestion: - _tprintf(_T("\tSection . . . . . . . : Question\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONQUESTION); break; case DnsSectionAnswer: - _tprintf(_T("\tSection . . . . . . . : Answer\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONANSWER); break; case DnsSectionAuthority: - _tprintf(_T("\tSection . . . . . . . : Authority\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONAUTHORITY); break; case DnsSectionAdditional: - _tprintf(_T("\tSection . . . . . . . : Additional\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONADDITIONAL); break; } @@ -969,41 +965,41 @@ DisplayDnsRecord( case DNS_TYPE_A: Addr4.S_un.S_addr = pThisRecord->Data.A.IpAddress; RtlIpv4AddressToStringW(&Addr4, szBuffer); - _tprintf(_T("\tA (Host) Record . . . : %ls\n"), szBuffer); + ConResPrintf(StdOut, IDS_DNSTYPEA, szBuffer); break; case DNS_TYPE_NS: - _tprintf(_T("\tNS Record . . . . . . : %ls\n"), pThisRecord->Data.NS.pNameHost); + ConResPrintf(StdOut, IDS_DNSTYPENS, pThisRecord->Data.NS.pNameHost); break; case DNS_TYPE_CNAME: - _tprintf(_T("\tCNAME Record. . . . . : %ls\n"), pThisRecord->Data.CNAME.pNameHost); + ConResPrintf(StdOut, IDS_DNSTYPECNAME, pThisRecord->Data.CNAME.pNameHost); break; case DNS_TYPE_SOA: - _tprintf(_T("\tSOA Record. . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPESOA); break; case DNS_TYPE_PTR: - _tprintf(_T("\tPTR Record. . . . . . : %ls\n"), pThisRecord->Data.PTR.pNameHost); + ConResPrintf(StdOut, IDS_DNSTYPEPTR, pThisRecord->Data.PTR.pNameHost); break; case DNS_TYPE_MX: - _tprintf(_T("\tMX Record . . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPEMX); break; case DNS_TYPE_AAAA: RtlCopyMemory(&Addr6, &pThisRecord->Data.AAAA.Ip6Address, sizeof(IN6_ADDR)); RtlIpv6AddressToStringW(&Addr6, szBuffer); - _tprintf(_T("\tAAAA Record . . . . . : %ls\n"), szBuffer); + ConResPrintf(StdOut, IDS_DNSTYPEAAAA, szBuffer); break; case DNS_TYPE_ATMA: - _tprintf(_T("\tATMA Record . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPEATMA); break; case DNS_TYPE_SRV: - _tprintf(_T("\tSRV Record. . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPESRV); break; } _tprintf(_T("\n\n")); diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index cfa706418a1..67fcab7c545 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index b7136810f79..2788460232f 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -68,6 +68,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN IDS_USAGE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index d7e7a1585a3..44a9ce651cf 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index 8d33d506eb0..69ea5958ae8 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index bdb3e1dfa9c..48e73d3bfea 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index 88d297a961d..78223397e4b 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -68,6 +68,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index f442fae3711..31bece7980e 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index 45b57227c72..4d7b83b882c 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index c907d5e658e..1b1f933e8b6 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index 8c2c462ba7f..abc25ad6e5b 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -68,6 +68,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 6c5acb0bdeb..5acd0ba3182 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index aac83b8b48b..1885f431762 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index 4b8731c998c..ce93ddd2cd5 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index edbe6c993ea..7c0428eed2c 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index bdc504bef09..f87b63858ac 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index 49a28b2b5de..ec3886819c5 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index 36284eb5983..a0b1f03afc9 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index a10faa26b45..d816fb3c454 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 70c9e3d5bfe..23eaf9ea424 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/resource.h b/base/applications/network/ipconfig/resource.h index 73750c0caa5..39bed5ca353 100644 --- a/base/applications/network/ipconfig/resource.h +++ b/base/applications/network/ipconfig/resource.h @@ -48,4 +48,24 @@ #define IDS_SLIP 152 #define IDS_WIFI 153 -#define IDS_USAGE 160 +#define IDS_DNSNAME 160 +#define IDS_DNSLINE 161 +#define IDS_DNSRECORDNAME 162 +#define IDS_DNSRECORDTYPE 163 +#define IDS_DNSRECORDTTL 164 +#define IDS_DNSRECORDLENGTH 165 +#define IDS_DNSSECTIONQUESTION 166 +#define IDS_DNSSECTIONANSWER 167 +#define IDS_DNSSECTIONAUTHORITY 168 +#define IDS_DNSSECTIONADDITIONAL 169 +#define IDS_DNSTYPEA 170 +#define IDS_DNSTYPENS 171 +#define IDS_DNSTYPECNAME 172 +#define IDS_DNSTYPESOA 173 +#define IDS_DNSTYPEPTR 174 +#define IDS_DNSTYPEMX 175 +#define IDS_DNSTYPEAAAA 176 +#define IDS_DNSTYPEATMA 177 +#define IDS_DNSTYPESRV 178 + +#define IDS_USAGE 180

1 0

[reactos] 01/01: [MSPAINT] s/Bound/Clamp/
by Katayama Hirofumi MZ 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d04e049284a934aea538b… commit d04e049284a934aea538b3f0a2defd6d1ac4c55f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 22 07:57:36 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 22 07:57:36 2023 +0900 [MSPAINT] s/Bound/Clamp/ CORE-18867 --- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/history.h | 2 +- base/applications/mspaint/mouse.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 46a7341ff1c..91cc1736614 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -254,7 +254,7 @@ void ImageModel::RotateNTimes90Degrees(int iN) NotifyImageChanged(); } -void ImageModel::Bound(POINT& pt) const +void ImageModel::Clamp(POINT& pt) const { pt.x = max(0, min(pt.x, GetWidth())); pt.y = max(0, min(pt.y, GetHeight())); diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 2b74f306248..321680236c7 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -36,7 +36,7 @@ public: void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); - void Bound(POINT& pt) const; + void Clamp(POINT& pt) const; void NotifyImageChanged(); protected: diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index dad03d9fc0a..0bb4607ad05 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -159,7 +159,7 @@ struct FreeSelTool : ToolBase if (bLeftButton) { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } @@ -247,7 +247,7 @@ struct RectSelTool : ToolBase if (bLeftButton) { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } @@ -258,7 +258,7 @@ struct RectSelTool : ToolBase POINT pt = { x, y }; if (bLeftButton) { - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); selectionModel.m_bShow = !selectionModel.m_rc.IsRectEmpty(); imageModel.NotifyImageChanged(); @@ -528,7 +528,7 @@ struct TextTool : ToolBase void UpdatePoint(LONG x, LONG y) { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } @@ -572,7 +572,7 @@ struct TextTool : ToolBase void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow);

1 0

[reactos] 01/01: [MSPAINT] s/pointSP/s_pointSP/ and s/pointStack/s_pointStack/
by Katayama Hirofumi MZ 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec53d4227807256ae0359… commit ec53d4227807256ae0359810430c072840acf888 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 22 07:28:15 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 22 07:28:15 2023 +0900 [MSPAINT] s/pointSP/s_pointSP/ and s/pointStack/s_pointStack/ CORE-18867 --- base/applications/mspaint/mouse.cpp | 90 +++++++++++++++++----------------- base/applications/mspaint/toolsmodel.h | 4 +- base/applications/mspaint/winproc.cpp | 8 +-- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 29959f1bb38..dad03d9fc0a 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -11,8 +11,8 @@ #include "precomp.h" -INT ToolBase::pointSP = 0; -POINT ToolBase::pointStack[256] = { { 0 } }; +INT ToolBase::s_pointSP = 0; +POINT ToolBase::s_pointStack[256] = { { 0 } }; /* FUNCTIONS ********************************************************/ @@ -65,7 +65,7 @@ void updateLast(LONG x, LONG y) void ToolBase::reset() { - pointSP = 0; + s_pointSP = 0; g_ptStart.x = g_ptStart.y = g_ptEnd.x = g_ptEnd.y = -1; selectionModel.ResetPtStack(); if (selectionModel.m_bShow) @@ -675,17 +675,17 @@ struct BezierTool : ToolBase return; COLORREF rgb = (m_bLeftButton ? m_fg : m_bg); - switch (pointSP) + switch (s_pointSP) { case 1: - Line(hdc, pointStack[0].x, pointStack[0].y, pointStack[1].x, pointStack[1].y, rgb, + Line(hdc, s_pointStack[0].x, s_pointStack[0].y, s_pointStack[1].x, s_pointStack[1].y, rgb, toolsModel.GetLineWidth()); break; case 2: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], rgb, toolsModel.GetLineWidth()); + Bezier(hdc, s_pointStack[0], s_pointStack[2], s_pointStack[2], s_pointStack[1], rgb, toolsModel.GetLineWidth()); break; case 3: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], rgb, toolsModel.GetLineWidth()); + Bezier(hdc, s_pointStack[0], s_pointStack[2], s_pointStack[3], s_pointStack[1], rgb, toolsModel.GetLineWidth()); break; } } @@ -697,15 +697,15 @@ struct BezierTool : ToolBase if (!m_bDrawing) { m_bDrawing = TRUE; - pointStack[pointSP].x = pointStack[pointSP + 1].x = x; - pointStack[pointSP].y = pointStack[pointSP + 1].y = y; - ++pointSP; + s_pointStack[s_pointSP].x = s_pointStack[s_pointSP + 1].x = x; + s_pointStack[s_pointSP].y = s_pointStack[s_pointSP + 1].y = y; + ++s_pointSP; } else { - ++pointSP; - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + ++s_pointSP; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; } imageModel.NotifyImageChanged(); @@ -713,16 +713,16 @@ struct BezierTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); } void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; - if (pointSP >= 3) + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; + if (s_pointSP >= 3) { OnFinishDraw(); return; @@ -777,13 +777,13 @@ struct ShapeTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) { - if (pointSP <= 0) + if (s_pointSP <= 0) return; if (m_bLeftButton) - Poly(hdc, pointStack, pointSP + 1, m_fg, m_bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); + Poly(hdc, s_pointStack, s_pointSP + 1, m_fg, m_bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); else - Poly(hdc, pointStack, pointSP + 1, m_bg, m_fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); + Poly(hdc, s_pointStack, s_pointSP + 1, m_bg, m_fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override @@ -791,23 +791,23 @@ struct ShapeTool : ToolBase m_bLeftButton = bLeftButton; m_bClosed = FALSE; - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) - roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; - if (pointSP && bDoubleClick) + if (s_pointSP && bDoubleClick) { OnFinishDraw(); return; } - if (pointSP == 0) + if (s_pointSP == 0) { - pointSP++; - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointSP++; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; } imageModel.NotifyImageChanged(); @@ -815,35 +815,35 @@ struct ShapeTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) - roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); } void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) - roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); m_bClosed = FALSE; - if (nearlyEqualPoints(x, y, pointStack[0].x, pointStack[0].y)) + if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); return; } else { - pointSP++; - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointSP++; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; } - if (pointSP == _countof(pointStack)) - pointSP--; + if (s_pointSP == _countof(s_pointStack)) + s_pointSP--; imageModel.NotifyImageChanged(); } @@ -855,9 +855,9 @@ struct ShapeTool : ToolBase void OnFinishDraw() override { - if (pointSP) + if (s_pointSP) { - --pointSP; + --s_pointSP; m_bClosed = TRUE; imageModel.PushImageForUndo(); @@ -865,7 +865,7 @@ struct ShapeTool : ToolBase } m_bClosed = FALSE; - pointSP = 0; + s_pointSP = 0; ToolBase::OnFinishDraw(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b31183b3584..f7d29c28a0e 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -36,8 +36,8 @@ struct ToolBase TOOLTYPE m_tool; HDC m_hdc; COLORREF m_fg, m_bg; - static INT pointSP; - static POINT pointStack[256]; + static INT s_pointSP; + static POINT s_pointStack[256]; ToolBase(TOOLTYPE tool) : m_tool(tool), m_hdc(NULL) { } virtual ~ToolBase() { } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 41829b84b8f..b07f44da4bb 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -422,7 +422,7 @@ BOOL CMainWindow::CanUndo() const return (BOOL)textEditWindow.SendMessage(EM_CANUNDO); if (selectionModel.m_bShow && toolsModel.IsSelection()) return TRUE; - if (ToolBase::pointSP != 0) + if (ToolBase::s_pointSP != 0) return TRUE; return imageModel.CanUndo(); } @@ -431,7 +431,7 @@ BOOL CMainWindow::CanRedo() const { if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) return FALSE; // There is no "WM_REDO" in EDIT control - if (ToolBase::pointSP != 0) + if (ToolBase::s_pointSP != 0) return TRUE; return imageModel.CanRedo(); } @@ -696,7 +696,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } } - if (ToolBase::pointSP != 0) // drawing something? + if (ToolBase::s_pointSP != 0) // drawing something? { canvasWindow.cancelDrawing(); break; @@ -709,7 +709,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH // There is no "WM_REDO" in EDIT control break; } - if (ToolBase::pointSP != 0) // drawing something? + if (ToolBase::s_pointSP != 0) // drawing something? { canvasWindow.finishDrawing(); break;

1 0

[reactos] 01/01: [MSPAINT] Fix ShapeTool with Shift key (#5358)
by Katayama Hirofumi MZ 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa6d74a01c149355633f… commit 3fa6d74a01c149355633fc41c4d955098bea4d95 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 22 07:19:48 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 22 07:19:48 2023 +0900 [MSPAINT] Fix ShapeTool with Shift key (#5358) Fix the behavior of the ShapeTool in pressing Shift key. CORE-18867 --- base/applications/mspaint/mouse.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 2ba45a2d0e2..29959f1bb38 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -791,6 +791,9 @@ struct ShapeTool : ToolBase m_bLeftButton = bLeftButton; m_bClosed = FALSE; + if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -812,12 +815,12 @@ struct ShapeTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + imageModel.NotifyImageChanged(); }

1 0

[reactos] 01/01: [WIN32SS][NTDDRAW] Don't startup DirectX graphics each time on DirectDraw object creation (#5329)
by Oleg Dubinskiy 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7ccb36b9babef32fb9ed… commit e7ccb36b9babef32fb9ed050bfe54f45164e642c Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jun 21 18:03:27 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 21 18:03:27 2023 +0200 [WIN32SS][NTDDRAW] Don't startup DirectX graphics each time on DirectDraw object creation (#5329) CORE-17561, CORE-17932, CORE-18221 Do it at each system startup instead: Remove old DirectX initialization code. It's now outdated and not needed anymore. Previously, the corresponding hackish intEnableReactXDriver() function did two things: load dxg.sys and enable DirectDraw. Now loading DirectX graphics is done during WINSRV initialization, and enabling DirectDraw is called during each (and also first) display mode switch, as in Windows. As debug analysis proves, there are no any other calls in NtGdiDdCreateDirectDrawObject, besides the corresponding DXG function. --- win32ss/reactx/ntddraw/ddraw.c | 89 --------------------------------------- win32ss/reactx/ntddraw/intddraw.h | 1 - 2 files changed, 90 deletions(-) diff --git a/win32ss/reactx/ntddraw/ddraw.c b/win32ss/reactx/ntddraw/ddraw.c index 4bd290ed986..76e32179182 100644 --- a/win32ss/reactx/ntddraw/ddraw.c +++ b/win32ss/reactx/ntddraw/ddraw.c @@ -26,88 +26,6 @@ ULONG gdwDirectDrawContext = 0; #define DXDBG 1 -/************************************************************************/ -/* DirectX graphic/video driver enable start here */ -/************************************************************************/ -BOOL -intEnableReactXDriver(HDC hdc) -{ - NTSTATUS Status; - PEPROCESS Proc = NULL; - PDC pDC = NULL; - PPDEVOBJ pDev = NULL; - PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; - BOOL success = FALSE; - - /* FIXME: Get the process data */ - - /* Do not try load dxg.sys when it have already been load once */ - if (gpfnStartupDxGraphics == NULL) - { - Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Warning: Failed to create the directx interface\n"); - return FALSE; - } - } - - pDC = DC_LockDc(hdc); - if (pDC == NULL) - { - DPRINT1("Warning: Failed to lock hdc\n"); - return FALSE; - } - - pDev = pDC->ppdev; - - /* Test and see if drv got a DX interface or not */ - if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || - ( pDev->DriverFunctions.EnableDirectDraw == NULL)) - { - DPRINT1("Warning : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); - } - else - { - - /* Check and see if DX has been enabled or not */ - if ( pDev->pEDDgpl->pvmList == NULL) - { - pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); - pDev->pEDDgpl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); - pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); - - pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; - if (pfnDdEnableDirectDraw == NULL) - { - DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); - } - else - { - DPRINT1(" call to pfnDdEnableDirectDraw \n "); - - /* Note: it is the hdev struct it wants, not the drv hPDev aka pdc->PDev */ - success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE); - } - } - else - { - DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); - success = TRUE; - } - } - - - DPRINT1("Return value : 0x%08x\n",success); - DC_UnlockDc(pDC); - DPRINT1(" end call to pfnDdEnableDirectDraw \n "); - return success; -} - -/************************************************************************/ -/* DirectX graphic/video driver enable ends here */ -/************************************************************************/ - /************************************************************************/ /* DirectX graphic/video driver loading and cleanup starts here */ /************************************************************************/ @@ -219,13 +137,6 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) return 0; } - /* FIXME: This should be alloc for each drv and use it from each drv, not global for whole win32k */ - if (intEnableReactXDriver(hdc) == FALSE) - { - DPRINT1("Warning: Failed to start the DirectX interface from the graphic driver\n"); - return DDHAL_DRIVER_NOTHANDLED; - } - /* Get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; diff --git a/win32ss/reactx/ntddraw/intddraw.h b/win32ss/reactx/ntddraw/intddraw.h index 5dcf1d28774..c592ea08a51 100644 --- a/win32ss/reactx/ntddraw/intddraw.h +++ b/win32ss/reactx/ntddraw/intddraw.h @@ -8,7 +8,6 @@ #include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ -BOOL intEnableReactXDriver(HDC); NTSTATUS APIENTRY DxDdStartupDxGraphics(ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); extern DRVFN gpDxFuncs[];

1 0

[reactos] 01/01: [WIN32SS][ENG][NTDDRAW] Manage DirectDraw instances when switching display mode (#4519)
by Oleg Dubinskiy 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e034377b51a11e6894ba3… commit e034377b51a11e6894ba3b558b1990342cac681c Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jun 21 18:00:24 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 21 18:00:24 2023 +0200 [WIN32SS][ENG][NTDDRAW] Manage DirectDraw instances when switching display mode (#4519) CORE-17932 [ENG] Implement DirectDraw management in switch display mode functions (e.g. resolution change, color depth, display frequency etc.): - Switch DirectDraw instances between the two PDEVs (the current one and the new one allocated by ourselves) by calling dxg!DxDdDynamicModeChange function. - Suspend them before and resume after the display mode switch, by calling dxg!DxDdsuspendDirectDraw and dxg!DxDdResumeDirectDraw appropriately. We currently don't have these functions implemented, but MS DXG has, so it allows to properly manage DirectDraw PDEVs using this driver, similarly to Windows. My analysis confirms that these functions are always called in XP/2k3 on display mode switch, even when there is no any DirectX app running at the moment. Analyzing their prototypes show that my guesses are correct. - Initialize hDev and dhpdev members for EDD_DIRECTDRAW_GLOBAL for newly created surfaces, switch them during mode change and re-initialize after it also. They are commonly used by DirectDraw stack. In addition, enable DirectDraw for old and new PDEVs, by calling dxg!DxDdEnableDirectDraw function. [NTDDRAW] Additionally, fix usage of DirectDraw lock count in the PDEVOBJ structure. - Enable cDirectDrawDisableLocks member for storing its value, instead of DxDd_nCount, which is marked as ROS-specific. - Use it in win32k!DxEngGet/SetHdevData for getting/setting DirectDraw count appropriately. My analysis also shows that in Windows, the PDEVOBJ::cDirectDrawDisableLocks method calls DxEngGetHdevData with type 8, which corresponds to our DxDd_nCount. So there are no doubts that this member is used there. - Rename DxEngGetHdevData_dd_count alias of type 8 to DxEngGetHdevData_dd_locks, to match more accurately an actual member name. Update the enumeration and fix all code parts appropriately. All these changes allow to properly change display mode during executing DirectDraw applications, when they try to switch in full-screen mode. At least a bugcheck that happened before my changes, does no longer appear. There are still some games that don't run correctly, as if there is no 3D acceleration (which actually exists). This requires further investigations. --- sdk/include/reactos/drivers/directx/dxeng.h | 2 +- sdk/include/reactos/drivers/directx/dxg.h | 2 +- win32ss/gdi/eng/pdevobj.c | 85 +++++++++++++++++++++++++++-- win32ss/gdi/eng/pdevobj.h | 3 +- win32ss/reactx/dxg/ddraw.c | 2 +- win32ss/reactx/ntddraw/dxeng.c | 11 ++-- win32ss/reactx/ntddraw/intddraw.h | 5 ++ 7 files changed, 94 insertions(+), 16 deletions(-) diff --git a/sdk/include/reactos/drivers/directx/dxeng.h b/sdk/include/reactos/drivers/directx/dxeng.h index 8a349ce6507..fa2f248e7cf 100644 --- a/sdk/include/reactos/drivers/directx/dxeng.h +++ b/sdk/include/reactos/drivers/directx/dxeng.h @@ -57,7 +57,7 @@ typedef enum _DXEGSHDEVDATA DxEGShDevData_DrvFuncs, DxEGShDevData_dhpdev, DxEGShDevData_eddg, - DxEGShDevData_dd_nCount, + DxEGShDevData_dd_locks, DxEGShDevData_dd_flags, DxEGShDevData_disable, DxEGShDevData_metadev, diff --git a/sdk/include/reactos/drivers/directx/dxg.h b/sdk/include/reactos/drivers/directx/dxg.h index 33a815a2a61..470597ad1de 100644 --- a/sdk/include/reactos/drivers/directx/dxg.h +++ b/sdk/include/reactos/drivers/directx/dxg.h @@ -197,7 +197,7 @@ typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, //typedef x (NTAPI *PGD_DxDdHeapVidMemAllocAligned)( //typedef x (NTAPI *PGD_DxDdHeapVidMemFree)( typedef BOOLEAN (NTAPI *PGD_DXDDENABLEDIRECTDRAW)(PVOID, BOOLEAN); -//typedef x (NTAPI *PGD_DxDdDisableDirectDraw)( +typedef VOID (NTAPI *PGD_DXDDDISABLEDIRECTDRAW)(PVOID, BOOLEAN); //typedef x (NTAPI *PGD_DxDdSuspendDirectDraw)( //typedef x (NTAPI *PGD_DxDdResumeDirectDraw)( //typedef x (NTAPI *PGD_DxDdDynamicModeChange)( diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index c8af5c7e9c3..ed6fc630e76 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Support for physical devices * FILE: win32ss/gdi/eng/pdevobj.c - * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROGRAMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ #include <win32k.h> @@ -336,6 +337,55 @@ PDEVOBJ_pSurface( return ppdev->pSurface; } +BOOL +PDEVOBJ_bEnableDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; + BOOL Success; + + /* Enable DirectDraw */ + TRACE("DxDdEnableDirectDraw(ppdev %p)\n", ppdev); + Success = pfnDdEnableDirectDraw((HDEV)ppdev, TRUE); + TRACE("DxDdEnableDirectDraw(ppdev %p) => %d\n", ppdev, Success); + + return Success; +} + +VOID +PDEVOBJ_vResumeDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDRESUMEDIRECTDRAW pfnDdResumeDirectDraw = (PGD_DXDDRESUMEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdResumeDirectDraw].pfn; + + /* Resume DirectDraw after mode change */ + TRACE("DxDdResumeDirectDraw(ppdev %p)\n", ppdev); + pfnDdResumeDirectDraw((HDEV)ppdev, 0); +} + +VOID +PDEVOBJ_vSuspendDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDSUSPENDDIRECTDRAW pfnDdSuspendDirectDraw = (PGD_DXDDSUSPENDDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdSuspendDirectDraw].pfn; + + /* Suspend DirectDraw for mode change */ + TRACE("DxDdSuspendDirectDraw(ppdev %p)\n", ppdev); + pfnDdSuspendDirectDraw((HDEV)ppdev, 0); +} + +VOID +PDEVOBJ_vSwitchDirectDraw( + _Inout_ PPDEVOBJ ppdev, + _Inout_ PPDEVOBJ ppdev2) +{ + PGD_DXDDDYNAMICMODECHANGE pfnDdDynamicModeChange = (PGD_DXDDDYNAMICMODECHANGE)gpDxFuncs[DXG_INDEX_DxDdDynamicModeChange].pfn; + + /* Switch DirectDraw instances between the PDEVs */ + TRACE("DxDdDynamicModeChange(ppdev %p, ppdev2 %p)\n", ppdev, ppdev2); + pfnDdDynamicModeChange((HDEV)ppdev, (HDEV)ppdev2, 0); +} + VOID PDEVOBJ_vEnableDisplay( _Inout_ PPDEVOBJ ppdev) @@ -365,6 +415,8 @@ PDEVOBJ_bDisableDisplay( if (ppdev->flFlags & PDEV_DISABLED) return TRUE; + PDEVOBJ_vSuspendDirectDraw(ppdev); + TRACE("DrvAssertMode(dhpdev %p, FALSE)\n", ppdev->dhpdev); assertVal = ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE); TRACE("DrvAssertMode(dhpdev %p, FALSE) => %d\n", ppdev->dhpdev, assertVal); @@ -548,6 +600,15 @@ PDEVOBJ_Create( return NULL; } + /* Enable DirectDraw */ + if (!PDEVOBJ_bEnableDirectDraw(ppdev)) + { + ERR("Failed to enable DirectDraw\n"); + PDEVOBJ_vRelease(ppdev); + EngUnloadImage(pldev); + return NULL; + } + /* Remove some acceleration capabilities from driver */ PDEVOBJ_vFilterDriverHooks(ppdev); @@ -631,6 +692,9 @@ PDEVOBJ_bDynamicModeChange( ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); + /* Switch DirectDraw mode */ + PDEVOBJ_vSwitchDirectDraw(ppdev, ppdev2); + return TRUE; } @@ -660,6 +724,8 @@ PDEVOBJ_bSwitchMode( if (!PDEVOBJ_bDisableDisplay(ppdev)) { DPRINT1("PDEVOBJ_bDisableDisplay() failed\n"); + /* Resume DirectDraw in case of failure */ + PDEVOBJ_vResumeDirectDraw(ppdev); goto leave; } @@ -680,11 +746,11 @@ PDEVOBJ_bSwitchMode( goto leave2; } - /* 4. Get DirectDraw information */ - /* 5. Enable DirectDraw Not traced */ - /* 6. Copy old PDEV state to new PDEV instance */ + /* 4. Temporarily suspend DirectDraw for mode change */ + PDEVOBJ_vSuspendDirectDraw(ppdev); + PDEVOBJ_vSuspendDirectDraw(ppdevTmp); - /* 7. Switch the PDEVs */ + /* 5. Switch the PDEVs */ if (!PDEVOBJ_bDynamicModeChange(ppdev, ppdevTmp)) { DPRINT1("PDEVOBJ_bDynamicModeChange() failed\n"); @@ -692,10 +758,17 @@ PDEVOBJ_bSwitchMode( goto leave2; } - /* 8. Disable DirectDraw */ + /* 6. Resume DirectDraw */ + PDEVOBJ_vResumeDirectDraw(ppdev); + PDEVOBJ_vResumeDirectDraw(ppdevTmp); + /* Release temp PDEV */ PDEVOBJ_vRelease(ppdevTmp); + /* Re-initialize DirectDraw data */ + ppdev->pEDDgpl->hDev = (HDEV)ppdev; + ppdev->pEDDgpl->dhpdev = ppdev->dhpdev; + /* Update primary display capabilities */ if (ppdev == gpmdev->ppdevGlobal) { diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index b9d439d3dda..a58eb1aa2ab 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -101,7 +101,7 @@ typedef struct _PDEVOBJ // RFONT * prfntInactive; // ULONG cInactive; // BYTE ajbo[0x5C]; -// ULONG cDirectDrawDisableLocks; + ULONG cDirectDrawDisableLocks; // PVOID TypeOneInfo; PVOID pvGammaRamp; /* Gamma ramp pointer. */ PVOID RemoteTypeOne; @@ -140,7 +140,6 @@ typedef struct _PDEVOBJ }; /* ros specific */ - ULONG DxDd_nCount; GDIPOINTER Pointer; /* Stuff to keep track of software cursors; win32k gdi part */ UINT SafetyRemoveLevel; /* at what level was the cursor removed? diff --git a/win32ss/reactx/dxg/ddraw.c b/win32ss/reactx/dxg/ddraw.c index 1a639a39ef1..12ed339367d 100644 --- a/win32ss/reactx/dxg/ddraw.c +++ b/win32ss/reactx/dxg/ddraw.c @@ -563,7 +563,7 @@ DxDdReenableDirectDrawObject( gpEngFuncs.DxEngGetDCState(hDC, 2) != 1 && !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_OpenRefs)) && !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_disable)) && - !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_nCount)) && + !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_locks)) && gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_DitherFmt) >= BMF_8BPP) { // reset acceleration and suspend flags diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index a096bf5f350..bcd0db67e26 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -324,9 +324,9 @@ DxEngGetHdevData(HDEV hDev, DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); retVal = (DWORD_PTR) PDev->pEDDgpl; break; - case DxEGShDevData_dd_nCount: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_nCount\n"); - retVal = (DWORD_PTR) PDev->DxDd_nCount; + case DxEGShDevData_dd_locks: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_locks\n"); + retVal = (DWORD_PTR) PDev->cDirectDrawDisableLocks; break; case DxEGShDevData_dd_flags: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); @@ -413,9 +413,10 @@ DxEngSetHdevData(HDEV hDev, DPRINT1("ReactX Calling : DxEngSetHdevData DXEGSHDEVDATA : %ld\n", Type); - if ( Type == DxEGShDevData_dd_nCount ) + if (Type == DxEGShDevData_dd_locks) { - ((PPDEVOBJ)hDev)->DxDd_nCount = Data; + DPRINT1("Assigning value %d\n", Data); + ((PPDEVOBJ)hDev)->cDirectDrawDisableLocks = Data; retVal = TRUE; // Set } return retVal; diff --git a/win32ss/reactx/ntddraw/intddraw.h b/win32ss/reactx/ntddraw/intddraw.h index c1ab8c945b0..5dcf1d28774 100644 --- a/win32ss/reactx/ntddraw/intddraw.h +++ b/win32ss/reactx/ntddraw/intddraw.h @@ -108,6 +108,11 @@ typedef VOID (APIENTRY *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); typedef PDD_SURFACE_LOCAL (APIENTRY *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef BOOL (APIENTRY *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); +/* Other internal functions */ +typedef VOID (APIENTRY *PGD_DXDDDYNAMICMODECHANGE)(HDEV, HDEV, ULONG_PTR); +typedef VOID (APIENTRY *PGD_DXDDRESUMEDIRECTDRAW)(HDEV, ULONG_PTR); +typedef VOID (APIENTRY *PGD_DXDDSUSPENDDIRECTDRAW)(HDEV, ULONG_PTR); + /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL);

1 0

[reactos] 02/02: [MINIHAL] Remove sysinfo.c from compilation.
by Hermès Bélusca-Maïto 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa613b9da95348b8ef38… commit 3fa613b9da95348b8ef38f5799f659e6acfc63ce Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 19:17:41 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 22:40:58 2023 +0200 [MINIHAL] Remove sysinfo.c from compilation. --- hal/halx86/minihal/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 58e640180d8..de7f4de04ed 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND MINI_HAL_SOURCE ../generic/misc.c ../generic/nmi.c ../generic/spinlock.c - ../generic/sysinfo.c ../generic/timer.c ../generic/usage.c ../pic/pic.c

1 0

[reactos] 01/02: [HALX86] Tabs to 4-space indentation in generic/sysinfo.c + Fix typo "ALMI" -> "AMLI"
by Hermès Bélusca-Maïto 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6a78d580b9676ca8c245… commit d6a78d580b9676ca8c24500e8668d179a0434815 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 19:02:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 22:40:57 2023 +0200 [HALX86] Tabs to 4-space indentation in generic/sysinfo.c + Fix typo "ALMI" -> "AMLI" --- hal/halx86/generic/sysinfo.c | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/hal/halx86/generic/sysinfo.c b/hal/halx86/generic/sysinfo.c index ba880f380c3..209fc8e1fc9 100644 --- a/hal/halx86/generic/sysinfo.c +++ b/hal/halx86/generic/sysinfo.c @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -HAL_AMLI_BAD_IO_ADDRESS_LIST HalALMIBadIOAddressList[] = +HAL_AMLI_BAD_IO_ADDRESS_LIST HalAMLIBadIOAddressList[] = { { 0x0000, 0x10, 1, NULL }, // DMA controller { 0x0020, 0x02, 0, NULL }, // Programmable Interrupt Controller (8259A) @@ -58,59 +58,59 @@ HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, OUT PULONG ReturnedLength) { #define REPORT_THIS_CASE(X) case X: DPRINT1("Unhandled case: %s\n", #X); break - switch (InformationClass) - { - REPORT_THIS_CASE(HalInstalledBusInformation); - REPORT_THIS_CASE(HalProfileSourceInformation); - REPORT_THIS_CASE(HalInformationClassUnused1); - REPORT_THIS_CASE(HalPowerInformation); - REPORT_THIS_CASE(HalProcessorSpeedInformation); - REPORT_THIS_CASE(HalCallbackInformation); - REPORT_THIS_CASE(HalMapRegisterInformation); - REPORT_THIS_CASE(HalMcaLogInformation); - case HalFrameBufferCachingInformation: - { + switch (InformationClass) + { + REPORT_THIS_CASE(HalInstalledBusInformation); + REPORT_THIS_CASE(HalProfileSourceInformation); + REPORT_THIS_CASE(HalInformationClassUnused1); + REPORT_THIS_CASE(HalPowerInformation); + REPORT_THIS_CASE(HalProcessorSpeedInformation); + REPORT_THIS_CASE(HalCallbackInformation); + REPORT_THIS_CASE(HalMapRegisterInformation); + REPORT_THIS_CASE(HalMcaLogInformation); + case HalFrameBufferCachingInformation: + { /* FIXME: TODO */ return STATUS_NOT_IMPLEMENTED; - } - REPORT_THIS_CASE(HalDisplayBiosInformation); - REPORT_THIS_CASE(HalProcessorFeatureInformation); - REPORT_THIS_CASE(HalNumaTopologyInterface); - REPORT_THIS_CASE(HalErrorInformation); - REPORT_THIS_CASE(HalCmcLogInformation); - REPORT_THIS_CASE(HalCpeLogInformation); - REPORT_THIS_CASE(HalQueryMcaInterface); - case HalQueryAMLIIllegalIOPortAddresses: - { - ULONG Size = sizeof(HalALMIBadIOAddressList); - NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; + } + REPORT_THIS_CASE(HalDisplayBiosInformation); + REPORT_THIS_CASE(HalProcessorFeatureInformation); + REPORT_THIS_CASE(HalNumaTopologyInterface); + REPORT_THIS_CASE(HalErrorInformation); + REPORT_THIS_CASE(HalCmcLogInformation); + REPORT_THIS_CASE(HalCpeLogInformation); + REPORT_THIS_CASE(HalQueryMcaInterface); + case HalQueryAMLIIllegalIOPortAddresses: + { + ULONG Size = sizeof(HalAMLIBadIOAddressList); + NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; - if (BufferSize >= Size) - { - RtlCopyMemory(Buffer, HalALMIBadIOAddressList, Size); - Status = STATUS_SUCCESS; - } + if (BufferSize >= Size) + { + RtlCopyMemory(Buffer, HalAMLIBadIOAddressList, Size); + Status = STATUS_SUCCESS; + } - *ReturnedLength = Size; - KeFlushWriteBuffer(); - return Status; - } + *ReturnedLength = Size; + KeFlushWriteBuffer(); + return Status; + } - REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); - REPORT_THIS_CASE(HalPartitionIpiInterface); - REPORT_THIS_CASE(HalPlatformInformation); - REPORT_THIS_CASE(HalQueryProfileSourceList); - REPORT_THIS_CASE(HalInitLogInformation); - REPORT_THIS_CASE(HalFrequencyInformation); - REPORT_THIS_CASE(HalProcessorBrandString); - REPORT_THIS_CASE(HalHypervisorInformation); - REPORT_THIS_CASE(HalPlatformTimerInformation); - REPORT_THIS_CASE(HalAcpiAuditInformation); - } + REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); + REPORT_THIS_CASE(HalPartitionIpiInterface); + REPORT_THIS_CASE(HalPlatformInformation); + REPORT_THIS_CASE(HalQueryProfileSourceList); + REPORT_THIS_CASE(HalInitLogInformation); + REPORT_THIS_CASE(HalFrequencyInformation); + REPORT_THIS_CASE(HalProcessorBrandString); + REPORT_THIS_CASE(HalHypervisorInformation); + REPORT_THIS_CASE(HalPlatformTimerInformation); + REPORT_THIS_CASE(HalAcpiAuditInformation); + } #undef REPORT_THIS_CASE - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS

1 0

[reactos] 01/01: [MINIHAL] Remove unneeded files from compilation.
by Hermès Bélusca-Maïto 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d03fc32e7d456a5ddcf5f… commit d03fc32e7d456a5ddcf5f1ac7c01e9f4898842e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 14:29:44 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 18:39:01 2023 +0200 [MINIHAL] Remove unneeded files from compilation. --- hal/halx86/generic/bios.c | 6 ------ hal/halx86/generic/display.c | 2 -- hal/halx86/minihal/CMakeLists.txt | 5 ----- 3 files changed, 13 deletions(-) diff --git a/hal/halx86/generic/bios.c b/hal/halx86/generic/bios.c index be5e082d1fc..9c5c4907158 100644 --- a/hal/halx86/generic/bios.c +++ b/hal/halx86/generic/bios.c @@ -202,7 +202,6 @@ HalpDispatchV86Opcode(IN PKTRAP_FRAME TrapFrame) /* V86 TRAP HANDLERS **********************************************************/ -#ifndef _MINIHAL_ DECLSPEC_NORETURN VOID FASTCALL @@ -285,7 +284,6 @@ HalpBiosCall(VOID) /* Exit to V86 mode */ HalpExitToV86((PKTRAP_FRAME)&V86TrapFrame); } -#endif /* FUNCTIONS ******************************************************************/ @@ -443,7 +441,6 @@ HalpRestoreIopm(VOID) while (i--) HalpSavedIoMap[HalpSavedIoMapData[i][0]] = HalpSavedIoMapData[i][1]; } -#ifndef _MINIHAL_ VOID NTAPI HalpMapRealModeMemory(VOID) @@ -531,7 +528,6 @@ HalpSwitchToRealModeTrapHandlers(VOID) // KeRegisterInterruptHandler(6, HalpTrap06); } -#endif VOID NTAPI @@ -641,7 +637,6 @@ HalpUnmapRealModeMemory(VOID) HalpFlushTLB(); } -#ifndef _MINIHAL_ BOOLEAN NTAPI HalpBiosDisplayReset(VOID) @@ -716,6 +711,5 @@ HalpBiosDisplayReset(VOID) return TRUE; #endif } -#endif /* EOF */ diff --git a/hal/halx86/generic/display.c b/hal/halx86/generic/display.c index dc5f821240e..449ddc2986d 100644 --- a/hal/halx86/generic/display.c +++ b/hal/halx86/generic/display.c @@ -31,10 +31,8 @@ VOID NTAPI HalDisplayString(IN PCH String) { -#ifndef _MINIHAL_ /* Call the Inbv driver */ InbvDisplayString(String); -#endif } /* diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 32d510f2a8b..58e640180d8 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -6,9 +6,7 @@ list(APPEND MINI_HAL_SOURCE ../legacy/bus/isabus.c ../legacy/bus/pcibus.c ../legacy/bussupp.c - ../generic/bios.c ../generic/dma.c - ../generic/display.c ../generic/drive.c ../generic/misc.c ../generic/nmi.c @@ -25,7 +23,6 @@ if(SARCH STREQUAL "xbox") list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/cmos.c - ../generic/profil.c ../xbox/clock.c ../xbox/reboot.c) elseif(SARCH STREQUAL "pc98") @@ -33,14 +30,12 @@ elseif(SARCH STREQUAL "pc98") ../pc98/beep.c ../pc98/clock.c ../pc98/cmos.c - ../pc98/profil.c ../pc98/reboot.c) else() list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/clock.c ../generic/cmos.c - ../generic/profil.c ../generic/reboot.c) endif()

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2023