Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [DNSAPI] Simplify the directory structure
by Eric Kohl 17 Nov '19

17 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=872fc17d0d133928303fe… commit 872fc17d0d133928303fe12b29cfdc6bf1994657 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 17 16:31:30 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 17 16:37:13 2019 +0100 [DNSAPI] Simplify the directory structure --- dll/win32/dnsapi/CMakeLists.txt | 20 ++++++++++---------- dll/win32/dnsapi/{dnsapi => }/adns.c | 0 dll/win32/dnsapi/{dnsapi => }/context.c | 0 dll/win32/dnsapi/{dnsapi => }/memory.c | 0 dll/win32/dnsapi/{dnsapi => }/names.c | 0 dll/win32/dnsapi/{dnsapi => }/precomp.h | 0 dll/win32/dnsapi/{dnsapi => }/query.c | 0 dll/win32/dnsapi/{dnsapi => }/record.c | 0 dll/win32/dnsapi/{dnsapi => }/rpc.c | 0 dll/win32/dnsapi/{dnsapi => }/stubs.c | 0 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index 244e764e697..8aeb4af58a2 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -11,15 +11,15 @@ add_definitions(-DADNS_JGAA_WIN32 -D_CRT_NO_POSIX_ERROR_CODES) spec2def(dnsapi.dll dnsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE - dnsapi/adns.c - dnsapi/context.c - dnsapi/memory.c - dnsapi/names.c - dnsapi/query.c - dnsapi/record.c - dnsapi/rpc.c - dnsapi/stubs.c - dnsapi/precomp.h + adns.c + context.c + memory.c + names.c + query.c + record.c + rpc.c + stubs.c + precomp.h ${CMAKE_CURRENT_BINARY_DIR}/dnsrslvr_c.c) add_library(dnsapi MODULE @@ -31,5 +31,5 @@ add_library(dnsapi MODULE set_module_type(dnsapi win32dll) target_link_libraries(dnsapi adns ${PSEH_LIB}) add_importlibs(dnsapi advapi32 rpcrt4 user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) -add_pch(dnsapi dnsapi/precomp.h SOURCE) +add_pch(dnsapi precomp.h SOURCE) add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/dnsapi/dnsapi/adns.c b/dll/win32/dnsapi/adns.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/adns.c rename to dll/win32/dnsapi/adns.c diff --git a/dll/win32/dnsapi/dnsapi/context.c b/dll/win32/dnsapi/context.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/context.c rename to dll/win32/dnsapi/context.c diff --git a/dll/win32/dnsapi/dnsapi/memory.c b/dll/win32/dnsapi/memory.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/memory.c rename to dll/win32/dnsapi/memory.c diff --git a/dll/win32/dnsapi/dnsapi/names.c b/dll/win32/dnsapi/names.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/names.c rename to dll/win32/dnsapi/names.c diff --git a/dll/win32/dnsapi/dnsapi/precomp.h b/dll/win32/dnsapi/precomp.h similarity index 100% rename from dll/win32/dnsapi/dnsapi/precomp.h rename to dll/win32/dnsapi/precomp.h diff --git a/dll/win32/dnsapi/dnsapi/query.c b/dll/win32/dnsapi/query.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/query.c rename to dll/win32/dnsapi/query.c diff --git a/dll/win32/dnsapi/dnsapi/record.c b/dll/win32/dnsapi/record.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/record.c rename to dll/win32/dnsapi/record.c diff --git a/dll/win32/dnsapi/dnsapi/rpc.c b/dll/win32/dnsapi/rpc.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/rpc.c rename to dll/win32/dnsapi/rpc.c diff --git a/dll/win32/dnsapi/dnsapi/stubs.c b/dll/win32/dnsapi/stubs.c similarity index 100% rename from dll/win32/dnsapi/dnsapi/stubs.c rename to dll/win32/dnsapi/stubs.c

1 0

[reactos] 01/01: [NTOS:IO] Fix result length for DevicePropertyRemovalPolicy request in IoGetDeviceProperty. Classpnp expects it to be sizeof(DEVICE_REMOVAL_POLICY) see ClasspInitializeHotplugInfo in classpnp.sys
by Victor Perevertkin 17 Nov '19

17 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d046e0ed2a8aa0a380fe… commit 3d046e0ed2a8aa0a380fe6c008c6bc207d53ec9e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Nov 16 23:52:03 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sun Nov 17 18:36:28 2019 +0300 [NTOS:IO] Fix result length for DevicePropertyRemovalPolicy request in IoGetDeviceProperty. Classpnp expects it to be sizeof(DEVICE_REMOVAL_POLICY) see ClasspInitializeHotplugInfo in classpnp.sys CORE-6264 --- ntoskrnl/io/pnpmgr/pnpmgr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 56b3561fefe..b08f63eb289 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -4240,6 +4240,7 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject, GUID BusTypeGuid; POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; BOOLEAN NullTerminate = FALSE; + DEVICE_REMOVAL_POLICY Policy; DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty); @@ -4357,7 +4358,9 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject, break; case DevicePropertyRemovalPolicy: - PIP_RETURN_DATA(sizeof(UCHAR), &DeviceNode->RemovalPolicy); + + Policy = DeviceNode->RemovalPolicy; + PIP_RETURN_DATA(sizeof(Policy), &Policy); /* Handle the registry-based properties */ case DevicePropertyUINumber:

1 0

[reactos] 01/01: [IPCONFIG] Display missing record types and record names
by Eric Kohl 17 Nov '19

17 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50605143f66a142b80672… commit 50605143f66a142b80672aba107d3672bcab1936 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Nov 17 13:23:40 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Nov 17 13:24:25 2019 +0100 [IPCONFIG] Display missing record types and record names --- base/applications/network/ipconfig/ipconfig.c | 111 ++++++++++++++++++++++++-- 1 file changed, 106 insertions(+), 5 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index c81c6e31ca8..e6cd2449902 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -29,11 +29,96 @@ #include "resource.h" +typedef struct _RECORDTYPE +{ + WORD wRecordType; + LPTSTR pszRecordName; +} RECORDTYPE, *PRECORDTYPE; + #define GUID_LEN 40 HINSTANCE hInstance; HANDLE ProcessHeap; +RECORDTYPE TypeArray[] = +{ + {DNS_TYPE_ZERO, _T("ZERO")}, + {DNS_TYPE_A, _T("A")}, + {DNS_TYPE_NS, _T("NS")}, + {DNS_TYPE_MD, _T("MD")}, + {DNS_TYPE_MF, _T("MF")}, + {DNS_TYPE_CNAME, _T("CNAME")}, + {DNS_TYPE_SOA, _T("SOA")}, + {DNS_TYPE_MB, _T("MB")}, + {DNS_TYPE_MG, _T("MG")}, + {DNS_TYPE_MR, _T("MR")}, + {DNS_TYPE_NULL, _T("NULL")}, + {DNS_TYPE_WKS, _T("WKS")}, + {DNS_TYPE_PTR, _T("PTR")}, + {DNS_TYPE_HINFO, _T("HINFO")}, + {DNS_TYPE_MINFO, _T("MINFO")}, + {DNS_TYPE_MX, _T("MX")}, + {DNS_TYPE_TEXT, _T("TXT")}, + {DNS_TYPE_RP, _T("RP")}, + {DNS_TYPE_AFSDB, _T("AFSDB")}, + {DNS_TYPE_X25, _T("X25")}, + {DNS_TYPE_ISDN, _T("ISDN")}, + {DNS_TYPE_RT, _T("RT")}, + {DNS_TYPE_NSAP, _T("NSAP")}, + {DNS_TYPE_NSAPPTR, _T("NSAPPTR")}, + {DNS_TYPE_SIG, _T("SIG")}, + {DNS_TYPE_KEY, _T("KEY")}, + {DNS_TYPE_PX, _T("PX")}, + {DNS_TYPE_GPOS, _T("GPOS")}, + {DNS_TYPE_AAAA, _T("AAAA")}, + {DNS_TYPE_LOC, _T("LOC")}, + {DNS_TYPE_NXT, _T("NXT")}, + {DNS_TYPE_EID, _T("EID")}, + {DNS_TYPE_NIMLOC, _T("NIMLOC")}, + {DNS_TYPE_SRV, _T("SRV")}, + {DNS_TYPE_ATMA, _T("ATMA")}, + {DNS_TYPE_NAPTR, _T("NAPTR")}, + {DNS_TYPE_KX, _T("KX")}, + {DNS_TYPE_CERT, _T("CERT")}, + {DNS_TYPE_A6, _T("A6")}, + {DNS_TYPE_DNAME, _T("DNAME")}, + {DNS_TYPE_SINK, _T("SINK")}, + {DNS_TYPE_OPT, _T("OPT")}, + {DNS_TYPE_UINFO, _T("UINFO")}, + {DNS_TYPE_UID, _T("UID")}, + {DNS_TYPE_GID, _T("GID")}, + {DNS_TYPE_UNSPEC, _T("UNSPEC")}, + {DNS_TYPE_ADDRS, _T("ADDRS")}, + {DNS_TYPE_TKEY, _T("TKEY")}, + {DNS_TYPE_TSIG, _T("TSIG")}, + {DNS_TYPE_IXFR, _T("IXFR")}, + {DNS_TYPE_AXFR, _T("AXFR")}, + {DNS_TYPE_MAILB, _T("MAILB")}, + {DNS_TYPE_MAILA, _T("MAILA")}, + {DNS_TYPE_ALL, _T("ALL")}, + {0, NULL} +}; + +LPTSTR +GetRecordTypeName(WORD wType) +{ + static TCHAR szType[8]; + INT i; + + for (i = 0; ; i++) + { + if (TypeArray[i].pszRecordName == NULL) + break; + + if (TypeArray[i].wRecordType == wType) + return TypeArray[i].pszRecordName; + } + + _stprintf(szType, _T("%hu"), wType); + + return szType; +} + int LoadStringAndOem(HINSTANCE hInst, UINT uID, LPTSTR szNode, @@ -773,7 +858,7 @@ DisplayDnsRecord( { _tprintf(_T("\t%S\n"), pszName); _tprintf(_T("\t----------------------------------------\n")); - _tprintf(_T("\tNo records of type %hu\n\n"), wType); + _tprintf(_T("\tNo records of type %s\n\n"), GetRecordTypeName(wType)); } return; } @@ -818,10 +903,6 @@ DisplayDnsRecord( _tprintf(_T("\tA (Host) Record . . . : %S\n"), szBuffer); break; - case DNS_TYPE_PTR: - _tprintf(_T("\tPTR Record. . . . . . : %S\n"), pThisRecord->Data.PTR.pNameHost); - break; - case DNS_TYPE_NS: _tprintf(_T("\tNS Record . . . . . . : %S\n"), pThisRecord->Data.NS.pNameHost); break; @@ -830,11 +911,31 @@ DisplayDnsRecord( _tprintf(_T("\tCNAME Record. . . . . : %S\n"), pThisRecord->Data.CNAME.pNameHost); break; + case DNS_TYPE_SOA: + _tprintf(_T("\tSOA Record. . . . . . : \n")); + break; + + case DNS_TYPE_PTR: + _tprintf(_T("\tPTR Record. . . . . . : %S\n"), pThisRecord->Data.PTR.pNameHost); + break; + + case DNS_TYPE_MX: + _tprintf(_T("\tMX Record . . . . . . : \n")); + break; + case DNS_TYPE_AAAA: RtlCopyMemory(&Addr6, &pThisRecord->Data.AAAA.Ip6Address, sizeof(IN6_ADDR)); RtlIpv6AddressToStringW(&Addr6, szBuffer); _tprintf(_T("\tAAAA Record . . . . . : %S\n"), szBuffer); break; + + case DNS_TYPE_ATMA: + _tprintf(_T("\tATMA Record . . . . . : \n")); + break; + + case DNS_TYPE_SRV: + _tprintf(_T("\tSRV Record. . . . . . : \n")); + break; } _tprintf(_T("\n\n"));

1 0

[reactos] 01/01: [RAPPS] Improve Japanese translation
by Katayama Hirofumi MZ 17 Nov '19

17 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa9145d30503548418318… commit fa9145d30503548418318e965efe7398050ae185 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 17 19:46:56 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 17 19:46:56 2019 +0900 [RAPPS] Improve Japanese translation --- base/applications/rapps/lang/ja-JP.rc | 78 +++++++++++++++++------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 6e780ca649e..5618427dfdb 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -66,12 +66,12 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "選択(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "インストール後にプログラムのインストーラを削除する(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + GROUPBOX "プロキシ", -1, 4, 116, 240, 76 + CONTROL "システムプロキシ設定", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "直接 (プロキシなし)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "プロキシ", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "次のはプロキシなし", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "デフォルト", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 DEFPUSHBUTTON "OK", IDOK, 116, 195, 60, 14 @@ -83,7 +83,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "プログラムのインストール" FONT 9, "MS UI Gothic" BEGIN - LTEXT "…", IDC_INSTALL_TEXT, 4, 5, 209, 35 + LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 AUTORADIOBUTTON "ディスクからインストール (CD や DVD)(&I)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP AUTORADIOBUTTON "ダウンロードしてインストール(&D)", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 86, 78, 60, 14 @@ -92,7 +92,7 @@ END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE -CAPTION "ダウンロード %ls…" +CAPTION "ダウンロード %ls..." FONT 9, "MS UI Gothic" BEGIN CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 @@ -152,7 +152,7 @@ END STRINGTABLE BEGIN IDS_AINFO_VERSION "\nバージョン: " - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\n利用可能なバージョン: " IDS_AINFO_DESCRIPTION "\n概要: " IDS_AINFO_SIZE "\nサイズ: " IDS_AINFO_URLSITE "\nホームページ: " @@ -178,13 +178,13 @@ BEGIN IDS_CAT_SCIENCE "科学" IDS_CAT_TOOLS "ツール" IDS_CAT_VIDEO "ビデオ" - IDS_CAT_THEMES "Themes" + IDS_CAT_THEMES "テーマ" END STRINGTABLE BEGIN IDS_APPTITLE "ReactOS アプリケーションマネージャ" - IDS_SEARCH_TEXT "検索…" + IDS_SEARCH_TEXT "検索..." IDS_INSTALL "インストール" IDS_UNINSTALL "アンインストール" IDS_MODIFY "変更" @@ -200,52 +200,52 @@ BEGIN IDS_CHOOSE_FOLDER_ERROR "指定されたフォルダは存在しません!" IDS_APP_REG_REMOVE "レジストリからインストールされたプログラムに関するデータを削除してもよろしいですか?" IDS_INFORMATION "情報" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD "パッケージをダウンロードできません! アドレスが見つからない!" + IDS_UNABLE_TO_DOWNLOAD2 "パッケージをダウンロードできません! インターネット接続を確認して!" IDS_UNABLE_TO_REMOVE "レジストリからこのプログラムに関するデータを削除できません!" - IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" - IDS_INTEG_CHECK_TITLE "Verifying package integrity…" - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_SELECT_ALL "Select/Deselect All" - IDS_INSTALL_SELECTED "Install Selected" - IDS_SELECTEDFORINST "Selected for installation" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_TO_INSTALL "インストーラを開けません!" + IDS_UNABLE_TO_QUERY_CERT "証明書情報を取得できません。\n\nそれでも続けますか？" + IDS_INTEG_CHECK_TITLE "パッケージの構成を確認しています..." + IDS_INTEG_CHECK_FAIL "このパッケージは構成チェックに失格しました。おそらく壊れているか、インストール中に破損したと考えられます。このソフトを実行するのはお勧めできません。" + IDS_INTERRUPTED_DOWNLOAD "ダウンロードは中断しました。インターネット接続を確認して下さい。" + IDS_UNABLE_TO_WRITE "ディスクへの書き込みができません。容量を確認して下さい。" + IDS_SELECT_ALL "すべて選択/非選択" + IDS_INSTALL_SELECTED "選択をインストール" + IDS_SELECTEDFORINST "インストールを選択済み" + IDS_MISMATCH_CERT_INFO "証明書は未知のものです:\nSubject: %s\nIssuer: %s\nそれでも続けますか？" END STRINGTABLE BEGIN - IDS_STATUS_INSTALLED "Installed" - IDS_STATUS_NOTINSTALLED "Not installed" - IDS_STATUS_DOWNLOADED "Downloaded" - IDS_STATUS_UPDATE_AVAILABLE "Update available" - IDS_STATUS_DOWNLOADING "Downloading…" - IDS_STATUS_INSTALLING "Installing…" - IDS_STATUS_WAITING "Waiting to install…" - IDS_STATUS_FINISHED "Finished" + IDS_STATUS_INSTALLED "インストール済み" + IDS_STATUS_NOTINSTALLED "未インストール" + IDS_STATUS_DOWNLOADED "ダウンロード完了" + IDS_STATUS_UPDATE_AVAILABLE "更新があります" + IDS_STATUS_DOWNLOADING "ダウンロード中..." + IDS_STATUS_INSTALLING "インストール中..." + IDS_STATUS_WAITING "インストール待ち..." + IDS_STATUS_FINISHED "完了" END STRINGTABLE BEGIN - IDS_LICENSE_OPENSOURCE "Open Source" - IDS_LICENSE_FREEWARE "Freeware" - IDS_LICENSE_TRIAL "Trial/Demo" + IDS_LICENSE_OPENSOURCE "オープンソース" + IDS_LICENSE_FREEWARE "フリーソフト" + IDS_LICENSE_TRIAL "試用/デモ" END STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" - IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" - IDS_LANGUAGE_SINGLE "Single language" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "あなたの言語をサポート" + IDS_LANGUAGE_NO_TRANSLATION "他の言語をサポート" + IDS_LANGUAGE_ENGLISH_TRANSLATION "英語をサポート" + IDS_LANGUAGE_SINGLE "単一言語" IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Applications Database" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" + IDS_DL_DIALOG_DB_DISP "アプリのデータベース" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "データベースを更新中..." END

1 0

[reactos] 01/01: [NOTEPAD] Improve Japanese translation
by Katayama Hirofumi MZ 17 Nov '19

17 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=120457665cfb159b14216… commit 120457665cfb159b142161aae59dd4c20cf09398 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 17 19:34:36 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 17 19:34:44 2019 +0900 [NOTEPAD] Improve Japanese translation --- base/applications/notepad/lang/ja-JP.rc | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index d703d400771..9f5dedadd3b 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -70,37 +70,37 @@ END DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 9, "MS UI Gothic" -CAPTION "Page Setup" +CAPTION "ページ設定" BEGIN - GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX + GROUPBOX "プレビュー", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 22, 36, 8 + GROUPBOX "用紙", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "サイズ(&S):", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 42, 36, 8 + LTEXT "トレイ(&T):", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "方向", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "縦向き(&P)", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "横向き(&L)", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 82, 30, 8 + LTEXT "左(&E):", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Right:", stc16, 159, 82, 30, 8 + LTEXT "右(&R):", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "T&op:", stc17, 88, 102, 30, 8 + LTEXT "上(&O):", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Bottom:", stc18, 159, 102, 30, 8 + LTEXT "下(&B):", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Header:", 0x140, 8, 132, 40, 15 + LTEXT "ヘッダー(&H):", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Footer:", 0x142, 8, 149, 40, 15 + LTEXT "フッター(&F):", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 + PUSHBUTTON "ヘルプ(H)", IDHELP, 8, 170, 50, 14 DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 + PUSHBUTTON "キャンセル", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "プリンタ(&R)...", psh3, 310, 170, 50, 14 END /* Dialog 'Encoding' */ @@ -163,8 +163,8 @@ BEGIN STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "%d 行、%d 列" - STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END

1 0

[reactos] 01/01: [BROWSEUI][SHELL32] Fix scroll to selection CORE-16504
by Joachim Henze 17 Nov '19

17 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc047f96303a05e94cdf5… commit dc047f96303a05e94cdf51b7291528046fd249d2 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Nov 17 02:04:27 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Nov 17 02:04:27 2019 +0100 [BROWSEUI][SHELL32] Fix scroll to selection CORE-16504 A patch by Katayama Hirofumi MZ The bug was unhidden by 0.4.14-dev-312-g b931f643e35e6a23dbef99e785804039ea579b6a --- dll/win32/browseui/desktopipc.cpp | 2 +- dll/win32/shell32/CDefView.cpp | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 7c794b6133f..02d60cb488d 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -380,7 +380,7 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters) hResult = psb->QueryActiveShellView(&shellView); if (SUCCEEDED(hResult)) { - shellView->SelectItem(pidlSelect, SVSI_SELECT|SVSI_ENSUREVISIBLE); + shellView->SelectItem(pidlSelect, SVSI_SELECT | SVSI_FOCUSED | SVSI_ENSUREVISIBLE); } ILFree(pidlSelect); } diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 66a77b608db..9fd104025a5 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -2379,9 +2379,6 @@ HRESULT WINAPI CDefView::SelectItem(PCUITEMID_CHILD pidl, UINT uFlags) if (i == -1) return S_OK; - if(uFlags & SVSI_ENSUREVISIBLE) - m_ListView.EnsureVisible(i, FALSE); - LVITEMW lvItem = {0}; lvItem.mask = LVIF_STATE; lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; @@ -2396,18 +2393,26 @@ HRESULT WINAPI CDefView::SelectItem(PCUITEMID_CHILD pidl, UINT uFlags) lvItem.state &= ~LVIS_SELECTED; if (uFlags & SVSI_FOCUSED) + lvItem.state |= LVIS_FOCUSED; + else lvItem.state &= ~LVIS_FOCUSED; } else { if (uFlags & SVSI_DESELECTOTHERS) + { lvItem.state &= ~LVIS_SELECTED; + } + lvItem.state &= ~LVIS_FOCUSED; } m_ListView.SetItem(&lvItem); lvItem.iItem++; } + if (uFlags & SVSI_ENSUREVISIBLE) + m_ListView.EnsureVisible(i, FALSE); + if((uFlags & SVSI_EDIT) == SVSI_EDIT) m_ListView.EditLabel(i);

1 0

[reactos] 01/01: [IPCONFIG] Display non-zero type records only and improve error messages
by Eric Kohl 16 Nov '19

16 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e196149b7123fb734b01a… commit e196149b7123fb734b01abf596515c79cdfca2f0 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 16 20:27:04 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 16 20:29:44 2019 +0100 [IPCONFIG] Display non-zero type records only and improve error messages --- base/applications/network/ipconfig/ipconfig.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 1b15e3f5369..c81c6e31ca8 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -763,14 +763,18 @@ DisplayDnsRecord( NULL); if (Status != ERROR_SUCCESS) { -#if 0 - if (wType != 0) + if (Status == DNS_ERROR_RCODE_NAME_ERROR) + { + _tprintf(_T("\t%S\n"), pszName); + _tprintf(_T("\t----------------------------------------\n")); + _tprintf(_T("\tName does not exist\n\n")); + } + else if (Status == DNS_INFO_NO_RECORDS) { _tprintf(_T("\t%S\n"), pszName); _tprintf(_T("\t----------------------------------------\n")); _tprintf(_T("\tNo records of type %hu\n\n"), wType); } -#endif return; } @@ -862,7 +866,9 @@ DisplayDns(VOID) { pNextEntry = pThisEntry->pNext; - DisplayDnsRecord(pThisEntry->pszName, pThisEntry->wType1); + if (pThisEntry->wType1 != 0) + DisplayDnsRecord(pThisEntry->pszName, pThisEntry->wType1); + if (pThisEntry->wType2 != 0) DisplayDnsRecord(pThisEntry->pszName, pThisEntry->wType2);

1 0

[reactos] 01/01: [ACPICA] Update to version 20191018. CORE-16434
by Thomas Faber 16 Nov '19

16 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d170b6ab3e01a5861f5da… commit d170b6ab3e01a5861f5da9f1399550fa20ca79e8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 19 16:15:32 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 16 16:12:16 2019 +0100 [ACPICA] Update to version 20191018. CORE-16434 This includes a cherry-pick of https://github.com/acpica/acpica/commit/3e0d03893cc7d24d3993798eeb535da057f… to fix build. --- drivers/bus/acpi/acpica/dispatcher/dscontrol.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 9 +--- drivers/bus/acpi/acpica/events/evgpeblk.c | 6 ++- drivers/bus/acpi/acpica/events/evgpeinit.c | 3 -- drivers/bus/acpi/acpica/events/evmisc.c | 17 ++++-- drivers/bus/acpi/acpica/events/evregion.c | 4 +- drivers/bus/acpi/acpica/events/evrgnini.c | 1 - drivers/bus/acpi/acpica/hardware/hwxfsleep.c | 4 ++ drivers/bus/acpi/acpica/include/acdebug.h | 4 ++ drivers/bus/acpi/acpica/include/acpixf.h | 10 +++- drivers/bus/acpi/acpica/include/acstruct.h | 13 +++++ drivers/bus/acpi/acpica/include/acutils.h | 9 ++-- .../bus/acpi/acpica/include/platform/acfreebsd.h | 4 ++ drivers/bus/acpi/acpica/namespace/nsconvert.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 6 +-- drivers/bus/acpi/acpica/namespace/nsxfname.c | 2 +- drivers/bus/acpi/acpica/parser/psobject.c | 6 +-- drivers/bus/acpi/acpica/resources/rscreate.c | 4 ++ drivers/bus/acpi/acpica/tables/tbdata.c | 4 ++ drivers/bus/acpi/acpica/tables/tbxfload.c | 49 ++++++++++++++++- drivers/bus/acpi/acpica/utilities/utbuffer.c | 62 ++++++++++++---------- drivers/bus/acpi/acpica/utilities/uttrack.c | 2 +- media/doc/3rd Party Files.txt | 2 +- 23 files changed, 161 insertions(+), 64 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c index b2bec503330..d78f765d7c2 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c +++ b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c @@ -127,7 +127,7 @@ AcpiDsExecBeginControlOp ( ControlState->Control.Opcode = Op->Common.AmlOpcode; ControlState->Control.LoopTimeout = AcpiOsGetTimer () + - (UINT64) (AcpiGbl_MaxLoopIterations * ACPI_100NSEC_PER_SEC); + ((UINT64) AcpiGbl_MaxLoopIterations * ACPI_100NSEC_PER_SEC); /* Push the control state on this walk's control stack */ diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index 43c1fe4fa1c..4c3c7ff22f3 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -201,7 +201,6 @@ AcpiDsCreateBufferField ( if (WalkState->DeferredNode) { Node = WalkState->DeferredNode; - Status = AE_OK; } else { @@ -327,7 +326,6 @@ AcpiDsGetFieldNames ( ACPI_PARSE_OBJECT *Child; #ifdef ACPI_EXEC_APP - UINT64 Value = 0; ACPI_OPERAND_OBJECT *ResultDesc; ACPI_OPERAND_OBJECT *ObjDesc; char *NamePath; @@ -469,14 +467,13 @@ AcpiDsGetFieldNames ( } #ifdef ACPI_EXEC_APP NamePath = AcpiNsGetExternalPathname (Info->FieldNode); - ObjDesc = AcpiUtCreateIntegerObject (Value); - if (ACPI_SUCCESS (AeLookupInitFileEntry (NamePath, &Value))) + if (ACPI_SUCCESS (AeLookupInitFileEntry (NamePath, &ObjDesc))) { AcpiExWriteDataToField (ObjDesc, AcpiNsGetAttachedObject (Info->FieldNode), &ResultDesc); + AcpiUtRemoveReference (ObjDesc); } - AcpiUtRemoveReference (ObjDesc); ACPI_FREE (NamePath); #endif } @@ -705,8 +702,6 @@ AcpiDsInitFieldObjects ( } /* Name already exists, just ignore this error */ - - Status = AE_OK; } Arg->Common.Node = Node; diff --git a/drivers/bus/acpi/acpica/events/evgpeblk.c b/drivers/bus/acpi/acpica/events/evgpeblk.c index b523bbf50a9..283b5ffedd2 100644 --- a/drivers/bus/acpi/acpica/events/evgpeblk.c +++ b/drivers/bus/acpi/acpica/events/evgpeblk.c @@ -164,6 +164,10 @@ AcpiEvDeleteGpeBlock ( /* Disable all GPEs in this block */ Status = AcpiHwDisableGpeBlock (GpeBlock->XruptBlock, GpeBlock, NULL); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } if (!GpeBlock->Previous && !GpeBlock->Next) { @@ -434,7 +438,7 @@ AcpiEvCreateGpeBlock ( WalkInfo.GpeDevice = GpeDevice; WalkInfo.ExecuteByOwnerId = FALSE; - Status = AcpiNsWalkNamespace (ACPI_TYPE_METHOD, GpeDevice, + (void) AcpiNsWalkNamespace (ACPI_TYPE_METHOD, GpeDevice, ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK, AcpiEvMatchGpeMethod, NULL, &WalkInfo, NULL); diff --git a/drivers/bus/acpi/acpica/events/evgpeinit.c b/drivers/bus/acpi/acpica/events/evgpeinit.c index 9b2d5ce928c..82d3e0c6efe 100644 --- a/drivers/bus/acpi/acpica/events/evgpeinit.c +++ b/drivers/bus/acpi/acpica/events/evgpeinit.c @@ -194,8 +194,6 @@ AcpiEvGpeInitialize ( * GPE0 and GPE1 do not have to be contiguous in the GPE number * space. However, GPE0 always starts at GPE number zero. */ - GpeNumberMax = AcpiGbl_FADT.Gpe1Base + - ((RegisterCount1 * ACPI_GPE_REGISTER_WIDTH) - 1); } } @@ -207,7 +205,6 @@ AcpiEvGpeInitialize ( ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "There are no GPE blocks defined in the FADT\n")); - Status = AE_OK; goto Cleanup; } diff --git a/drivers/bus/acpi/acpica/events/evmisc.c b/drivers/bus/acpi/acpica/events/evmisc.c index 37132d41bb6..b9bf22e44ad 100644 --- a/drivers/bus/acpi/acpica/events/evmisc.c +++ b/drivers/bus/acpi/acpica/events/evmisc.c @@ -292,11 +292,16 @@ AcpiEvTerminate ( /* Disable all GPEs in all GPE blocks */ Status = AcpiEvWalkGpeList (AcpiHwDisableGpeBlock, NULL); + if (ACPI_FAILURE (Status)) + { + ACPI_EXCEPTION ((AE_INFO, Status, + "Could not disable GPEs in GPE block")); + } Status = AcpiEvRemoveGlobalLockHandler (); - if (ACPI_FAILURE(Status)) + if (ACPI_FAILURE (Status)) { - ACPI_ERROR ((AE_INFO, + ACPI_EXCEPTION ((AE_INFO, Status, "Could not remove Global Lock handler")); } @@ -306,7 +311,7 @@ AcpiEvTerminate ( /* Remove SCI handlers */ Status = AcpiEvRemoveAllSciHandlers (); - if (ACPI_FAILURE(Status)) + if (ACPI_FAILURE (Status)) { ACPI_ERROR ((AE_INFO, "Could not remove SCI handler")); @@ -315,6 +320,12 @@ AcpiEvTerminate ( /* Deallocate all handler objects installed within GPE info structs */ Status = AcpiEvWalkGpeList (AcpiEvDeleteGpeHandlers, NULL); + if (ACPI_FAILURE (Status)) + { + ACPI_EXCEPTION ((AE_INFO, Status, + "Could not delete GPE handlers")); + } + /* Return to original mode if necessary */ diff --git a/drivers/bus/acpi/acpica/events/evregion.c b/drivers/bus/acpi/acpica/events/evregion.c index ea774e27b18..209bde717e4 100644 --- a/drivers/bus/acpi/acpica/events/evregion.c +++ b/drivers/bus/acpi/acpica/events/evregion.c @@ -929,11 +929,11 @@ AcpiEvOrphanEcRegMethod ( Objects[1].Type = ACPI_TYPE_INTEGER; Objects[1].Integer.Value = ACPI_REG_CONNECT; - Status = AcpiEvaluateObject (RegMethod, NULL, &Args, NULL); + (void) AcpiEvaluateObject (RegMethod, NULL, &Args, NULL); Exit: /* We ignore all errors from above, don't care */ - Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); + (void) AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); return_VOID; } diff --git a/drivers/bus/acpi/acpica/events/evrgnini.c b/drivers/bus/acpi/acpica/events/evrgnini.c index 063afaa3055..5210a719d0d 100644 --- a/drivers/bus/acpi/acpica/events/evrgnini.c +++ b/drivers/bus/acpi/acpica/events/evrgnini.c @@ -255,7 +255,6 @@ AcpiEvPciConfigRegionSetup ( * root bridge. Still need to return a context object * for the new PCI_Config operation region, however. */ - Status = AE_OK; } else { diff --git a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c index 6531d0174b8..d1c35c5a11d 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c @@ -249,6 +249,10 @@ AcpiEnterSleepStateS4bios ( Status = AcpiHwWritePort (AcpiGbl_FADT.SmiCommand, (UINT32) AcpiGbl_FADT.S4BiosRequest, 8); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } do { AcpiOsStall (ACPI_USEC_PER_MSEC); diff --git a/drivers/bus/acpi/acpica/include/acdebug.h b/drivers/bus/acpi/acpica/include/acdebug.h index 6db3e3626c0..c8bdf774f8d 100644 --- a/drivers/bus/acpi/acpica/include/acdebug.h +++ b/drivers/bus/acpi/acpica/include/acdebug.h @@ -284,6 +284,10 @@ void AcpiDbGetBusInfo ( void); +ACPI_STATUS +AcpiDbDisplayFields ( + UINT32 AddressSpaceId); + /* * dbdisply - debug display commands diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index d84c008daf9..bf88d566950 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190816 +#define ACPI_CA_VERSION 0x20191018 #include "acconfig.h" #include "actypes.h" @@ -556,7 +556,13 @@ AcpiInstallTable ( ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS AcpiLoadTable ( - ACPI_TABLE_HEADER *Table)) + ACPI_TABLE_HEADER *Table, + UINT32 *TableIdx)) + +ACPI_EXTERNAL_RETURN_STATUS ( +ACPI_STATUS +AcpiUnloadTable ( + UINT32 TableIndex)) ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index ae168d75780..755df603c0f 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -249,6 +249,19 @@ typedef struct acpi_device_walk_info } ACPI_DEVICE_WALK_INFO; +/* Info used by Acpi AcpiDbDisplayFields */ + +typedef struct acpi_region_walk_info +{ + UINT32 DebugLevel; + UINT32 Count; + ACPI_OWNER_ID OwnerId; + UINT8 DisplayType; + UINT32 AddressSpaceId; + +} ACPI_REGION_WALK_INFO; + + /* TBD: [Restructure] Merge with struct above */ typedef struct acpi_walk_info diff --git a/drivers/bus/acpi/acpica/include/acutils.h b/drivers/bus/acpi/acpica/include/acutils.h index 7e4922f810f..1bf5fd157f6 100644 --- a/drivers/bus/acpi/acpica/include/acutils.h +++ b/drivers/bus/acpi/acpica/include/acutils.h @@ -182,10 +182,11 @@ typedef struct acpi_pkg_info /* AcpiUtDumpBuffer */ -#define DB_BYTE_DISPLAY 1 -#define DB_WORD_DISPLAY 2 -#define DB_DWORD_DISPLAY 4 -#define DB_QWORD_DISPLAY 8 +#define DB_BYTE_DISPLAY 0x01 +#define DB_WORD_DISPLAY 0x02 +#define DB_DWORD_DISPLAY 0x04 +#define DB_QWORD_DISPLAY 0x08 +#define DB_DISPLAY_DATA_ONLY 0x10 /* diff --git a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h index 40da5b0a177..d49393890c8 100644 --- a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h +++ b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h @@ -95,6 +95,10 @@ #define DEBUGGER_THREADING 0 /* integrated with DDB */ +#ifdef INVARIANTS +#define ACPI_MUTEX_DEBUG +#endif + #else /* _KERNEL */ #if __STDC_HOSTED__ diff --git a/drivers/bus/acpi/acpica/namespace/nsconvert.c b/drivers/bus/acpi/acpica/namespace/nsconvert.c index a96ff5bd4d9..fe854747ce6 100644 --- a/drivers/bus/acpi/acpica/namespace/nsconvert.c +++ b/drivers/bus/acpi/acpica/namespace/nsconvert.c @@ -562,5 +562,5 @@ AcpiNsConvertToReference ( ErrorExit: ACPI_FREE (Name); *ReturnObject = NewObject; - return (AE_OK); + return (Status); } diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index 67ff9369587..085630c8a76 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -369,7 +369,7 @@ AcpiNsDumpOneObject ( AcpiOsPrintf (" ="); for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++) { - AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]); + AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]); } } AcpiOsPrintf ("\n"); @@ -466,7 +466,7 @@ AcpiNsDumpOneObject ( case ACPI_TYPE_LOCAL_BANK_FIELD: case ACPI_TYPE_LOCAL_INDEX_FIELD: - AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n", + AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n", (ObjDesc->CommonField.BaseByteOffset * 8) + ObjDesc->CommonField.StartFieldBitOffset, ObjDesc->CommonField.BitLength, @@ -651,8 +651,6 @@ AcpiNsDumpOneObject ( goto Cleanup; } - - ObjType = ACPI_TYPE_INVALID; /* Terminate loop after next pass */ } Cleanup: diff --git a/drivers/bus/acpi/acpica/namespace/nsxfname.c b/drivers/bus/acpi/acpica/namespace/nsxfname.c index 1d44670ef38..8c7e3710fb5 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfname.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfname.c @@ -503,7 +503,7 @@ AcpiGetObjectInfo ( if (Cls) { - NextIdString = AcpiNsCopyDeviceId (&Info->ClassCode, + (void) AcpiNsCopyDeviceId (&Info->ClassCode, Cls, NextIdString); } diff --git a/drivers/bus/acpi/acpica/parser/psobject.c b/drivers/bus/acpi/acpica/parser/psobject.c index fb9652ec85a..252c13fe580 100644 --- a/drivers/bus/acpi/acpica/parser/psobject.c +++ b/drivers/bus/acpi/acpica/parser/psobject.c @@ -544,7 +544,7 @@ AcpiPsCompleteOp ( WalkState->Opcode = (*Op)->Common.AmlOpcode; Status = WalkState->AscendingCallback (WalkState); - Status = AcpiPsNextParseState (WalkState, *Op, Status); + (void) AcpiPsNextParseState (WalkState, *Op, Status); Status2 = AcpiPsCompleteThisOp (WalkState, *Op); if (ACPI_FAILURE (Status2)) @@ -553,7 +553,6 @@ AcpiPsCompleteOp ( } } - Status = AE_OK; break; case AE_CTRL_BREAK: @@ -574,7 +573,7 @@ AcpiPsCompleteOp ( WalkState->Opcode = (*Op)->Common.AmlOpcode; Status = WalkState->AscendingCallback (WalkState); - Status = AcpiPsNextParseState (WalkState, *Op, Status); + (void) AcpiPsNextParseState (WalkState, *Op, Status); Status2 = AcpiPsCompleteThisOp (WalkState, *Op); if (ACPI_FAILURE (Status2)) @@ -582,7 +581,6 @@ AcpiPsCompleteOp ( return_ACPI_STATUS (Status2); } - Status = AE_OK; break; case AE_CTRL_TERMINATE: diff --git a/drivers/bus/acpi/acpica/resources/rscreate.c b/drivers/bus/acpi/acpica/resources/rscreate.c index 5f8d5351abc..67ae548d2a9 100644 --- a/drivers/bus/acpi/acpica/resources/rscreate.c +++ b/drivers/bus/acpi/acpica/resources/rscreate.c @@ -373,6 +373,10 @@ AcpiRsCreatePciRoutingTable ( Status = AcpiNsHandleToPathname ( (ACPI_HANDLE) Node, &PathBuffer, FALSE); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } /* +1 to include null terminator */ diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index e6ac5bb1130..b4b6bb87e5e 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -1082,6 +1082,10 @@ AcpiTbLoadTable ( } Status = AcpiNsLoadTable (TableIndex, ParentNode); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } /* * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index 4db4f522fe3..bca66fee1ec 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -337,6 +337,8 @@ ACPI_EXPORT_SYMBOL_INIT (AcpiInstallTable) * * PARAMETERS: Table - Pointer to a buffer containing the ACPI * table to be loaded. + * TableIdx - Pointer to a UINT32 for storing the table + * index, might be NULL * * RETURN: Status * @@ -350,7 +352,8 @@ ACPI_EXPORT_SYMBOL_INIT (AcpiInstallTable) ACPI_STATUS AcpiLoadTable ( - ACPI_TABLE_HEADER *Table) + ACPI_TABLE_HEADER *Table, + UINT32 *TableIdx) { ACPI_STATUS Status; UINT32 TableIndex; @@ -371,6 +374,11 @@ AcpiLoadTable ( ACPI_INFO (("Host-directed Dynamic ACPI Table Load:")); Status = AcpiTbInstallAndLoadTable (ACPI_PTR_TO_PHYSADDR (Table), ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE, &TableIndex); + if (TableIdx) + { + *TableIdx = TableIndex; + } + if (ACPI_SUCCESS (Status)) { /* Complete the initialization/resolution of new objects */ @@ -474,3 +482,42 @@ AcpiUnloadParentTable ( } ACPI_EXPORT_SYMBOL (AcpiUnloadParentTable) + + +/******************************************************************************* + * + * FUNCTION: AcpiUnloadTable + * + * PARAMETERS: TableIndex - Index as returned by AcpiLoadTable + * + * RETURN: Status + * + * DESCRIPTION: Via the TableIndex representing an SSDT or OEMx table, unloads + * the table and deletes all namespace objects associated with + * that table. Unloading of the DSDT is not allowed. + * Note: Mainly intended to support hotplug removal of SSDTs. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUnloadTable ( + UINT32 TableIndex) +{ + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (AcpiUnloadTable); + + + if (TableIndex == 1) + { + /* TableIndex==1 means DSDT is the owner. DSDT cannot be unloaded */ + + return_ACPI_STATUS (AE_TYPE); + } + + Status = AcpiTbUnloadTable (TableIndex); + return_ACPI_STATUS (Status); +} + +ACPI_EXPORT_SYMBOL (AcpiUnloadTable) diff --git a/drivers/bus/acpi/acpica/utilities/utbuffer.c b/drivers/bus/acpi/acpica/utilities/utbuffer.c index e1fdc01ed2e..09d4bbe4c60 100644 --- a/drivers/bus/acpi/acpica/utilities/utbuffer.c +++ b/drivers/bus/acpi/acpica/utilities/utbuffer.c @@ -78,8 +78,10 @@ AcpiUtDumpBuffer ( UINT32 j; UINT32 Temp32; UINT8 BufChar; + UINT32 DisplayDataOnly = Display & DB_DISPLAY_DATA_ONLY; + Display &= ~DB_DISPLAY_DATA_ONLY; if (!Buffer) { AcpiOsPrintf ("Null Buffer Pointer in DumpBuffer!\n"); @@ -97,7 +99,10 @@ AcpiUtDumpBuffer ( { /* Print current offset */ - AcpiOsPrintf ("%8.4X: ", (BaseOffset + i)); + if (!DisplayDataOnly) + { + AcpiOsPrintf ("%8.4X: ", (BaseOffset + i)); + } /* Print 16 hex chars */ @@ -149,38 +154,41 @@ AcpiUtDumpBuffer ( * Print the ASCII equivalent characters but watch out for the bad * unprintable ones (printable chars are 0x20 through 0x7E) */ - AcpiOsPrintf (" "); - for (j = 0; j < 16; j++) + if (!DisplayDataOnly) { - if (i + j >= Count) + AcpiOsPrintf (" "); + for (j = 0; j < 16; j++) { - AcpiOsPrintf ("\n"); - return; + if (i + j >= Count) + { + AcpiOsPrintf ("\n"); + return; + } + + /* + * Add comment characters so rest of line is ignored when + * compiled + */ + if (j == 0) + { + AcpiOsPrintf ("// "); + } + + BufChar = Buffer[(ACPI_SIZE) i + j]; + if (isprint (BufChar)) + { + AcpiOsPrintf ("%c", BufChar); + } + else + { + AcpiOsPrintf ("."); + } } - /* - * Add comment characters so rest of line is ignored when - * compiled - */ - if (j == 0) - { - AcpiOsPrintf ("// "); - } + /* Done with that line. */ - BufChar = Buffer[(ACPI_SIZE) i + j]; - if (isprint (BufChar)) - { - AcpiOsPrintf ("%c", BufChar); - } - else - { - AcpiOsPrintf ("."); - } + AcpiOsPrintf ("\n"); } - - /* Done with that line. */ - - AcpiOsPrintf ("\n"); i += 16; } diff --git a/drivers/bus/acpi/acpica/utilities/uttrack.c b/drivers/bus/acpi/acpica/utilities/uttrack.c index a3e50a18d1a..998b3d17b9b 100644 --- a/drivers/bus/acpi/acpica/utilities/uttrack.c +++ b/drivers/bus/acpi/acpica/utilities/uttrack.c @@ -756,7 +756,7 @@ AcpiUtDumpAllocations ( case ACPI_DESC_TYPE_PARSER: - AcpiOsPrintf ("AmlOpcode 0x%04hX\n", + AcpiOsPrintf ("AmlOpcode 0x%04X\n", Descriptor->Op.Asl.AmlOpcode); break; diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 419672d3c3f..7863c686f99 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -91,5 +91,5 @@ Used Version: 1.6.37 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20190509 +Used Version: 20191018 Website: https://acpica.org/

1 0

[reactos] 01/01: [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic) No.14
by Katayama Hirofumi MZ 16 Nov '19

16 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54c8cc66aba5cd32966e9… commit 54c8cc66aba5cd32966e9d2721fecfbe99c9b32d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 15:11:57 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 15:11:57 2019 +0900 [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic) No.14 Tahoma. Version 0.010 khmz. 12px CYRILLIC CAPITAL LETTER DE. 12px CYRILLIC SMALL LETTER DE. CORE-8408 --- media/fonts/tahoma.ttf | Bin 155304 -> 155304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 617f9823696..a855d864036 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.13
by Katayama Hirofumi MZ 16 Nov '19

16 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f803ab091c707f595840… commit 9f803ab091c707f5958402958250f5afba8b56b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 15:01:08 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 15:01:08 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.13 Tahoma Bold font. Version 0.007 khmz. 12px LATIN SMALL LETTER R. 12px CYRILLIC CAPITAL LETTER DE. 12px CYRILLIC SMALL LETTER TSE. 12px CYRILLIC SMALL LETTER DE. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 881734c77f0..35cc64dc7a9 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs