Ros-diffs December 2024

ros-diffs@reactos.org

17 participants
106 discussions

[reactos] 01/01: [EXPLORER] Remove redundant bIsSystemShell assignments (#7542)
by Serge Gautherie 02 Dec '24

02 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51e5de1f856e69eb4cdb… commit e51e5de1f856e69eb4cdb8d39e1b6aa847cf038c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Dec 2 20:42:46 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 2 20:42:46 2024 +0100 [EXPLORER] Remove redundant bIsSystemShell assignments (#7542) Addendum to commit df197bc42 (PR #7502) CORE-19887 --- base/shell/explorer/explorer.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/base/shell/explorer/explorer.cpp b/base/shell/explorer/explorer.cpp index d51a32976cc..140a1e93ffa 100644 --- a/base/shell/explorer/explorer.cpp +++ b/base/shell/explorer/explorer.cpp @@ -99,13 +99,9 @@ IsExplorerSystemShell() LPWSTR szExplorer = PathFindFileNameW(szPath); HKEY hKeyWinlogon; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", - 0, KEY_READ, &hKeyWinlogon) != ERROR_SUCCESS) - { - // No registry access. - bIsSystemShell = TRUE; - } - else + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, KEY_READ, &hKeyWinlogon) == ERROR_SUCCESS) { LSTATUS Status; DWORD dwType; @@ -116,9 +112,7 @@ IsExplorerSystemShell() Status = RegQueryValueExW(hKeyWinlogon, L"Shell", 0, &dwType, (LPBYTE)szShell, &cbShell); if (Status == ERROR_SUCCESS) { - if ((dwType == REG_SZ || dwType == REG_EXPAND_SZ) && StrStrI(szShell, szExplorer)) - bIsSystemShell = TRUE; - else + if ((dwType != REG_SZ && dwType != REG_EXPAND_SZ) || !StrStrIW(szShell, szExplorer)) bIsSystemShell = FALSE; }

1 0

[reactos] 01/01: [REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (#7503)
by Vitaly Orekhov 02 Dec '24

02 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76014b92a410ff2847f6f… commit 76014b92a410ff2847f6f54a1de966ce246dd2b1 Author: Vitaly Orekhov <vkvo2000(a)vivaldi.net> AuthorDate: Mon Dec 2 22:27:19 2024 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 2 20:27:19 2024 +0100 [REACTOS] Replace all references of CLSID_ConnectionFolder to CLSID_NetworkConnections (#7503) Use name from public Windows SDK for 'Network Connections' CLSID, available since Windows SDK 6.0A (Visual Studio 2008 or higher). Replace all such instances in netshell, shell32, apitests/com. - Partially reverts/refactors commit bea0b47 - Follow-up to PR #7266 --- dll/shellext/netshell/README | 2 +- dll/shellext/netshell/netshell.cpp | 2 +- dll/shellext/netshell/shfldr_netconnect.cpp | 2 +- dll/shellext/netshell/shfldr_netconnect.h | 2 +- dll/win32/shell32/folders/CRegFolder.cpp | 2 +- modules/rostests/apitests/com/netshell.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/shellext/netshell/README b/dll/shellext/netshell/README index d0fc735594d..ea4315108d2 100644 --- a/dll/shellext/netshell/README +++ b/dll/shellext/netshell/README @@ -60,7 +60,7 @@ reimplement these stubs alongside all its unimplemented interfaces and objects, the system netshell with ours (INetConnectionManager and IEnumNetConnection are only the tip of the iceberg). However it is perfectly fine if one copies our netshell in a different folder and change the -registry settings to make it handle CLSID_ConnectionFolder, CLSID_LanConnectionUi and CLSID_ConnectionTray. +registry settings to make it handle CLSID_NetworkConnections, CLSID_LanConnectionUi and CLSID_ConnectionTray. When doing so there are actually two options about how to test. One is leaving #define USE_CUSTOM_CONMGR 1 as is and the other is setting is to 0. What this does is that when 0, the connections will be enumerated in the shell folder and the tray using the system's INetConnectionManager (which resides in the system's diff --git a/dll/shellext/netshell/netshell.cpp b/dll/shellext/netshell/netshell.cpp index 17ef8e747b5..abdf8af9bd7 100644 --- a/dll/shellext/netshell/netshell.cpp +++ b/dll/shellext/netshell/netshell.cpp @@ -17,7 +17,7 @@ public: }; BEGIN_OBJECT_MAP(ObjectMap) - OBJECT_ENTRY(CLSID_ConnectionFolder, CNetworkConnections) + OBJECT_ENTRY(CLSID_NetworkConnections, CNetworkConnections) OBJECT_ENTRY(CLSID_ConnectionManager, CNetConnectionManager) OBJECT_ENTRY(CLSID_LanConnectionUi, CNetConnectionPropertyUi) OBJECT_ENTRY(CLSID_ConnectionTray, CLanStatus) diff --git a/dll/shellext/netshell/shfldr_netconnect.cpp b/dll/shellext/netshell/shfldr_netconnect.cpp index dca42527e7a..3c14b9672e9 100644 --- a/dll/shellext/netshell/shfldr_netconnect.cpp +++ b/dll/shellext/netshell/shfldr_netconnect.cpp @@ -797,7 +797,7 @@ HRESULT WINAPI CNetworkConnections::GetClassID(CLSID *lpClassId) if (!lpClassId) return E_POINTER; - *lpClassId = CLSID_ConnectionFolder; + *lpClassId = CLSID_NetworkConnections; return S_OK; } diff --git a/dll/shellext/netshell/shfldr_netconnect.h b/dll/shellext/netshell/shfldr_netconnect.h index c96fbb7d519..4e081739020 100644 --- a/dll/shellext/netshell/shfldr_netconnect.h +++ b/dll/shellext/netshell/shfldr_netconnect.h @@ -8,7 +8,7 @@ typedef struct { } shvheader; class CNetworkConnections: - public CComCoClass<CNetworkConnections, &CLSID_ConnectionFolder>, + public CComCoClass<CNetworkConnections, &CLSID_NetworkConnections>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IPersistFolder2, public IShellExtInit, diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index b983b5496a2..ece1845838d 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -412,7 +412,7 @@ BOOL CRegFolder::_IsInNameSpace(_In_ LPCITEMIDLIST pidl) CLSID clsid = *_ILGetGUIDPointer(pidl); if (IsEqualGUID(clsid, CLSID_Printers)) return TRUE; - if (IsEqualGUID(clsid, CLSID_ConnectionFolder)) + if (IsEqualGUID(clsid, CLSID_NetworkConnections)) return TRUE; FIXME("Check registry\n"); return TRUE; diff --git a/modules/rostests/apitests/com/netshell.c b/modules/rostests/apitests/com/netshell.c index 2562d5e46d2..3d107a54d9a 100644 --- a/modules/rostests/apitests/com/netshell.c +++ b/modules/rostests/apitests/com/netshell.c @@ -20,7 +20,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = L"Both" }, { - ID_NAME(CLSID_ConnectionFolder), + ID_NAME(CLSID_NetworkConnections), { { 0x0, &IID_IPersistFolder2 }, { 0x0, &IID_IPersistFolder },

1 0

[reactos] 01/01: [WINMM] Add DLL version info (#7543)
by Thamatip Chitpong 02 Dec '24

02 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e62c917ddf15c65c6add5… commit e62c917ddf15c65c6add55288a2b47e23d4275f0 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Mon Dec 2 17:44:03 2024 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 2 17:44:03 2024 +0700 [WINMM] Add DLL version info (#7543) --- dll/win32/winmm/winmm_res.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dll/win32/winmm/winmm_res.rc b/dll/win32/winmm/winmm_res.rc index ca9849dbf27..7a439c562b3 100644 --- a/dll/win32/winmm/winmm_res.rc +++ b/dll/win32/winmm/winmm_res.rc @@ -25,6 +25,13 @@ #include <windef.h> #include <mmddk.h> +/* ReactOS-specific DLL version info */ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Multimedia API" +#define REACTOS_STR_INTERNAL_NAME "winmm" +#define REACTOS_STR_ORIGINAL_FILENAME "winmm.dll" +#include <reactos/version.rc> + /* Add your language specific defines here */ /* UTF-8 */

1 0

[reactos] 01/01: [DISKPART] Use the MBR_MAGIC to check for a valid MBR
by Eric Kohl 01 Dec '24

01 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=647d351278bbfc806980a… commit 647d351278bbfc806980ac1043dfe08e42e2d3c3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 1 21:32:53 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 1 21:32:53 2024 +0100 [DISKPART] Use the MBR_MAGIC to check for a valid MBR --- base/system/diskpart/partlist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/system/diskpart/partlist.c b/base/system/diskpart/partlist.c index dbd0ef0e24a..167858cfbb9 100644 --- a/base/system/diskpart/partlist.c +++ b/base/system/diskpart/partlist.c @@ -37,6 +37,8 @@ #define PARTITION_TBL_SIZE 4 +#define MBR_MAGIC 0xAA55 + #include <pshpack1.h> typedef struct _PARTITION @@ -870,7 +872,7 @@ AddDiskToList( DiskEntry->BiosFound = FALSE; /* Check if this disk has a valid MBR */ - if (Mbr->BootCode[0] == 0 && Mbr->BootCode[1] == 0) + if (Mbr->Magic != MBR_MAGIC) DiskEntry->NoMbr = TRUE; else DiskEntry->NoMbr = FALSE;

1 0

[reactos] 01/01: [DISKPART] Fix a comment
by Eric Kohl 01 Dec '24

01 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8972448127695a7fdde32… commit 8972448127695a7fdde322f27810db5ff7924bd1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 1 20:56:21 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 1 20:56:21 2024 +0100 [DISKPART] Fix a comment --- base/system/diskpart/delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/system/diskpart/delete.c b/base/system/diskpart/delete.c index feb66e58c9a..53b560100cb 100644 --- a/base/system/diskpart/delete.c +++ b/base/system/diskpart/delete.c @@ -75,7 +75,7 @@ DeletePartition( } else if (_wcsicmp(argv[i], L"override") == 0) { - /* noerr */ + /* override */ DPRINT("OVERRIDE\n"); bOverride = TRUE; }

1 0

[reactos] 01/01: [DISKPART] Implement 'select disk system' and 'select disk next'
by Eric Kohl 01 Dec '24

01 Dec '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b5e679282d4f8bfe6254… commit 1b5e679282d4f8bfe6254c233540f2d6de28b353 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 1 19:33:16 2024 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 1 19:33:16 2024 +0100 [DISKPART] Implement 'select disk system' and 'select disk next' --- base/system/diskpart/lang/de-DE.rc | 2 ++ base/system/diskpart/lang/en-US.rc | 2 ++ base/system/diskpart/lang/pl-PL.rc | 2 ++ base/system/diskpart/lang/pt-PT.rc | 2 ++ base/system/diskpart/lang/ro-RO.rc | 2 ++ base/system/diskpart/lang/ru-RU.rc | 2 ++ base/system/diskpart/lang/sq-AL.rc | 2 ++ base/system/diskpart/lang/tr-TR.rc | 2 ++ base/system/diskpart/lang/zh-CN.rc | 2 ++ base/system/diskpart/lang/zh-TW.rc | 2 ++ base/system/diskpart/resource.h | 16 +++++---- base/system/diskpart/select.c | 74 +++++++++++++++++++++++++++++--------- 12 files changed, 86 insertions(+), 24 deletions(-) diff --git a/base/system/diskpart/lang/de-DE.rc b/base/system/diskpart/lang/de-DE.rc index f66f0726f18..ea81d8a6a20 100644 --- a/base/system/diskpart/lang/de-DE.rc +++ b/base/system/diskpart/lang/de-DE.rc @@ -115,6 +115,8 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" diff --git a/base/system/diskpart/lang/en-US.rc b/base/system/diskpart/lang/en-US.rc index c3a00e406ec..c1dedb3b27b 100644 --- a/base/system/diskpart/lang/en-US.rc +++ b/base/system/diskpart/lang/en-US.rc @@ -115,6 +115,8 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" diff --git a/base/system/diskpart/lang/pl-PL.rc b/base/system/diskpart/lang/pl-PL.rc index e54a1faac37..f3f860f2069 100644 --- a/base/system/diskpart/lang/pl-PL.rc +++ b/base/system/diskpart/lang/pl-PL.rc @@ -115,6 +115,8 @@ BEGIN IDS_SELECT_NO_DISK "\nNie wybrano dysku.\nWybierz dysk i spróbuj ponownie.\n\n" IDS_SELECT_DISK "\nObecnie wybranym dyskiem jest dysk %lu.\n\n" IDS_SELECT_DISK_INVALID "\nNieprawidłowy dysk.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nNie wybrano partycji.\nWybierz partycję i spróbuj ponownie.\n\n" IDS_SELECT_PARTITION "\nObecnie wybraną partycją jest partycja %lu.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nNie wybrano dysku do ustawienia partycji\nWybierz dysk i spróbuj ponownie.\n\n" diff --git a/base/system/diskpart/lang/pt-PT.rc b/base/system/diskpart/lang/pt-PT.rc index 5d0bfab3ad7..28a64fbaece 100644 --- a/base/system/diskpart/lang/pt-PT.rc +++ b/base/system/diskpart/lang/pt-PT.rc @@ -117,6 +117,8 @@ BEGIN IDS_SELECT_NO_DISK "\nNenhum disco actualmente está seleccionado.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_SELECT_DISK "\nDisco %lu é o disco que está actualmente seleccionado.\n\n" IDS_SELECT_DISK_INVALID "\nDisco inválido.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nNenhuma partição seleccionada actualmente.\nPor favor seleccione um disco e tente novamente.\n\n" IDS_SELECT_PARTITION "\nPartição %lu é agora a partição seleccionada.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nNão há disco para selectionar partições.\nPor favor seleccione um disco e tente novamente.\n\n" diff --git a/base/system/diskpart/lang/ro-RO.rc b/base/system/diskpart/lang/ro-RO.rc index 6f478a8c33c..8c751acbc85 100644 --- a/base/system/diskpart/lang/ro-RO.rc +++ b/base/system/diskpart/lang/ro-RO.rc @@ -123,6 +123,8 @@ BEGIN IDS_SELECT_NO_DISK "\nMomentan nu există niciun disc selectat.\nSelectați un disc apoi reîncercați.\n\n" IDS_SELECT_DISK "\nDisul %lu este selectat acum.\n\n" IDS_SELECT_DISK_INVALID "\nDisc nevalid.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nMomentan nu există nicio partiție selectată.\nSelectați un disc apoi reîncercați.\n\n" IDS_SELECT_PARTITION "\nPartiția %lu este selectată acum.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nNu există niciun disc pentru partiția selectată.\nSelectați un disc apoi reîncercați.\n\n" diff --git a/base/system/diskpart/lang/ru-RU.rc b/base/system/diskpart/lang/ru-RU.rc index bf9f2182875..d730e8a1768 100644 --- a/base/system/diskpart/lang/ru-RU.rc +++ b/base/system/diskpart/lang/ru-RU.rc @@ -117,6 +117,8 @@ BEGIN IDS_SELECT_NO_DISK "\nДиск для обработки не указан.\nВыберите диск и повторите.\n\n" IDS_SELECT_DISK "\nДиск %lu выбран текущим.\n\n" IDS_SELECT_DISK_INVALID "\nОшибка диска.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nДиск с разметкой не выбран.\nВыберите диск и повторите.\n\n" IDS_SELECT_PARTITION "\nВыбрана разметка диска %lu текущей разметкой.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nДиск для установки разметки не указан.\nВыберите диск и повторите.\n\n" diff --git a/base/system/diskpart/lang/sq-AL.rc b/base/system/diskpart/lang/sq-AL.rc index 6e1ac5af471..1e397c38dde 100644 --- a/base/system/diskpart/lang/sq-AL.rc +++ b/base/system/diskpart/lang/sq-AL.rc @@ -119,6 +119,8 @@ BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" IDS_SELECT_DISK_INVALID "\nInvalid disk.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nThere is no disk for selecting a partition.\nPlease select a disk and try again.\n\n" diff --git a/base/system/diskpart/lang/tr-TR.rc b/base/system/diskpart/lang/tr-TR.rc index 6c9cc76c284..9900743cdc5 100644 --- a/base/system/diskpart/lang/tr-TR.rc +++ b/base/system/diskpart/lang/tr-TR.rc @@ -125,6 +125,8 @@ BEGIN IDS_SELECT_NO_DISK "\nBir disk seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_DISK "\nDisk %lu şimdi seçilen disktir.\n\n" IDS_SELECT_DISK_INVALID "\nGeçersiz disk.\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\nŞimdilik bir bölüm seçilmemiş.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" IDS_SELECT_PARTITION "\nBölüm %lu şimdi seçilen bölümdür.\n\n" IDS_SELECT_PARTITION_NO_DISK "\nBir bölüm seçmek için bir disk yok.\nLütfen bir disk seçiniz ve yeniden deneyiniz.\n\n" diff --git a/base/system/diskpart/lang/zh-CN.rc b/base/system/diskpart/lang/zh-CN.rc index 6ede50da37e..c0faf8cd0e0 100644 --- a/base/system/diskpart/lang/zh-CN.rc +++ b/base/system/diskpart/lang/zh-CN.rc @@ -124,6 +124,8 @@ BEGIN IDS_SELECT_NO_DISK "\n没有当前选择的磁盘。\nP请选择一个磁盘，再试一次。\n\n" IDS_SELECT_DISK "\n磁盘 %lu 现在是所选的磁盘。\n\n" IDS_SELECT_DISK_INVALID "\n无效的磁盘。\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\n有是没有当前选定的分区。\n请选择一个磁盘，再试一次。\n\n" IDS_SELECT_PARTITION "\n分区 %lu 现在是所选的分区。\n\n" IDS_SELECT_PARTITION_NO_DISK "\n没有一个选择是有分区的磁盘。\n请选择一个磁盘，再试一次。\n\n" diff --git a/base/system/diskpart/lang/zh-TW.rc b/base/system/diskpart/lang/zh-TW.rc index b0078872817..ca23054e1f8 100644 --- a/base/system/diskpart/lang/zh-TW.rc +++ b/base/system/diskpart/lang/zh-TW.rc @@ -124,6 +124,8 @@ BEGIN IDS_SELECT_NO_DISK "\n目前沒有選擇磁碟。\n請選擇一個磁碟，然後再試一次。\n\n" IDS_SELECT_DISK "\n磁碟 %lu 現在是所選擇的磁碟。\n\n" IDS_SELECT_DISK_INVALID "\n無效的磁碟。\n\n" + IDS_SELECT_DISK_ENUM_NO_START "\nNo disk enumeration started yet.\n\nNo disk ist currently selected.\n\n" + IDS_SELECT_DISK_ENUM_FINISHED "\nThe last disk has been enumerated.\n\nNo disk ist currently selected.\n\n" IDS_SELECT_NO_PARTITION "\n目前選擇的磁碟沒有磁碟分割。\n請選擇一個磁碟，然後再試一次。\n\n" IDS_SELECT_PARTITION "\n磁碟分割 %lu 現在是所選擇的磁碟分割。\n\n" IDS_SELECT_PARTITION_NO_DISK "\n沒有選擇要設定磁碟分割的磁碟。\n請選擇一個磁碟，然後再試一次。\n\n" diff --git a/base/system/diskpart/resource.h b/base/system/diskpart/resource.h index 5b776a324d5..f44f706fad6 100644 --- a/base/system/diskpart/resource.h +++ b/base/system/diskpart/resource.h @@ -85,13 +85,15 @@ #define IDS_SELECT_NO_DISK 4400 #define IDS_SELECT_DISK 4401 #define IDS_SELECT_DISK_INVALID 4402 -#define IDS_SELECT_NO_PARTITION 4403 -#define IDS_SELECT_PARTITION 4404 -#define IDS_SELECT_PARTITION_NO_DISK 4405 -#define IDS_SELECT_PARTITION_INVALID 4406 -#define IDS_SELECT_NO_VOLUME 4407 -#define IDS_SELECT_VOLUME 4408 -#define IDS_SELECT_VOLUME_INVALID 4409 +#define IDS_SELECT_DISK_ENUM_NO_START 4403 +#define IDS_SELECT_DISK_ENUM_FINISHED 4404 +#define IDS_SELECT_NO_PARTITION 4405 +#define IDS_SELECT_PARTITION 4406 +#define IDS_SELECT_PARTITION_NO_DISK 4407 +#define IDS_SELECT_PARTITION_INVALID 4408 +#define IDS_SELECT_NO_VOLUME 4409 +#define IDS_SELECT_VOLUME 4410 +#define IDS_SELECT_VOLUME_INVALID 4411 #define IDS_SETID_FAIL 4450 #define IDS_SETID_SUCCESS 4451 diff --git a/base/system/diskpart/select.c b/base/system/diskpart/select.c index dcc9adb8f0d..aa39ae6bb9a 100644 --- a/base/system/diskpart/select.c +++ b/base/system/diskpart/select.c @@ -39,35 +39,75 @@ SelectDisk( return TRUE; } - if (!IsDecString(argv[2])) + if (!_wcsicmp(argv[2], L"system")) { - ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); - return TRUE; - } + CurrentDisk = NULL; - ulValue = wcstoul(argv[2], NULL, 10); - if ((ulValue == 0) && (errno == ERANGE)) - { - ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + Entry = DiskListHead.Flink; + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + CurrentDisk = DiskEntry; + CurrentPartition = NULL; + ConResPrintf(StdOut, IDS_SELECT_DISK, CurrentDisk->DiskNumber); return TRUE; } + else if (!_wcsicmp(argv[2], L"next")) + { + if (CurrentDisk == NULL) + { + CurrentPartition = NULL; + ConResPuts(StdErr, IDS_SELECT_DISK_ENUM_NO_START); + return TRUE; + } + + if (CurrentDisk->ListEntry.Flink == &DiskListHead) + { + CurrentDisk = NULL; + CurrentPartition = NULL; + ConResPuts(StdErr, IDS_SELECT_DISK_ENUM_FINISHED); + return TRUE; + } - CurrentDisk = NULL; + Entry = CurrentDisk->ListEntry.Flink; - Entry = DiskListHead.Flink; - while (Entry != &DiskListHead) - { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - if (DiskEntry->DiskNumber == ulValue) + CurrentDisk = DiskEntry; + CurrentPartition = NULL; + ConResPrintf(StdOut, IDS_SELECT_DISK, CurrentDisk->DiskNumber); + return TRUE; + } + else if (IsDecString(argv[2])) + { + ulValue = wcstoul(argv[2], NULL, 10); + if ((ulValue == 0) && (errno == ERANGE)) { - CurrentDisk = DiskEntry; - CurrentPartition = NULL; - ConResPrintf(StdOut, IDS_SELECT_DISK, CurrentDisk->DiskNumber); + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); return TRUE; } - Entry = Entry->Flink; + CurrentDisk = NULL; + + Entry = DiskListHead.Flink; + while (Entry != &DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); + + if (DiskEntry->DiskNumber == ulValue) + { + CurrentDisk = DiskEntry; + CurrentPartition = NULL; + ConResPrintf(StdOut, IDS_SELECT_DISK, CurrentDisk->DiskNumber); + return TRUE; + } + + Entry = Entry->Flink; + } + } + else + { + ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS); + return TRUE; } ConResPuts(StdErr, IDS_SELECT_DISK_INVALID);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2024