Ros-diffs

ros-diffs@reactos.org

19 participants
81091 discussions

[reactos] 01/01: [SHELL32] Fix detail view in My Computer showing Comment in 'Total Size' column (#5438) CORE-19000

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=035790dda5c8847ef0067… commit 035790dda5c8847ef0067b8c4bf92c4ab21044c5 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Jul 15 11:14:35 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 15 18:14:35 2023 +0200 [SHELL32] Fix detail view in My Computer showing Comment in 'Total Size' column (#5438) CORE-19000 Fixes the regression of 0.4.15-dev-5526-g 4c25af5b --- dll/win32/shell32/folders/CDrivesFolder.cpp | 52 +++++++++++++++++------------ 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 8dbdc48779d..24df6235f4a 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -572,8 +572,6 @@ static const shvheader MyComputerSFHeader[] = { {IDS_SHV_COLUMN_COMMENTS, SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 10}, }; -#define MYCOMPUTERSHELLVIEWCOLUMNS 5 - static const DWORD dwComputerAttributes = SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; @@ -752,28 +750,29 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) return m_regFolder->CompareIDs(lParam, pidl1, pidl2); - if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) + UINT iColumn = LOWORD(lParam); + if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || iColumn >= _countof(MyComputerSFHeader)) return E_INVALIDARG; CHAR* pszDrive1 = _ILGetDataPointer(pidl1)->u.drive.szDriveName; CHAR* pszDrive2 = _ILGetDataPointer(pidl2)->u.drive.szDriveName; int result; - switch(LOWORD(lParam)) + switch (MyComputerSFHeader[iColumn].colnameid) { - case 0: /* name */ + case IDS_SHV_COLUMN_NAME: { result = stricmp(pszDrive1, pszDrive2); hres = MAKE_COMPARE_HRESULT(result); break; } - case 1: /* Type */ + case IDS_SHV_COLUMN_TYPE: { /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } - case 2: /* Size */ - case 3: /* Size Available */ + case IDS_SHV_COLUMN_DISK_CAPACITY: + case IDS_SHV_COLUMN_DISK_AVAILABLE: { ULARGE_INTEGER Drive1Available, Drive1Total, Drive2Available, Drive2Total; @@ -796,11 +795,10 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1 hres = MAKE_COMPARE_HRESULT(Diff.QuadPart); break; } - case 4: /* comments */ + case IDS_SHV_COLUMN_COMMENTS: hres = MAKE_COMPARE_HRESULT(0); break; - default: - return E_INVALIDARG; + DEFAULT_UNREACHABLE; } if (HRESULT_CODE(hres) == 0) @@ -1117,7 +1115,7 @@ HRESULT WINAPI CDrivesFolder::GetDefaultColumnState(UINT iColumn, DWORD * pcsFla { TRACE ("(%p)\n", this); - if (!pcsFlags || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!pcsFlags || iColumn >= _countof(MyComputerSFHeader)) return E_INVALIDARG; *pcsFlags = MyComputerSFHeader[iColumn].pcsFlags; return S_OK; @@ -1135,7 +1133,7 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S TRACE ("(%p)->(%p %i %p)\n", this, pidl, iColumn, psd); - if (!psd || iColumn >= MYCOMPUTERSHELLVIEWCOLUMNS) + if (!psd || iColumn >= _countof(MyComputerSFHeader)) return E_INVALIDARG; if (!pidl) @@ -1146,7 +1144,18 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S } else if (!_ILIsDrive(pidl)) { - return m_regFolder->GetDetailsOf(pidl, iColumn, psd); + switch (MyComputerSFHeader[iColumn].colnameid) + { + case IDS_SHV_COLUMN_NAME: + case IDS_SHV_COLUMN_TYPE: + return m_regFolder->GetDetailsOf(pidl, iColumn, psd); + case IDS_SHV_COLUMN_DISK_CAPACITY: + case IDS_SHV_COLUMN_DISK_AVAILABLE: + return SHSetStrRet(&psd->str, ""); /* blank col */ + case IDS_SHV_COLUMN_COMMENTS: + return m_regFolder->GetDetailsOf(pidl, 2, psd); /* 2 = comments */ + DEFAULT_UNREACHABLE; + } } else { @@ -1156,19 +1165,19 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S if (DriveType > DRIVE_RAMDISK) DriveType = DRIVE_FIXED; - switch (iColumn) + switch (MyComputerSFHeader[iColumn].colnameid) { - case 0: /* name */ + case IDS_SHV_COLUMN_NAME: hr = GetDisplayNameOf(pidl, SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); break; - case 1: /* type */ + case IDS_SHV_COLUMN_TYPE: if (DriveType == DRIVE_REMOVABLE && !IsDriveFloppyA(pszDrive)) hr = SHSetStrRet(&psd->str, IDS_DRIVE_REMOVABLE); else hr = SHSetStrRet(&psd->str, iDriveTypeIds[DriveType]); break; - case 2: /* total size */ - case 3: /* free size */ + case IDS_SHV_COLUMN_DISK_CAPACITY: + case IDS_SHV_COLUMN_DISK_AVAILABLE: psd->str.cStr[0] = 0x00; psd->str.uType = STRRET_CSTR; if (GetVolumeInformationA(pszDrive, NULL, 0, NULL, NULL, NULL, NULL, 0)) @@ -1181,9 +1190,10 @@ HRESULT WINAPI CDrivesFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, S } hr = S_OK; break; - case 4: /* FIXME: comments */ - hr = SHSetStrRet(&psd->str, ""); + case IDS_SHV_COLUMN_COMMENTS: + hr = SHSetStrRet(&psd->str, ""); /* FIXME: comments */ break; + DEFAULT_UNREACHABLE; } }

1 year, 6 months

[reactos] 01/01: [REGEDIT] Improve Romanian (ro-RO) translation (#5439)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4057264a193d290e1ef6d… commit 4057264a193d290e1ef6d26a32d91570e13923e3 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sat Jul 15 18:08:26 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 15 18:08:26 2023 +0300 [REGEDIT] Improve Romanian (ro-RO) translation (#5439) --- base/applications/regedit/lang/ro-RO.rc | 36 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index cca1bf234f8..3dc4fe0b3be 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -31,17 +31,19 @@ Opțiuni:\n\ Compatibil cu orice alt comutator. Ignorat.\n\ /R:user.dat Locația fișierului user.dat urmează să fie modificată.\n\ Compatibil cu orice alt comutator. Ignorat.\n\ - /C Importă conținutul unui fișier de regiștri.\n\ - /D Șterge o cheie de regiștrii specificată.\n\ - /E Exportă conținutul unei cheie de regiștri specificată într-un fișier.\n\ - Dacă nu este nicio cheie specificată, toți regiștrii sunt exportați.\n\ + /C Importă conținutul unui fișier de registru.\n\ + /D Șterge o cheie de registru specificată.\n\ + /E Exportă conținutul unei chei de registru specificată într-un\n\ + fișier. Dacă nu este nicio cheie specificată, este exportat\n\ + întregul registru.\n\ /S Modul silențios. Nu sunt afișate mesaje.\n\ /V Lansează interfața grafică (GUI) în modul avansat. Ignorat.\n\ /? Afișează informații și părăsește programul.\n\ - [filename] Locația fișierului ce conține informații despre regiștri ce urmează\n\ - să fie importați. Când e folosit cu [/E], această opțiune specifică\n\ - locația fișierului în care informațiile despre regiștri vor fi exportate.\n\ - [reg_key] Cheie de regiștri ce urmează să fie modificată.\n\ + [filename] Locația fișierului ce conține informații despre registrul ce\n\ + urmează să fie importat. Când e folosit cu [/E], această\n\ + opțiune specifică locația fișierului în care informațiile\n\ + despre registru vor fi exportate.\n\ + [reg_key] Cheie de registru ce urmează să fie modificată.\n\ \n\ Exemple de utilizări:\n\ regedit ""import.reg""\n\ @@ -50,7 +52,7 @@ Exemple de utilizări:\n\ STRING_INVALID_SWITCH "regedit: Comutatorul este nevalid sau nerecunoscut [%1]\n" STRING_HELP "Scrieți ""regedit /?"" pentru ajutor.\n" STRING_NO_FILENAME "regedit: Niciun nume de fișier nu a fost specificat.\n" - STRING_NO_REG_KEY "regedit: Nicio cheie de regiștri nu a fost specificată pentru ștergere.\n" + STRING_NO_REG_KEY "regedit: Nicio cheie de registru nu a fost specificată pentru ștergere.\n" STRING_FILE_NOT_FOUND "regedit: Fișierul '%1' nu a fost găsit.\n" STRING_CANNOT_OPEN_FILE "regedit: Fișierul '%1' nu a putut fi deschis.\n" STRING_UNHANDLED_ACTION "regedit: Acțiune necontrolată.\n" @@ -58,16 +60,16 @@ Exemple de utilizări:\n\ STRING_INVALID_HEX "regedit: Valoare hexazecimală nevalidă.\n" STRING_CSV_HEX_ERROR "regedit: Datele hexazecimale nu au putut fi transformate. O valoare nevalidă a fost întâlnită la '%1'.\n" STRING_ESCAPE_SEQUENCE "regedit: Secvență de evadare nerecunoscută [\\%1!c!]\n" - STRING_UNKNOWN_DATA_FORMAT "regedit: Tipul de date de regiștri [0x%1!x!] nesuportat\n" + STRING_UNKNOWN_DATA_FORMAT "regedit: Tipul de date de registru [0x%1!x!] e nesuportat\n" STRING_UNEXPECTED_EOL "regedit: Capăt de linie neașteptat în '%1'.\n" STRING_UNRECOGNIZED_LINE "regedit: Linia '%1' nu a fost recunoscută.\n" - STRING_SETVALUE_FAILED "regedit: Valoarea de regiștri '%1' nu a putut fi adăugată la '%2'.\n" - STRING_OPEN_KEY_FAILED "regedit: Cheia de regiștri '%1' nu a putut fi deschisă.\n" - STRING_UNSUPPORTED_TYPE "regedit: Tipul de date de regiștri [0x%1!x!] nesuportat a apărut în '%2'.\n" - STRING_EXPORT_AS_BINARY "regedit: Valoarea de regiștri '%1' va fi exportată ca date binare.\n" + STRING_SETVALUE_FAILED "regedit: Valoarea de registru '%1' nu a putut fi adăugată la '%2'.\n" + STRING_OPEN_KEY_FAILED "regedit: Cheia de registru '%1' nu a putut fi deschisă.\n" + STRING_UNSUPPORTED_TYPE "regedit: Tipul de date de registru [0x%1!x!] nesuportat a apărut în '%2'.\n" + STRING_EXPORT_AS_BINARY "regedit: Valoarea de registru '%1' va fi exportată ca date binare.\n" STRING_INVALID_SYSTEM_KEY "regedit: Cheia de sistem [%1] este nevalidă\n" - STRING_REG_KEY_NOT_FOUND "regedit: '%1' nu a putut fi exportat. Cheia de regiștri specificată nu a fost găsită.\n" - STRING_DELETE_FAILED "regedit: Cheia de regiștri nu a putut fi ștearsă '%1'.\n" + STRING_REG_KEY_NOT_FOUND "regedit: '%1' nu a putut fi exportat. Cheia de registru specificată nu a fost găsită.\n" + STRING_DELETE_FAILED "regedit: Cheia de registru nu a putut fi ștearsă '%1'.\n" STRING_UNKNOWN_TYPE "Tip necunoscut" STRING_INVALID_LINE_SYNTAX, "regedit: Linia conține sintaxă nevalidă.\n" END @@ -608,7 +610,7 @@ END /* *STRINGTABLE *BEGIN - * ID_HELP_HELPTOPICS "Deschide Ajutor pentru Editorul de regiștri." + * ID_HELP_HELPTOPICS "Deschide Ajutor pentru Editorul de registru." * ID_HELP_ABOUT "Afișează informații despre program, numărul versiunii și marca înregistrată." *END */

1 year, 6 months

[reactos] 01/01: [CODEBASE] Fix "uknown" / "unkown" etc. typos.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3854a5d8e93d2c50153bd… commit 3854a5d8e93d2c50153bda26ea378e65cc4241fa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 15 14:12:14 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jul 15 14:19:04 2023 +0200 [CODEBASE] Fix "uknown" / "unkown" etc. typos. Only done in our own code, not in 3rd-party or in PSDK headers (official ones also have such typos in defines...) (NOTE: apparent "Uknown" typo in dll/cpl/sysdm/smbios.c is on-purpose: typo by the manufacturer.) --- base/applications/sndrec32/audio_format.cpp | 2 +- dll/win32/shell32/folders/CControlPanelFolder.cpp | 2 +- dll/win32/shell32/folders/CDrivesFolder.cpp | 2 +- dll/win32/shell32/folders/CRegFolder.cpp | 2 +- hal/halx86/legacy/bussupp.c | 2 +- modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/sndrec32/audio_format.cpp b/base/applications/sndrec32/audio_format.cpp index 20fffc0e2de..7710dce9ea5 100644 --- a/base/applications/sndrec32/audio_format.cpp +++ b/base/applications/sndrec32/audio_format.cpp @@ -12,7 +12,7 @@ _AUDIO_NAMESPACE_START_ /* Standard audio formats (declared as externs in `audio_format.hpp') */ -audio_format UNNKOWN_FORMAT(0, 0, 0); +audio_format UNKNOWN_FORMAT(0, 0, 0); audio_format A44100_16BIT_STEREO(44100, 16, 2); audio_format A44100_16BIT_MONO(44100, 16, 1); diff --git a/dll/win32/shell32/folders/CControlPanelFolder.cpp b/dll/win32/shell32/folders/CControlPanelFolder.cpp index ff62b2e964f..be71cc8f714 100644 --- a/dll/win32/shell32/folders/CControlPanelFolder.cpp +++ b/dll/win32/shell32/folders/CControlPanelFolder.cpp @@ -411,7 +411,7 @@ HRESULT WINAPI CControlPanelFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_A else if (_ILIsSpecialFolder(*apidl)) m_regFolder->GetAttributesOf(1, apidl, rgfInOut); else - ERR("Got an unkown pidl here!\n"); + ERR("Got an unknown pidl here!\n"); apidl++; cidl--; } diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 16b6b701f5b..8dbdc48779d 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -666,7 +666,7 @@ HRESULT WINAPI CDrivesFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLEST else if (_ILIsSpecialFolder(pidlTemp)) m_regFolder->GetAttributesOf(1, &pidlTemp, pdwAttributes); else - ERR("Got an unkown pidl here!\n"); + ERR("Got an unknown pidl here!\n"); } } diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 464d00fe55b..eea529de235 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -510,7 +510,7 @@ HRESULT WINAPI CRegFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apid if (_ILIsSpecialFolder(*apidl)) GetGuidItemAttributes(*apidl, rgfInOut); else - ERR("Got an unkown pidl here!\n"); + ERR("Got an unknown pidl here!\n"); apidl++; cidl--; } diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index 6f91c3b7280..d6d7c99d174 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -355,7 +355,7 @@ HalpAllocateAndInitPciBusHandler(IN ULONG PciType, default: /* Invalid type */ - DbgPrint("HAL: Unnkown PCI type\n"); + DbgPrint("HAL: Unknown PCI type\n"); } /* Return the bus handler */ diff --git a/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp b/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp index d3d6ec83483..483ef0a25f8 100644 --- a/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp +++ b/modules/rosapps/applications/sysutils/regexpl/RegistryKey.cpp @@ -489,7 +489,7 @@ const TCHAR * CRegistryKey::GetValueTypeName(DWORD dwType) case REG_RESOURCE_REQUIREMENTS_LIST: return _T("REG_RESOURCE_REQUIREMENTS_LIST"); default: - return _T("Unkown Type"); + return _T("Unknown Type"); } }

1 year, 6 months

[reactos] 01/01: [NETSH] Update header for English (en-US) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47fecc2952c87ab1a938a… commit 47fecc2952c87ab1a938ad2a0a2c9665dee24170 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jul 15 14:44:07 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Jul 15 14:44:07 2023 +0300 [NETSH] Update header for English (en-US) translation Derived from and addendum to d8f9f7f25. --- base/applications/network/netsh/lang/en-US.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/applications/network/netsh/lang/en-US.rc b/base/applications/network/netsh/lang/en-US.rc index 1fd6654e247..cb05841e99d 100644 --- a/base/applications/network/netsh/lang/en-US.rc +++ b/base/applications/network/netsh/lang/en-US.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATOR: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US /* Basic application information */

1 year, 6 months

[reactos] 01/01: [NETSH] Append missing newline for MSVC

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95bf5872eecd43cef8571… commit 95bf5872eecd43cef85716774b79a4121d6d4069 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 15 13:18:38 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 15 13:18:38 2023 +0200 [NETSH] Append missing newline for MSVC --- base/applications/network/netsh/resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/network/netsh/resource.h b/base/applications/network/netsh/resource.h index e3875fd655c..651a9cd60b4 100644 --- a/base/applications/network/netsh/resource.h +++ b/base/applications/network/netsh/resource.h @@ -34,4 +34,4 @@ #define IDS_HLP_GROUP_ADD 320 #define IDS_HLP_GROUP_DELETE 321 -#define IDS_HLP_GROUP_SHOW 322 \ No newline at end of file +#define IDS_HLP_GROUP_SHOW 322

1 year, 6 months

[reactos] 01/01: [PSDK] Fix issues with callback function type declarations

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0616df11e6a4c4fb29d0a… commit 0616df11e6a4c4fb29d0a44bc4d278608472b485 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 15 12:59:06 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 15 12:59:06 2023 +0200 [PSDK] Fix issues with callback function type declarations --- sdk/include/psdk/netsh.h | 45 +++++++++------------------------------------ 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/sdk/include/psdk/netsh.h b/sdk/include/psdk/netsh.h index 39cef2f6ff3..5a42dd01c96 100644 --- a/sdk/include/psdk/netsh.h +++ b/sdk/include/psdk/netsh.h @@ -7,71 +7,49 @@ extern "C" { typedef DWORD -WINAPI -(GET_RESOURCE_STRING_FN)( +(WINAPI *PGET_RESOURCE_STRING_FN)( _In_ DWORD dwMsgID, _Out_ LPWSTR lpBuffer, _In_ DWORD nBufferMax); -typedef GET_RESOURCE_STRING_FN *PGET_RESOURCE_STRING_FN; - typedef DWORD -WINAPI -(NS_DLL_INIT_FN)( +(WINAPI *PNS_DLL_INIT_FN)( _In_ DWORD dwNetshVersion, _Out_ PVOID pReserved); -typedef NS_DLL_INIT_FN *PNS_DLL_INIT_FN; - typedef DWORD -WINAPI -(NS_HELPER_START_FN)( +(WINAPI *PNS_HELPER_START_FN)( _In_ const GUID *pguidParent, _In_ DWORD dwVersion); -typedef NS_HELPER_START_FN *PNS_HELPER_START_FN; - typedef DWORD -WINAPI -(NS_HELPER_STOP_FN)( +(WINAPI *PNS_HELPER_STOP_FN)( _In_ DWORD dwReserved); -typedef NS_HELPER_STOP_FN *PNS_HELPER_STOP_FN; - typedef DWORD -WINAPI -(NS_CONTEXT_COMMIT_FN)( +(WINAPI *PNS_CONTEXT_COMMIT_FN)( _In_ DWORD dwAction); -typedef NS_CONTEXT_COMMIT_FN *PNS_CONTEXT_COMMIT_FN; - typedef DWORD -WINAPI -(NS_CONTEXT_CONNECT_FN)( +(WINAPI *PNS_CONTEXT_CONNECT_FN)( _In_ LPCWSTR pwszMachine); -typedef NS_CONTEXT_CONNECT_FN *PNS_CONTEXT_CONNECT_FN; - typedef DWORD -WINAPI -(NS_CONTEXT_DUMP_FN)( +(WINAPI *PNS_CONTEXT_DUMP_FN)( _In_ LPCWSTR pwszRouter, _In_ LPWSTR *ppwcArguments, _In_ DWORD dwArgCount, _In_ LPCVOID pvData); -typedef NS_CONTEXT_DUMP_FN *PNS_CONTEXT_DUMP_FN; - typedef BOOL -WINAPI -(NS_OSVERSIONCHECK)( +(WINAPI *PNS_OSVERSIONCHECK)( _In_ UINT CIMOSType, _In_ UINT CIMOSProductSuite, _In_ LPCWSTR CIMOSVersion, @@ -81,12 +59,9 @@ WINAPI _In_ UINT uiReserved, _In_ DWORD dwReserved); -typedef NS_OSVERSIONCHECK *PNS_OSVERSIONCHECK; - typedef DWORD -WINAPI -(FN_HANDLE_CMD)( +(WINAPI *PFN_HANDLE_CMD)( _In_ LPCWSTR pwszMachine, _In_ LPWSTR *ppwcArguments, _In_ DWORD dwCurrentIndex, @@ -95,8 +70,6 @@ WINAPI _In_ LPCVOID pvData, _Out_ BOOL *pbDone); -typedef FN_HANDLE_CMD *PFN_HANDLE_CMD; - typedef struct _CMD_ENTRY {

1 year, 6 months

[reactos] 01/01: [NETSH] Replace the wine stub by a slightly more functional version

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8f9f7f2566614d8c9800… commit d8f9f7f2566614d8c9800edeffafc086836a3cef Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 15 12:27:09 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 15 12:27:09 2023 +0200 [NETSH] Replace the wine stub by a slightly more functional version - Implement a basic command interpreter. - Add basic support for helper dlls and contexts. - Add interactive help system with context support. Everything is still under construction and subject to change. --- base/applications/network/netsh/CMakeLists.txt | 27 +- base/applications/network/netsh/context.c | 374 ++++++++++++++++ base/applications/network/netsh/help.c | 152 +++++++ base/applications/network/netsh/helper.c | 593 +++++++++++++++++++++++++ base/applications/network/netsh/interpreter.c | 238 ++++++++++ base/applications/network/netsh/lang/en-US.rc | 36 ++ base/applications/network/netsh/netsh.c | 267 ++++++++++- base/applications/network/netsh/netsh.rc | 15 + base/applications/network/netsh/netsh.spec | 7 + base/applications/network/netsh/precomp.h | 205 +++++++++ base/applications/network/netsh/resource.h | 37 ++ 11 files changed, 1923 insertions(+), 28 deletions(-) diff --git a/base/applications/network/netsh/CMakeLists.txt b/base/applications/network/netsh/CMakeLists.txt index 5e4005282da..0c838e60c7c 100644 --- a/base/applications/network/netsh/CMakeLists.txt +++ b/base/applications/network/netsh/CMakeLists.txt @@ -1,8 +1,25 @@ -add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/wine) -add_executable(netsh netsh.c) -target_link_libraries(netsh wine) +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) +spec2def(netsh.exe netsh.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + context.c + help.c + helper.c + interpreter.c + netsh.c + precomp.h) + +add_executable(netsh ${SOURCE} netsh.rc ${CMAKE_CURRENT_BINARY_DIR}/netsh.def) + +set_target_properties(netsh + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + set_module_type(netsh win32cui UNICODE) -add_importlibs(netsh msvcrt kernel32 ntdll) +target_link_libraries(netsh conutils ${PSEH_LIB}) +add_importlibs(netsh advapi32 msvcrt user32 kernel32 ntdll) + +add_pch(netsh precomp.h SOURCE) add_cd_file(TARGET netsh DESTINATION reactos/system32 FOR all) diff --git a/base/applications/network/netsh/context.c b/base/applications/network/netsh/context.c new file mode 100644 index 00000000000..dded888c879 --- /dev/null +++ b/base/applications/network/netsh/context.c @@ -0,0 +1,374 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell context management functions + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +PCONTEXT_ENTRY pRootContext = NULL; +PCONTEXT_ENTRY pCurrentContext = NULL; + +/* FUNCTIONS ******************************************************************/ + +PCONTEXT_ENTRY +AddContext( + PCONTEXT_ENTRY pParentContext, + PWSTR pszName, + GUID *pGuid) +{ + PCONTEXT_ENTRY pEntry; + + if (pParentContext != NULL && pszName == NULL) + return NULL; + + /* Allocate the entry */ + pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CONTEXT_ENTRY)); + if (pEntry == NULL) + return NULL; + + /* Allocate the name buffer */ + if (pszName != NULL) + { + pEntry->pszContextName = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pszName) + 1) * sizeof(WCHAR)); + if (pEntry->pszContextName == NULL) + { + HeapFree(GetProcessHeap(), 0, pEntry); + return NULL; + } + + /* Fill the entry */ + wcscpy(pEntry->pszContextName, pszName); + } + + pEntry->pParentContext = pParentContext; + if (pGuid != NULL) + CopyMemory(&pEntry->Guid, pGuid, sizeof(pEntry->Guid)); + + /* Insert it */ + if (pParentContext != NULL) + { + if (pParentContext->pSubContextHead == NULL && pParentContext->pSubContextTail == NULL) + { + pParentContext->pSubContextHead = pEntry; + pParentContext->pSubContextTail = pEntry; + } + else + { + pEntry->pPrev = pParentContext->pSubContextTail; + pParentContext->pSubContextTail->pNext = pEntry; + pParentContext->pSubContextTail = pEntry; + } + } + + return pEntry; +} + + +PCOMMAND_ENTRY +AddContextCommand( + PCONTEXT_ENTRY pContext, + LPCWSTR pwszCmdToken, + PFN_HANDLE_CMD pfnCmdHandler, + DWORD dwShortCmdHelpToken, + DWORD dwCmdHlpToken, + DWORD dwFlags) +{ + PCOMMAND_ENTRY pEntry; + + if (pfnCmdHandler == NULL) + return NULL; + + /* Allocate the entry */ + pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(COMMAND_ENTRY)); + if (pEntry == NULL) + return NULL; + + pEntry->pwszCmdToken = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pwszCmdToken) + 1) * sizeof(WCHAR)); + if (pEntry->pwszCmdToken == NULL) + { + HeapFree(GetProcessHeap(), 0, pEntry); + return NULL; + } + + wcscpy((LPWSTR)pEntry->pwszCmdToken, pwszCmdToken); + + pEntry->pfnCmdHandler = pfnCmdHandler; + pEntry->dwShortCmdHelpToken = dwShortCmdHelpToken; + pEntry->dwCmdHlpToken = dwCmdHlpToken; + pEntry->dwFlags = dwFlags; + + if (pContext->pCommandListHead == NULL && pContext->pCommandListTail == NULL) + { + pContext->pCommandListHead = pEntry; + pContext->pCommandListTail = pEntry; + } + else + { + pEntry->pPrev = pContext->pCommandListTail; + pContext->pCommandListTail->pNext = pEntry; + pContext->pCommandListTail = pEntry; + } + + return pEntry; +} + + +PCOMMAND_GROUP +AddCommandGroup( + PCONTEXT_ENTRY pContext, + LPCWSTR pwszCmdGroupToken, + DWORD dwShortCmdHelpToken, + DWORD dwFlags) +{ + PCOMMAND_GROUP pEntry; + + /* Allocate the entry */ + pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(COMMAND_GROUP)); + if (pEntry == NULL) + return NULL; + + pEntry->pwszCmdGroupToken = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pwszCmdGroupToken) + 1) * sizeof(WCHAR)); + if (pEntry->pwszCmdGroupToken == NULL) + { + HeapFree(GetProcessHeap(), 0, pEntry); + return NULL; + } + + wcscpy((LPWSTR)pEntry->pwszCmdGroupToken, pwszCmdGroupToken); + pEntry->dwShortCmdHelpToken = dwShortCmdHelpToken; + pEntry->dwFlags = dwFlags; + + if (pContext->pGroupListHead == NULL && pContext->pGroupListTail == NULL) + { + pContext->pGroupListHead = pEntry; + pContext->pGroupListTail = pEntry; + } + else + { + pEntry->pPrev = pContext->pGroupListTail; + pContext->pGroupListTail->pNext = pEntry; + pContext->pGroupListTail = pEntry; + } + + return pEntry; +} + + +PCOMMAND_ENTRY +AddGroupCommand( + PCOMMAND_GROUP pGroup, + LPCWSTR pwszCmdToken, + PFN_HANDLE_CMD pfnCmdHandler, + DWORD dwShortCmdHelpToken, + DWORD dwCmdHlpToken, + DWORD dwFlags) +{ + PCOMMAND_ENTRY pEntry; + + if (pfnCmdHandler == NULL) + return NULL; + + /* Allocate the entry */ + pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(COMMAND_ENTRY)); + if (pEntry == NULL) + return NULL; + + pEntry->pwszCmdToken = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pwszCmdToken) + 1) * sizeof(WCHAR)); + if (pEntry->pwszCmdToken == NULL) + { + HeapFree(GetProcessHeap(), 0, pEntry); + return NULL; + } + + wcscpy((LPWSTR)pEntry->pwszCmdToken, pwszCmdToken); + + pEntry->pfnCmdHandler = pfnCmdHandler; + pEntry->dwShortCmdHelpToken = dwShortCmdHelpToken; + pEntry->dwCmdHlpToken = dwCmdHlpToken; + pEntry->dwFlags = dwFlags; + + if (pGroup->pCommandListHead == NULL && pGroup->pCommandListTail == NULL) + { + pGroup->pCommandListHead = pEntry; + pGroup->pCommandListTail = pEntry; + } + else + { + pEntry->pPrev = pGroup->pCommandListTail; + pGroup->pCommandListTail->pNext = pEntry; + pGroup->pCommandListTail = pEntry; + } + + return pEntry; +} + + +VOID +DeleteContext( + PWSTR pszName) +{ + /* Delete all commands */ + /* Delete the context */ +} + + +DWORD +WINAPI +UpCommand( + LPCWSTR pwszMachine, + LPWSTR *argv, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + if (pCurrentContext != pRootContext) + pCurrentContext = pCurrentContext->pParentContext; + + return 0; +} + + +DWORD +WINAPI +ExitCommand( + LPCWSTR pwszMachine, + LPWSTR *argv, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + *pbDone = TRUE; + return 0; +} + + +DWORD +WINAPI +RemCommand( + LPCWSTR pwszMachine, + LPWSTR *argv, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + return 0; +} + + +BOOL +CreateRootContext(VOID) +{ + PCOMMAND_GROUP pGroup; + + pRootContext = AddContext(NULL, NULL, NULL); + DPRINT1("pRootContext: %p\n", pRootContext); + if (pRootContext == NULL) + return FALSE; + + pRootContext->hModule = GetModuleHandle(NULL); + + AddContextCommand(pRootContext, L"..", UpCommand, IDS_HLP_UP, IDS_HLP_UP_EX, 0); + AddContextCommand(pRootContext, L"?", HelpCommand, IDS_HLP_HELP, IDS_HLP_HELP_EX, 0); + AddContextCommand(pRootContext, L"bye", ExitCommand, IDS_HLP_EXIT, IDS_HLP_EXIT_EX, 0); + AddContextCommand(pRootContext, L"exit", ExitCommand, IDS_HLP_EXIT, IDS_HLP_EXIT_EX, 0); + AddContextCommand(pRootContext, L"help", HelpCommand, IDS_HLP_HELP, IDS_HLP_HELP_EX, 0); + AddContextCommand(pRootContext, L"quit", ExitCommand, IDS_HLP_EXIT, IDS_HLP_EXIT_EX, 0); + + pGroup = AddCommandGroup(pRootContext, L"add", IDS_HLP_GROUP_ADD, 0); + if (pGroup) + { + AddGroupCommand(pGroup, L"helper", AddHelperCommand, IDS_HLP_ADD_HELPER, IDS_HLP_ADD_HELPER_EX, 0); + } + + pGroup = AddCommandGroup(pRootContext, L"delete", IDS_HLP_GROUP_DELETE, 0); + if (pGroup) + { + AddGroupCommand(pGroup, L"helper", DeleteHelperCommand, IDS_HLP_DEL_HELPER, IDS_HLP_DEL_HELPER_EX, 0); + } + + pGroup = AddCommandGroup(pRootContext, L"show", IDS_HLP_GROUP_SHOW, 0); + if (pGroup) + { + AddGroupCommand(pGroup, L"helper", ShowHelperCommand, IDS_HLP_SHOW_HELPER, IDS_HLP_SHOW_HELPER_EX, 0); + } + + pCurrentContext = pRootContext; + + return TRUE; +} + + +DWORD +WINAPI +RegisterContext( + _In_ const NS_CONTEXT_ATTRIBUTES *pChildContext) +{ + PCONTEXT_ENTRY pContext; + DWORD i; + + DPRINT1("RegisterContext(%p)\n", pChildContext); + if (pChildContext == NULL) + { + DPRINT1("Invalid child context!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((pChildContext->pwszContext == NULL) || + (wcslen(pChildContext->pwszContext) == 0) || + (wcschr(pChildContext->pwszContext, L' ') != 0) || + (wcschr(pChildContext->pwszContext, L'=') != 0)) + { + DPRINT1("Invalid context name!\n"); + return ERROR_INVALID_PARAMETER; + } + + DPRINT1("Name: %S\n", pChildContext->pwszContext); + + pContext = AddContext(pRootContext, pChildContext->pwszContext, (GUID*)&pChildContext->guidHelper); + if (pContext != NULL) + { + for (i = 0; i < pChildContext->ulNumTopCmds; i++) + { + AddContextCommand(pContext, + pChildContext->pTopCmds[i].pwszCmdToken, + pChildContext->pTopCmds[i].pfnCmdHandler, + pChildContext->pTopCmds[i].dwShortCmdHelpToken, + pChildContext->pTopCmds[i].dwCmdHlpToken, + pChildContext->pTopCmds[i].dwFlags); + } + + /* Add command groups */ + for (i = 0; i < pChildContext->ulNumGroups; i++) + { + AddCommandGroup(pContext, + pChildContext->pCmdGroups[i].pwszCmdGroupToken, + pChildContext->pCmdGroups[i].dwShortCmdHelpToken, + pChildContext->pCmdGroups[i].dwFlags); + } + } + + return ERROR_SUCCESS; +} diff --git a/base/applications/network/netsh/help.c b/base/applications/network/netsh/help.c new file mode 100644 index 00000000000..a446e1ec10c --- /dev/null +++ b/base/applications/network/netsh/help.c @@ -0,0 +1,152 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell builtin help command and support functions + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +static +VOID +GetContextFullName( + _In_ PCONTEXT_ENTRY pContext, + _Inout_ LPWSTR pszBuffer, + _In_ DWORD cchLength) +{ + if (pContext->pParentContext != NULL) + { + GetContextFullName(pContext->pParentContext, pszBuffer, cchLength); + wcscat(pszBuffer, L" "); + wcscat(pszBuffer, pContext->pszContextName); + } + else + { + wcscpy(pszBuffer, L"netsh"); + } +} + + +static +VOID +HelpContext( + PCONTEXT_ENTRY pContext) +{ + PCONTEXT_ENTRY pSubContext; + PCOMMAND_ENTRY pCommand; + PCOMMAND_GROUP pGroup; + WCHAR szBuffer[80]; + + if (pContext != pRootContext) + HelpContext(pContext->pParentContext); + + if (pContext == pCurrentContext) + { + ConPrintf(StdOut, L"\nCommands in this context:\n"); + } + else if (pContext == pRootContext) + { + ConPrintf(StdOut, L"\nCommands in the netsh-context:\n"); + } + else + { + GetContextFullName(pContext, szBuffer, 80); + ConPrintf(StdOut, L"\nCommands in the %s-context:\n", szBuffer); + } + + pCommand = pContext->pCommandListHead; + while (pCommand != NULL) + { + if (LoadStringW(pContext->hModule, pCommand->dwShortCmdHelpToken, szBuffer, 80) == 0) + szBuffer[0] = UNICODE_NULL; + ConPrintf(StdOut, L"%-15s - %s\n", pCommand->pwszCmdToken, szBuffer); + pCommand = pCommand->pNext; + } + + pGroup = pContext->pGroupListHead; + while (pGroup != NULL) + { + if (LoadStringW(pContext->hModule, pGroup->dwShortCmdHelpToken, szBuffer, 80) == 0) + szBuffer[0] = UNICODE_NULL; + ConPrintf(StdOut, L"%-15s - %s\n", pGroup->pwszCmdGroupToken, szBuffer); + pGroup = pGroup->pNext; + } + + pSubContext = pContext->pSubContextHead; + while (pSubContext != NULL) + { + GetContextFullName(pSubContext, szBuffer, 80); + ConPrintf(StdOut, L"%-15s - Changes to the \"%s\" context.\n", pSubContext->pszContextName, szBuffer); + pSubContext = pSubContext->pNext; + } +} + + +VOID +HelpGroup( + PCOMMAND_GROUP pGroup) +{ + PCOMMAND_ENTRY pCommand; + WCHAR szBuffer[64]; + + ConResPrintf(StdOut, IDS_HELP_HEADER); + + ConPrintf(StdOut, L"\nCommands in this context:\n"); + + pCommand = pGroup->pCommandListHead; + while (pCommand != NULL) + { + swprintf(szBuffer, L"%s %s", pGroup->pwszCmdGroupToken, pCommand->pwszCmdToken); + ConPrintf(StdOut, L"%-15s - ", szBuffer); + ConResPuts(StdOut, pCommand->dwShortCmdHelpToken); + pCommand = pCommand->pNext; + } +} + + +DWORD +WINAPI +HelpCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + PCONTEXT_ENTRY pContext; + + ConResPrintf(StdOut, IDS_HELP_HEADER); + + pContext = pCurrentContext; + if (pContext == NULL) + { + DPRINT1("HelpCommand: invalid context %p\n", pContext); + return 1; + } + + HelpContext(pContext); + + if (pCurrentContext->pSubContextHead != NULL) + { + ConResPrintf(StdOut, IDS_SUBCONTEXT_HEADER); + pContext = pCurrentContext->pSubContextHead; + while (pContext != NULL) + { + ConPrintf(StdOut, L" %s", pContext->pszContextName); + pContext = pContext->pNext; + } + ConPuts(StdOut, L"\n"); + } + ConPuts(StdOut, L"\n"); + + return ERROR_SUCCESS; +} diff --git a/base/applications/network/netsh/helper.c b/base/applications/network/netsh/helper.c new file mode 100644 index 00000000000..2054a647019 --- /dev/null +++ b/base/applications/network/netsh/helper.c @@ -0,0 +1,593 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell helper dll management and support functions + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +PDLL_LIST_ENTRY pDllListHead = NULL; +PDLL_LIST_ENTRY pDllListTail = NULL; + +PHELPER_ENTRY pHelperListHead = NULL; +PHELPER_ENTRY pHelperListTail = NULL; + +PDLL_LIST_ENTRY pCurrentDll = NULL; + +/* FUNCTIONS ******************************************************************/ + +static +VOID +StartHelpers(VOID) +{ + PHELPER_ENTRY pHelper; + DWORD dwError; + + pHelper = pHelperListHead; + while (pHelper != NULL) + { + if (pHelper->bStarted == FALSE) + { + if (pHelper->Attributes.pfnStart) + { + dwError = pHelper->Attributes.pfnStart(NULL, 0); + if (dwError == ERROR_SUCCESS) + pHelper->bStarted = TRUE; + } + } + + pHelper = pHelper->pNext; + } +} + + +static +VOID +RegisterHelperDll( + _In_ PDLL_LIST_ENTRY pEntry) +{ + PWSTR pszValueName = NULL; + HKEY hKey; + DWORD dwError; + + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + REG_NETSH_PATH, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL); + if (dwError == ERROR_SUCCESS) + { + RegSetValueExW(hKey, + pEntry->pszValueName, + 0, + REG_SZ, + (PBYTE)pEntry->pszDllName, + (wcslen(pEntry->pszDllName) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + } + + HeapFree(GetProcessHeap(), 0, pszValueName); +} + + +static +VOID +FreeHelperDll( + _In_ PDLL_LIST_ENTRY pEntry) +{ + if (pEntry->hModule) + FreeLibrary(pEntry->hModule); + + if (pEntry->pszValueName) + HeapFree(GetProcessHeap(), 0, pEntry->pszValueName); + + if (pEntry->pszShortName) + HeapFree(GetProcessHeap(), 0, pEntry->pszShortName); + + if (pEntry->pszDllName) + HeapFree(GetProcessHeap(), 0, pEntry->pszDllName); + + HeapFree(GetProcessHeap(), 0, pEntry); +} + + +static +DWORD +LoadHelperDll( + _In_ PWSTR pszDllName, + _In_ BOOL bRegister) +{ + PNS_DLL_INIT_FN pInitHelperDll; + PDLL_LIST_ENTRY pEntry; + PWSTR pszStart, pszEnd; + BOOL bInserted = FALSE; + DWORD dwError; + + pEntry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DLL_LIST_ENTRY)); + if (pEntry == NULL) + { + return ERROR_OUTOFMEMORY; + } + + pEntry->pszDllName = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pszDllName) + 1) * sizeof(WCHAR)); + if (pEntry->pszDllName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + wcscpy(pEntry->pszDllName, pszDllName); + + pszStart = wcsrchr(pszDllName, L'\\'); + if (pszStart == NULL) + pszStart = pszDllName; + + pEntry->pszShortName = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pszStart) + 1) * sizeof(WCHAR)); + if (pEntry->pszShortName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + wcscpy(pEntry->pszShortName, pszStart); + + pEntry->pszValueName = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + (wcslen(pEntry->pszShortName) + 1) * sizeof(WCHAR)); + if (pEntry->pszValueName == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + wcscpy(pEntry->pszValueName, pEntry->pszShortName); + + pszEnd = wcsrchr(pEntry->pszValueName, L'.'); + if (pszEnd != NULL) + *pszEnd = UNICODE_NULL; + + if (pDllListTail == NULL) + { + pEntry->pPrev = NULL; + pEntry->pNext = NULL; + pDllListHead = pEntry; + pDllListTail = pEntry; + } + else + { + pEntry->pPrev = NULL; + pEntry->pNext = pDllListHead; + pDllListHead->pPrev = pEntry; + pDllListHead = pEntry; + } + + bInserted = TRUE; + + pEntry->hModule = LoadLibraryW(pEntry->pszDllName); + if (pEntry->hModule == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not load the helper dll %S (Error: %lu)\n", pEntry->pszDllName, dwError); + goto done; + } + + pInitHelperDll = (PNS_DLL_INIT_FN)GetProcAddress(pEntry->hModule, "InitHelperDll"); + if (pInitHelperDll == NULL) + { + dwError = GetLastError(); + DPRINT1("Could not find 'InitHelperDll' (Error: %lu)\n", dwError); + goto done; + } + + pCurrentDll = pEntry; + dwError = pInitHelperDll(5, NULL); + pCurrentDll = NULL; + + DPRINT1("InitHelperDll returned %lu\n", dwError); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("Call to InitHelperDll failed (Error: %lu)\n", dwError); + goto done; + } + +// if (pEntry->Attributes.pfnStart) +// pEntry->Attributes.pfnStart(NULL, 0); + + if (bRegister) + RegisterHelperDll(pEntry); + +done: + if (dwError != ERROR_SUCCESS) + { + if (bInserted) + { + if (pEntry->pPrev != NULL) + pEntry->pPrev->pNext = pEntry->pNext; + if (pEntry->pNext != NULL) + pEntry->pNext->pPrev = pEntry->pPrev; + if (pDllListTail == pEntry) + pDllListTail = pEntry->pPrev; + if (pDllListHead == pEntry) + pDllListHead = pEntry->pNext; + pEntry->pPrev = NULL; + pEntry->pNext = NULL; + } + + FreeHelperDll(pEntry); + } + + return dwError; +} + + +VOID +LoadHelpers(VOID) +{ + PWSTR pszNameBuffer = NULL; + PWSTR pszValueBuffer = NULL; + HKEY hKey; + DWORD dwValueCount, dwMaxNameLength, dwMaxValueLength; + DWORD dwNameLength, dwValueLength, dwType; + DWORD dwIndex, dwError; + + DPRINT1("LoadHelpers()\n"); + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + REG_NETSH_PATH, + 0, + KEY_READ, + &hKey); + if (dwError != ERROR_SUCCESS) + return; + + dwError = RegQueryInfoKeyW(hKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValueCount, + &dwMaxNameLength, + &dwMaxValueLength, + NULL, + NULL); + if (dwError != ERROR_SUCCESS) + goto done; + + pszNameBuffer = HeapAlloc(GetProcessHeap(), 0, + (dwMaxNameLength + 1) * sizeof(WCHAR)); + if (pszNameBuffer == NULL) + goto done; + + pszValueBuffer = HeapAlloc(GetProcessHeap(), 0, + dwMaxValueLength + sizeof(WCHAR)); + if (pszValueBuffer == NULL) + goto done; + + for (dwIndex = 0; dwIndex < dwValueCount; dwIndex++) + { + dwNameLength = dwMaxNameLength + 1; + dwValueLength = dwMaxValueLength + sizeof(WCHAR); + dwError = RegEnumValueW(hKey, + dwIndex, + pszNameBuffer, + &dwNameLength, + NULL, + &dwType, + (PBYTE)pszValueBuffer, + &dwValueLength); + if (dwError != ERROR_SUCCESS) + break; + + DPRINT1("Dll: %S --> %S %lu\n", pszNameBuffer, pszValueBuffer, dwError); + LoadHelperDll(pszValueBuffer, FALSE); + } + +done: + if (pszValueBuffer) + HeapFree(GetProcessHeap(), 0, pszValueBuffer); + + if (pszNameBuffer) + HeapFree(GetProcessHeap(), 0, pszNameBuffer); + + RegCloseKey(hKey); + + StartHelpers(); +} + + +VOID +UnloadHelpers(VOID) +{ + PDLL_LIST_ENTRY pEntry; + + while (pDllListHead != NULL) + { + pEntry = pDllListHead; + pDllListHead = pEntry->pNext; + +// if (pEntry->Attributes.pfnStop) +// pEntry->Attributes.pfnStop(0); + + FreeHelperDll(pEntry); + } + + pDllListTail = NULL; +} + + +PHELPER_ENTRY +FindHelper( + _In_ const GUID *pguidHelper) +{ + PHELPER_ENTRY pHelper; + + pHelper = pHelperListHead; + while (pHelper != NULL) + { + if (IsEqualGUID(pguidHelper, &pHelper->Attributes.guidHelper)) + return pHelper; + + pHelper = pHelper->pNext; + } + + return NULL; +} + + +DWORD +WINAPI +RegisterHelper( + _In_ const GUID *pguidParentHelper, + _In_ const NS_HELPER_ATTRIBUTES *pHelperAttributes) +{ + PHELPER_ENTRY pHelper = NULL, pParentHelper; + DWORD dwError = ERROR_SUCCESS; + + DPRINT("RegisterHelper(%p %p)\n", pguidParentHelper, pHelperAttributes); + + if (FindHelper(&pHelperAttributes->guidHelper) != NULL) + { + DPRINT1("The Helper has already been registered!\n"); + return 1; + } + + pHelper = (PHELPER_ENTRY)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HELPER_ENTRY)); + if (pHelper == NULL) + { + dwError = ERROR_OUTOFMEMORY; + goto done; + } + + CopyMemory(&pHelper->Attributes, pHelperAttributes, sizeof(NS_HELPER_ATTRIBUTES)); + pHelper->pDllEntry = pCurrentDll; + DPRINT("pHelper->pDllEntry: %p\n", pHelper->pDllEntry); + + if (pguidParentHelper == NULL) + { + if (pHelperListTail == NULL) + { + pHelperListHead = pHelper; + pHelperListTail = pHelper; + } + else + { + pHelper->pNext = pHelperListHead; + pHelperListHead->pPrev = pHelper; + pHelperListHead = pHelper; + } + } + else + { + pParentHelper = FindHelper(&pHelperAttributes->guidHelper); + if (pParentHelper == NULL) + return ERROR_INVALID_PARAMETER; + + if (pParentHelper->pSubHelperHead == NULL && pParentHelper->pSubHelperTail == NULL) + { + pParentHelper->pSubHelperHead = pHelper; + pParentHelper->pSubHelperTail = pHelper; + } + else + { + pHelper->pPrev = pParentHelper->pSubHelperTail; + pParentHelper->pSubHelperTail->pNext = pHelper; + pParentHelper->pSubHelperTail = pHelper; + } + } + +done: + + return dwError; +} + + +DWORD +WINAPI +AddHelperCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + DWORD dwError = ERROR_SUCCESS; + + DPRINT("AddHelperCommand()\n"); + + if (dwArgCount == 2) + { +// ConResPrintf(StdErr, IDS_INVALID_SYNTAX); +// ConResPrintf(StdErr, IDS_HLP_ADD_HELPER_EX); + return 1; + } + + dwError = LoadHelperDll(ppwcArguments[2], TRUE); + if (dwError != ERROR_SUCCESS) + return dwError; + + StartHelpers(); + + return ERROR_SUCCESS; +} + + +DWORD +WINAPI +DeleteHelperCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + PDLL_LIST_ENTRY pEntry; + HKEY hKey; + DWORD dwError; + + DPRINT("DeleteHelper()\n"); + + if (dwArgCount == 2) + { +// ConResPrintf(StdErr, IDS_INVALID_SYNTAX); +// ConResPrintf(StdErr, IDS_HLP_DEL_HELPER_EX); + return 1; + } + + pEntry = pDllListHead; + while (pEntry != NULL) + { + if (wcscmp(pEntry->pszShortName, ppwcArguments[2]) == 0) + { + DPRINT1("remove %S\n", pEntry->pszShortName); + + if (pEntry->pPrev != NULL) + pEntry->pPrev->pNext = pEntry->pNext; + if (pEntry->pNext != NULL) + pEntry->pNext->pPrev = pEntry->pPrev; + if (pDllListTail == pEntry) + pDllListTail = pEntry->pPrev; + if (pDllListHead == pEntry) + pDllListHead = pEntry->pNext; + pEntry->pPrev = NULL; + pEntry->pNext = NULL; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + REG_NETSH_PATH, + 0, + KEY_WRITE, + &hKey); + if (dwError == ERROR_SUCCESS) + { + RegDeleteValue(hKey, pEntry->pszValueName); + RegCloseKey(hKey); + } + + FreeHelperDll(pEntry); + + return 1; + } + + pEntry = pEntry->pNext; + } + + return ERROR_SUCCESS; +} + + +static +VOID +PrintSubContext( + _In_ PCONTEXT_ENTRY pParentContext, + _In_ DWORD dwLevel) +{ + PCONTEXT_ENTRY pContext; + PHELPER_ENTRY pHelper; + WCHAR szPrefix[22]; + DWORD i; + + if (pParentContext == NULL) + return; + + pContext = pParentContext->pSubContextHead; + while (pContext != NULL) + { + pHelper = FindHelper(&pContext->Guid); + if (pHelper != NULL) + { + if (dwLevel > 10) + dwLevel = 10; + + for (i = 0; i < dwLevel * 2; i++) + szPrefix[i] = L' '; + szPrefix[i] = UNICODE_NULL; + + ConPrintf(StdOut, L"{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X} %-16s %s%s\n", + pHelper->Attributes.guidHelper.Data1, + pHelper->Attributes.guidHelper.Data2, + pHelper->Attributes.guidHelper.Data3, + pHelper->Attributes.guidHelper.Data4[0], + pHelper->Attributes.guidHelper.Data4[1], + pHelper->Attributes.guidHelper.Data4[2], + pHelper->Attributes.guidHelper.Data4[3], + pHelper->Attributes.guidHelper.Data4[4], + pHelper->Attributes.guidHelper.Data4[5], + pHelper->Attributes.guidHelper.Data4[6], + pHelper->Attributes.guidHelper.Data4[7], + pHelper->pDllEntry->pszShortName, + szPrefix, + pContext->pszContextName); + } + + PrintSubContext(pContext, dwLevel + 1); + + pContext = pContext->pNext; + } +} + + +DWORD +WINAPI +ShowHelperCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone) +{ + DPRINT("ShowHelperCommand()\n"); + + ConPrintf(StdOut, L"Helper GUID DLL Name Command\n"); + ConPrintf(StdOut, L"-------------------------------------- ---------------- --------\n"); + + if (pRootContext == NULL) + return ERROR_SUCCESS; + + PrintSubContext(pRootContext, 0); + + return ERROR_SUCCESS; +} diff --git a/base/applications/network/netsh/interpreter.c b/base/applications/network/netsh/interpreter.c new file mode 100644 index 00000000000..87c5c2fc2fe --- /dev/null +++ b/base/applications/network/netsh/interpreter.c @@ -0,0 +1,238 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell command interpreter + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOL +InterpretCommand( + _In_ LPWSTR *argv, + _In_ DWORD dwArgCount) +{ + PCONTEXT_ENTRY pContext, pSubContext; + PCOMMAND_ENTRY pCommand; + PCOMMAND_GROUP pGroup; + BOOL bDone = FALSE; + DWORD dwHelpLevel = 0; + DWORD dwError = ERROR_SUCCESS; + + /* If no args provided */ + if (dwArgCount == 0) + return TRUE; + + if (pCurrentContext == NULL) + { + DPRINT1("InterpretCmd: invalid context %p\n", pCurrentContext); + return FALSE; + } + + if ((wcsicmp(argv[dwArgCount - 1], L"?") == 0) || + (wcsicmp(argv[dwArgCount - 1], L"help") == 0)) + { + dwHelpLevel = dwArgCount - 1; + } + + pContext = pCurrentContext; + + while (TRUE) + { + pCommand = pContext->pCommandListHead; + while (pCommand != NULL) + { + if (wcsicmp(argv[0], pCommand->pwszCmdToken) == 0) + { + if (dwHelpLevel == 1) + { + ConResPrintf(StdOut, pCommand->dwCmdHlpToken); + return TRUE; + } + else + { + dwError = pCommand->pfnCmdHandler(NULL, argv, 0, dwArgCount, 0, NULL, &bDone); + if (dwError != ERROR_SUCCESS) + { + ConPrintf(StdOut, L"Error: %lu\n\n"); + ConResPrintf(StdOut, pCommand->dwCmdHlpToken); + } + return !bDone; + } + } + + pCommand = pCommand->pNext; + } + + pGroup = pContext->pGroupListHead; + while (pGroup != NULL) + { + if (wcsicmp(argv[0], pGroup->pwszCmdGroupToken) == 0) + { + if (dwHelpLevel == 1) + { + HelpGroup(pGroup); + return TRUE; + } + + pCommand = pGroup->pCommandListHead; + while (pCommand != NULL) + { + if ((dwArgCount > 1) && (wcsicmp(argv[1], pCommand->pwszCmdToken) == 0)) + { + if (dwHelpLevel == 2) + { + ConResPrintf(StdOut, pCommand->dwCmdHlpToken); + return TRUE; + } + else + { + dwError = pCommand->pfnCmdHandler(NULL, argv, 1, dwArgCount, 0, NULL, &bDone); + if (dwError != ERROR_SUCCESS) + { + ConPrintf(StdOut, L"Error: %lu\n\n"); + ConResPrintf(StdOut, pCommand->dwCmdHlpToken); + return TRUE; + } + return !bDone; + } + } + + pCommand = pCommand->pNext; + } + + HelpGroup(pGroup); + return TRUE; + } + + pGroup = pGroup->pNext; + } + + if (pContext == pCurrentContext) + { + pSubContext = pContext->pSubContextHead; + while (pSubContext != NULL) + { + if (wcsicmp(argv[0], pSubContext->pszContextName) == 0) + { + pCurrentContext = pSubContext; + return TRUE; + } + + pSubContext = pSubContext->pNext; + } + } + + if (pContext == pRootContext) + break; + + pContext = pContext->pParentContext; + } + + ConResPrintf(StdErr, IDS_INVALID_COMMAND, argv[0]); + + return TRUE; +} + + +/* + * InterpretScript(char *line): + * The main function used for when reading commands from scripts. + */ +BOOL +InterpretScript( + _In_ LPWSTR pszInputLine) +{ + LPWSTR args_vector[MAX_ARGS_COUNT]; + DWORD dwArgCount = 0; + BOOL bWhiteSpace = TRUE; + LPWSTR ptr; + + memset(args_vector, 0, sizeof(args_vector)); + + ptr = pszInputLine; + while (*ptr != 0) + { + if (iswspace(*ptr) || *ptr == L'\n') + { + *ptr = 0; + bWhiteSpace = TRUE; + } + else + { + if ((bWhiteSpace != FALSE) && (dwArgCount < MAX_ARGS_COUNT)) + { + args_vector[dwArgCount] = ptr; + dwArgCount++; + } + + bWhiteSpace = FALSE; + } + + ptr++; + } + + /* sends the string to find the command */ + return InterpretCommand(args_vector, dwArgCount); +} + + +VOID +InterpretInteractive(VOID) +{ + WCHAR input_line[MAX_STRING_SIZE]; + LPWSTR args_vector[MAX_ARGS_COUNT]; + DWORD dwArgCount = 0; + BOOL bWhiteSpace = TRUE; + BOOL bRun = TRUE; + LPWSTR ptr; + + while (bRun != FALSE) + { + dwArgCount = 0; + memset(args_vector, 0, sizeof(args_vector)); + + /* Shown just before the input where the user places commands */ +// ConResPuts(StdOut, IDS_APP_PROMPT); + ConPuts(StdOut, L"netsh"); + if (pCurrentContext != pRootContext) + { + ConPuts(StdOut, L" "); + ConPuts(StdOut, pCurrentContext->pszContextName); + } + ConPuts(StdOut, L">"); + + /* Get input from the user. */ + fgetws(input_line, MAX_STRING_SIZE, stdin); + + ptr = input_line; + while (*ptr != 0) + { + if (iswspace(*ptr) || *ptr == L'\n') + { + *ptr = 0; + bWhiteSpace = TRUE; + } + else + { + if ((bWhiteSpace != FALSE) && (dwArgCount < MAX_ARGS_COUNT)) + { + args_vector[dwArgCount] = ptr; + dwArgCount++; + } + bWhiteSpace = FALSE; + } + ptr++; + } + + /* Send the string to find the command */ + bRun = InterpretCommand(args_vector, dwArgCount); + } +} diff --git a/base/applications/network/netsh/lang/en-US.rc b/base/applications/network/netsh/lang/en-US.rc new file mode 100644 index 00000000000..1fd6654e247 --- /dev/null +++ b/base/applications/network/netsh/lang/en-US.rc @@ -0,0 +1,36 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/* Basic application information */ +STRINGTABLE +BEGIN + IDS_APP_USAGE "\nUsage: netsh [-a AliasFile] [-c Context] [-r RemoteMachine] \ +\n [Command | -f ScriptFile]\n" + IDS_INVALID_COMMAND "The following command was not found: %ls.\n" + IDS_OPEN_FAILED "The file %ls could not be openend.\n" + IDS_INVALID_SYNTAX "The syntax supplied for this command is not valid. Check help for the correct syntax.\n\n" +END + +STRINGTABLE +BEGIN + IDS_HELP_HEADER "\nThe following commands are available:\n" + IDS_SUBCONTEXT_HEADER "\nThe following sub-contexts are available:\n" + IDS_HLP_UP "Goes up one context level." + IDS_HLP_UP_EX "Syntax: ..\n\n Goes up one context level.\n\n" + IDS_HLP_EXIT "Exits the program." + IDS_HLP_EXIT_EX "Syntax: exit\n\n Exits the program.\n\n" + IDS_HLP_HELP "Displays a list of commands." + IDS_HLP_HELP_EX "Syntax: help\n\n Displays a list of commands.\n\n" + + IDS_HLP_ADD_HELPER "Installs a helper DLL." + IDS_HLP_ADD_HELPER_EX "Syntax: add helper <dll file name>\n\n Installs the specified helper DLL in netsh.\n\n" + + IDS_HLP_DEL_HELPER "Removes a helper DLL." + IDS_HLP_DEL_HELPER_EX "Syntax: delete helper <dll file name>\n\n Removes the specified helper DLL from netsh.\n\n" + + IDS_HLP_SHOW_HELPER "Lists all the top-level helpers." + IDS_HLP_SHOW_HELPER_EX "Syntax: show helper\n\n Lists all the top-level helpers.\n\n" + + IDS_HLP_GROUP_ADD "Adds a configuration entry to a list of entries." + IDS_HLP_GROUP_DELETE "Deletes a configuration entry from a list of entries." + IDS_HLP_GROUP_SHOW "Displays information." +END diff --git a/base/applications/network/netsh/netsh.c b/base/applications/network/netsh/netsh.c index bf938698d3c..7c0a33b669b 100644 --- a/base/applications/network/netsh/netsh.c +++ b/base/applications/network/netsh/netsh.c @@ -1,33 +1,254 @@ /* - * Copyright 2010 Hans Leidekker for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell main file + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> */ -#include <wine/debug.h> +/* INCLUDES *******************************************************************/ -WINE_DEFAULT_DEBUG_CHANNEL(netsh); +#include "precomp.h" -int wmain(int argc, WCHAR *argv[]) +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +BOOL +RunScript( + _In_ LPCWSTR filename) +{ + FILE *script; + WCHAR tmp_string[MAX_STRING_SIZE]; + + /* Open the file for processing */ + script = _wfopen(filename, L"r"); + if (script == NULL) + { + ConResPrintf(StdErr, IDS_OPEN_FAILED, filename); + return FALSE; + } + + /* Read and process the script */ + while (fgetws(tmp_string, MAX_STRING_SIZE, script) != NULL) + { + if (InterpretScript(tmp_string) == FALSE) + { + fclose(script); + return FALSE; + } + } + + /* Close the file */ + fclose(script); + + return TRUE; +} + +/* + * wmain(): + * Main entry point of the application. + */ +int +wmain( + _In_ int argc, + _In_ const LPWSTR argv[]) { - int i; + LPCWSTR tmpBuffer = NULL; + LPCWSTR pszFileName = NULL; + int index; + int result = EXIT_SUCCESS; + + DPRINT("main()\n"); + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + /* FIXME: Init code goes here */ + CreateRootContext(); + LoadHelpers(); + + if (argc < 2) + { + /* If there are no command arguments, then go straight to the interpreter */ + InterpretInteractive(); + } + else + { + /* If there are command arguments, then process them */ + for (index = 1; index < argc; index++) + { + if ((argv[index][0] == '/')|| + (argv[index][0] == '-')) + { + tmpBuffer = argv[index] + 1; + } + else + { + if (pszFileName != NULL) + { + ConResPuts(StdOut, IDS_APP_USAGE); + result = EXIT_FAILURE; + goto done; + } + + /* Run a command from the command line */ + if (InterpretCommand((LPWSTR*)&argv[index], argc - index) == FALSE) + result = EXIT_FAILURE; + goto done; + } + + if (_wcsicmp(tmpBuffer, L"?") == 0) + { + /* Help option */ + ConResPuts(StdOut, IDS_APP_USAGE); + result = EXIT_SUCCESS; + goto done; + } + else if (_wcsicmp(tmpBuffer, L"a") == 0) + { + /* Aliasfile option */ + if ((index + 1) < argc) + { + index++; + ConPuts(StdOut, L"\nThe -a option is not implemented yet\n"); +// aliasfile = argv[index]; + } + else + { + ConResPuts(StdOut, IDS_APP_USAGE); + result = EXIT_FAILURE; + } + } + else if (_wcsicmp(tmpBuffer, L"c") == 0) + { + /* Context option */ + if ((index + 1) < argc) + { + index++; + ConPuts(StdOut, L"\nThe -c option is not implemented yet\n"); +// context = argv[index]; + } + else + { + ConResPuts(StdOut, IDS_APP_USAGE); + result = EXIT_FAILURE; + } + } + else if (_wcsicmp(tmpBuffer, L"f") == 0) + { + /* File option */ + if ((index + 1) < argc) + { + index++; + pszFileName = argv[index]; + } + else + { + ConResPuts(StdOut, IDS_APP_USAGE); + result = EXIT_FAILURE; + } + } + else if (_wcsicmp(tmpBuffer, L"r") == 0) + { + /* Remote option */ + if ((index + 1) < argc) + { + index++; + ConPuts(StdOut, L"\nThe -r option is not implemented yet\n"); +// remote = argv[index]; + } + else + { + ConResPuts(StdOut, IDS_APP_USAGE); + result = EXIT_FAILURE; + } + } + else + { + /* Invalid command */ + ConResPrintf(StdOut, IDS_INVALID_COMMAND, argv[index]); + result = EXIT_FAILURE; + goto done; + } + } + + /* Now we process the filename if it exists */ + if (pszFileName != NULL) + { + if (RunScript(pszFileName) == FALSE) + { + result = EXIT_FAILURE; + goto done; + } + } + } - WINE_FIXME("stub:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); +done: + /* FIXME: Cleanup code goes here */ + UnloadHelpers(); + return result; +} + + +DWORD +WINAPI +MatchEnumTag( + _In_ HANDLE hModule, + _In_ LPCWSTR pwcArg, + _In_ DWORD dwNumArg, + _In_ const TOKEN_VALUE *pEnumTable, + _Out_ PDWORD pdwValue) +{ + DPRINT1("MatchEnumTag()\n"); return 0; } + +BOOL +WINAPI +MatchToken( + _In_ LPCWSTR pwszUserToken, + _In_ LPCWSTR pwszCmdToken) +{ + DPRINT1("MatchToken %S %S\n", pwszUserToken, pwszCmdToken); + return (wcsicmp(pwszUserToken, pwszCmdToken) == 0) ? TRUE : FALSE; +} + +DWORD +CDECL +PrintError( + _In_opt_ HANDLE hModule, + _In_ DWORD dwErrId, + ...) +{ + DPRINT1("PrintError()\n"); + return 1; +} + +DWORD +CDECL +PrintMessageFromModule( + _In_ HANDLE hModule, + _In_ DWORD dwMsgId, + ...) +{ + DPRINT1("PrintMessageFromModule()\n"); + return 1; +} + +DWORD +CDECL +PrintMessage( + _In_ LPCWSTR pwszFormat, + ...) +{ + INT Length; + va_list ap; + + va_start(ap, pwszFormat); + Length = ConPrintf(StdOut, pwszFormat); + va_end(ap); + + return Length; +} diff --git a/base/applications/network/netsh/netsh.rc b/base/applications/network/netsh/netsh.rc new file mode 100644 index 00000000000..448c3239e04 --- /dev/null +++ b/base/applications/network/netsh/netsh.rc @@ -0,0 +1,15 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "Net Shell" +#define REACTOS_STR_INTERNAL_NAME "netsh" +#define REACTOS_STR_ORIGINAL_FILENAME "netsh.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/base/applications/network/netsh/netsh.spec b/base/applications/network/netsh/netsh.spec new file mode 100644 index 00000000000..4d82c1e7f36 --- /dev/null +++ b/base/applications/network/netsh/netsh.spec @@ -0,0 +1,7 @@ +@ stdcall MatchEnumTag(ptr wstr long ptr ptr) +@ stdcall MatchToken(wstr wstr) +@ varargs PrintError(ptr long) +@ varargs PrintMessage(wstr) +@ varargs PrintMessageFromModule(ptr long) +@ stdcall RegisterContext(ptr) +@ stdcall RegisterHelper(ptr ptr) diff --git a/base/applications/network/netsh/precomp.h b/base/applications/network/netsh/precomp.h new file mode 100644 index 00000000000..031b03cc767 --- /dev/null +++ b/base/applications/network/netsh/precomp.h @@ -0,0 +1,205 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell main header file + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + +#ifndef PRECOMP_H +#define PRECOMP_H + +/* INCLUDES ******************************************************************/ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wincon.h> +#include <winuser.h> + +#include <errno.h> + +#include <conutils.h> +#include <netsh.h> + +#include "resource.h" + + +/* DEFINES *******************************************************************/ + +#define MAX_STRING_SIZE 1024 +#define MAX_ARGS_COUNT 256 + +#define REG_NETSH_PATH L"Software\\Microsoft\\NetSh" + + +/* TYPEDEFS ******************************************************************/ + +typedef struct _DLL_LIST_ENTRY +{ + struct _DLL_LIST_ENTRY *pPrev; + struct _DLL_LIST_ENTRY *pNext; + + PWSTR pszDllName; + PWSTR pszShortName; + PWSTR pszValueName; + + HMODULE hModule; + +} DLL_LIST_ENTRY, *PDLL_LIST_ENTRY; + +typedef struct _HELPER_ENTRY +{ + struct _HELPER_ENTRY *pPrev; + struct _HELPER_ENTRY *pNext; + + NS_HELPER_ATTRIBUTES Attributes; + + PDLL_LIST_ENTRY pDllEntry; + BOOL bStarted; + + struct _HELPER_ENTRY *pSubHelperHead; + struct _HELPER_ENTRY *pSubHelperTail; + +} HELPER_ENTRY, *PHELPER_ENTRY; + + + +typedef struct _COMMAND_ENTRY +{ + struct _COMMAND_ENTRY *pPrev; + struct _COMMAND_ENTRY *pNext; + + LPCWSTR pwszCmdToken; + PFN_HANDLE_CMD pfnCmdHandler; + DWORD dwShortCmdHelpToken; + DWORD dwCmdHlpToken; + DWORD dwFlags; +} COMMAND_ENTRY, *PCOMMAND_ENTRY; + +typedef struct _COMMAND_GROUP +{ + struct _COMMAND_GROUP *pPrev; + struct _COMMAND_GROUP *pNext; + + LPCWSTR pwszCmdGroupToken; + DWORD dwShortCmdHelpToken; + DWORD dwFlags; + + PCOMMAND_ENTRY pCommandListHead; + PCOMMAND_ENTRY pCommandListTail; +} COMMAND_GROUP, *PCOMMAND_GROUP; + +typedef struct _CONTEXT_ENTRY +{ + struct _CONTEXT_ENTRY *pPrev; + struct _CONTEXT_ENTRY *pNext; + + struct _CONTEXT_ENTRY *pParentContext; + + PWSTR pszContextName; + GUID Guid; + HMODULE hModule; + + PCOMMAND_ENTRY pCommandListHead; + PCOMMAND_ENTRY pCommandListTail; + + PCOMMAND_GROUP pGroupListHead; + PCOMMAND_GROUP pGroupListTail; + + struct _CONTEXT_ENTRY *pSubContextHead; + struct _CONTEXT_ENTRY *pSubContextTail; +} CONTEXT_ENTRY, *PCONTEXT_ENTRY; + + +/* GLOBAL VARIABLES ***********************************************************/ + +extern PCONTEXT_ENTRY pRootContext; +extern PCONTEXT_ENTRY pCurrentContext; + + +/* PROTOTYPES *****************************************************************/ + +/* context.c */ + +BOOL +CreateRootContext(VOID); + + +/* help.c */ +DWORD +WINAPI +HelpCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone); + +VOID +HelpGroup( + PCOMMAND_GROUP pGroup); + + +/* helper.c */ +VOID +LoadHelpers(VOID); + +VOID +UnloadHelpers(VOID); + + +DWORD +WINAPI +AddHelperCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone); + +DWORD +WINAPI +DeleteHelperCommand( + LPCWSTR pwszMachine, + LPWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone); + +DWORD +WINAPI +ShowHelperCommand( + LPCWSTR pwszMachine, + PWSTR *ppwcArguments, + DWORD dwCurrentIndex, + DWORD dwArgCount, + DWORD dwFlags, + LPCVOID pvData, + BOOL *pbDone); + + +/* interpreter.c */ +BOOL +InterpretScript( + LPWSTR pszFileName); + +BOOL +InterpretCommand( + LPWSTR *argv, + DWORD dwArgCount); + +VOID +InterpretInteractive(VOID); + +#endif /* PRECOMP_H */ diff --git a/base/applications/network/netsh/resource.h b/base/applications/network/netsh/resource.h new file mode 100644 index 00000000000..e3875fd655c --- /dev/null +++ b/base/applications/network/netsh/resource.h @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS NetSh + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Network Shell resource id header file + * COPYRIGHT: Copyright 2023 Eric Kohl <eric.kohl(a)reactos.org> + */ + +#pragma once + +#define IDS_NONE -1 + +#define IDS_APP_USAGE 100 +#define IDS_APP_PROMPT 101 +#define IDS_INVALID_COMMAND 102 +#define IDS_OPEN_FAILED 103 +#define IDS_INVALID_SYNTAX 104 + +#define IDS_HELP_HEADER 200 +#define IDS_SUBCONTEXT_HEADER 201 + +#define IDS_HLP_EXIT 300 +#define IDS_HLP_EXIT_EX 301 +#define IDS_HLP_HELP 302 +#define IDS_HLP_HELP_EX 303 +#define IDS_HLP_UP 304 +#define IDS_HLP_UP_EX 305 + +#define IDS_HLP_ADD_HELPER 310 +#define IDS_HLP_ADD_HELPER_EX 311 +#define IDS_HLP_DEL_HELPER 312 +#define IDS_HLP_DEL_HELPER_EX 313 +#define IDS_HLP_SHOW_HELPER 314 +#define IDS_HLP_SHOW_HELPER_EX 315 + +#define IDS_HLP_GROUP_ADD 320 +#define IDS_HLP_GROUP_DELETE 321 +#define IDS_HLP_GROUP_SHOW 322 \ No newline at end of file

1 year, 6 months

[reactos] 01/01: [NTOS:IO] Implement IoConnectInterruptEx for fully specified interrupt types (#5416)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dabe7fba461a3d1a48932… commit dabe7fba461a3d1a48932004ac529d6609d94b38 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Fri Jul 14 16:17:27 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 14 16:17:27 2023 -0700 [NTOS:IO] Implement IoConnectInterruptEx for fully specified interrupt types (#5416) Implement IoConnectInterruptEx() for CONNECT_FULLY_SPECIFIED. This gives ability to load various modern drivers that use IoConnectInterruptEx. Various drivers work after this change, such as serial.sys MS sample driver when compiled with the reactos tree and many more KMDF drivers from later Windows versions. Co-authored-by: Victor Perevertkin <victor(a)perevertkin.ru> --- ntoskrnl/io/iomgr/irq.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/ntoskrnl.spec | 2 ++ 2 files changed, 60 insertions(+) diff --git a/ntoskrnl/io/iomgr/irq.c b/ntoskrnl/io/iomgr/irq.c index a604be1d604..f82d58d44c1 100644 --- a/ntoskrnl/io/iomgr/irq.c +++ b/ntoskrnl/io/iomgr/irq.c @@ -166,4 +166,62 @@ IoDisconnectInterrupt(PKINTERRUPT InterruptObject) ExFreePool(IoInterrupt); // ExFreePoolWithTag(IoInterrupt, TAG_KINTERRUPT); } +NTSTATUS +IopConnectInterruptExFullySpecific( + _Inout_ PIO_CONNECT_INTERRUPT_PARAMETERS Parameters) +{ + NTSTATUS Status; + PAGED_CODE(); + + /* Fallback to standard IoConnectInterrupt */ + Status = IoConnectInterrupt(Parameters->FullySpecified.InterruptObject, + Parameters->FullySpecified.ServiceRoutine, + Parameters->FullySpecified.ServiceContext, + Parameters->FullySpecified.SpinLock, + Parameters->FullySpecified.Vector, + Parameters->FullySpecified.Irql, + Parameters->FullySpecified.SynchronizeIrql, + Parameters->FullySpecified.InterruptMode, + Parameters->FullySpecified.ShareVector, + Parameters->FullySpecified.ProcessorEnableMask, + Parameters->FullySpecified.FloatingSave); + DPRINT("IopConnectInterruptEx_FullySpecific: has failed with status %X", Status); + return Status; +} + +NTSTATUS +NTAPI +IoConnectInterruptEx( + _Inout_ PIO_CONNECT_INTERRUPT_PARAMETERS Parameters) +{ + PAGED_CODE(); + switch (Parameters->Version) + { + case CONNECT_FULLY_SPECIFIED: + return IopConnectInterruptExFullySpecific(Parameters); + case CONNECT_FULLY_SPECIFIED_GROUP: + //TODO: We don't do anything for the group type + return IopConnectInterruptExFullySpecific(Parameters); + case CONNECT_MESSAGE_BASED: + DPRINT1("FIXME: Message based interrupts are UNIMPLEMENTED\n"); + break; + case CONNECT_LINE_BASED: + DPRINT1("FIXME: Line based interrupts are UNIMPLEMENTED\n"); + break; + } + return STATUS_SUCCESS; +} + +VOID +NTAPI +IoDisconnectInterruptEx( + _In_ PIO_DISCONNECT_INTERRUPT_PARAMETERS Parameters) +{ + PAGED_CODE(); + + //FIXME: This eventually will need to handle more cases + if (Parameters->ConnectionContext.InterruptObject) + IoDisconnectInterrupt(Parameters->ConnectionContext.InterruptObject); +} + /* EOF */ diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index ced05f9a8bd..fe90fb7fdfd 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -362,6 +362,7 @@ @ stdcall IoCheckShareAccess(long long ptr ptr long) @ stdcall IoCompleteRequest(ptr long) @ stdcall IoConnectInterrupt(ptr ptr ptr ptr long long long long long long long) +@ stdcall -version=0x600+ IoConnectInterruptEx(ptr) @ stdcall IoCreateController(long) @ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stdcall IoCreateDisk(ptr ptr) @@ -390,6 +391,7 @@ @ extern IoDeviceHandlerObjectType @ extern IoDeviceObjectType @ stdcall IoDisconnectInterrupt(ptr) +@ stdcall -version=0x600+ IoDisconnectInterruptEx(ptr) @ extern IoDriverObjectType @ stdcall IoEnqueueIrp(ptr) @ stdcall IoEnumerateDeviceObjectList(ptr ptr long ptr)

1 year, 6 months

[reactos] 01/01: [CMD] Correctly honour the "short" path flag in %~var enhanced variables expansion. (#5433) CORE-14096, CORE-8002

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ce4b73920f76de6a48bd… commit 8ce4b73920f76de6a48bd04d3b0fe6e21207da7b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 13 16:07:37 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Jul 14 14:36:55 2023 +0200 [CMD] Correctly honour the "short" path flag in %~var enhanced variables expansion. (#5433) CORE-14096, CORE-8002 Patch based on an earlier fix attempt by Doug Lyons. It should fix the problem observed by contributor 'whindsaks' in PR #5403. This bug has always been present since the implementation of this feature in commit a1eb1f6ba (r40024). The expansion of %~dpX ennhanced variables used to incorrectly show some directories in uppercase. For example: ```batch :: testcmd.cmd echo '%~dp0' echo '%~dps0' echo '%~s0' ``` would show: ``` P:\Documents and Settings\Administrator\Desktop>echo 'P:\Documents and Settings\Administrator\DESKTOP\' 'P:\Documents and Settings\Administrator\DESKTOP\' P:\Documents and Settings\Administrator\Desktop>echo 'P:\DOCUME~1\ADMINI~1\DESKTOP\' 'P:\DOCUME~1\ADMINI~1\DESKTOP\' P:\Documents and Settings\Administrator\Desktop>echo 'P:\DOCUME~1\ADMINI~1\DESKTOP\testcmd.cmd' 'P:\DOCUME~1\ADMINI~1\DESKTOP\testcmd.cmd' ``` instead of the correct: ``` P:\Documents and Settings\Administrator\Desktop>echo 'P:\Documents and Settings\Administrator\Desktop\' 'P:\Documents and Settings\Administrator\Desktop\' P:\Documents and Settings\Administrator\Desktop>echo 'P:\DOCUME~1\ADMINI~1\DESKTOP\' 'P:\DOCUME~1\ADMINI~1\DESKTOP\' P:\Documents and Settings\Administrator\Desktop>echo 'P:\DOCUME~1\ADMINI~1\DESKTOP\testcmd.cmd' 'P:\DOCUME~1\ADMINI~1\DESKTOP\testcmd.cmd' ``` The reason was a wrong handling of the presence (or absence) of the "short" path format specifier 's' in those enhanced variables. In the examples above, the "Desktop" sub-directory has a short-path name available (because it is in a FAT partition). The short-path name was used some times also even with the 's' specifier absent. Co-authored-by: Doug Lyons <douglyons(a)douglyons.com> --- base/shell/cmd/cmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 0f16229172f..126f2f4cb31 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1158,11 +1158,9 @@ GetEnhancedVar( if (hFind != INVALID_HANDLE_VALUE) { PTSTR FixedComponent = w32fd.cFileName; - if (*w32fd.cAlternateFileName && - ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) - { + if ((Modifiers & M_SHORT) && *w32fd.cAlternateFileName) FixedComponent = w32fd.cAlternateFileName; - } + FindClose(hFind); if (Out + _tcslen(FixedComponent) + 1 >= &FixedPath[ARRAYSIZE(FixedPath)])

1 year, 6 months

[reactos] 01/01: [MSGINA] Convert shutdown/logoff boxes back to modal dialog boxes (#5114)

by Arnav Bhatt

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79e4efe04e2b00ae6fbae… commit 79e4efe04e2b00ae6fbae09657264a2ff23c3655 Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Fri Jul 14 12:02:40 2023 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jul 14 15:02:40 2023 +0300 [MSGINA] Convert shutdown/logoff boxes back to modal dialog boxes (#5114) - Convert all modeless dialog boxes back to modal dialog boxes. - Use WM_TIMER to detect SHIFT key press instead, as you can't directly intercept messages on modal dialog boxes. - Remove some unused functions. Fixes explorer crash on shutdown cancel. CORE-17749 --- dll/win32/msgina/resource.h | 16 +- dll/win32/msgina/shutdown.c | 389 ++++++++++++---------------------- dll/win32/shell32/dialogs/dialogs.cpp | 134 ++++++------ 3 files changed, 209 insertions(+), 330 deletions(-) diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index 7116ab5cbac..5020c6dfb7d 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -58,10 +58,10 @@ #define IDC_SHUTDOWN_STATIC 3004 #define IDC_RESTART_STATIC 3005 -#define IDC_BUTTON_HIBERNATE 1901 -#define IDC_BUTTON_SLEEP 1902 -#define IDC_BUTTON_SHUTDOWN 1903 -#define IDC_BUTTON_REBOOT 1904 +#define IDC_BUTTON_SHUTDOWN 1901 +#define IDC_BUTTON_REBOOT 1902 +#define IDC_BUTTON_SLEEP 1903 +#define IDC_BUTTON_HIBERNATE 1904 #define IDD_LEGALNOTICE 2100 #define IDC_LEGALNOTICE_TEXT 2101 @@ -111,14 +111,14 @@ #define IDS_INVALIDWORKSTATION 40023 #define IDS_ACCOUNTRESTRICTION 40024 -#define IDS_SHUTDOWN_SHUTDOWN 50000 -#define IDS_SHUTDOWN_LOGOFF 50001 +#define IDS_SHUTDOWN_LOGOFF 50000 +#define IDS_SHUTDOWN_SHUTDOWN 50001 #define IDS_SHUTDOWN_RESTART 50002 #define IDS_SHUTDOWN_SLEEP 50003 #define IDS_SHUTDOWN_HIBERNATE 50004 /* Shut down descriptions */ -#define IDS_SHUTDOWN_SHUTDOWN_DESC 50005 -#define IDS_SHUTDOWN_LOGOFF_DESC 50006 +#define IDS_SHUTDOWN_LOGOFF_DESC 50005 +#define IDS_SHUTDOWN_SHUTDOWN_DESC 50006 #define IDS_SHUTDOWN_RESTART_DESC 50007 #define IDS_SHUTDOWN_SLEEP_DESC 50008 #define IDS_SHUTDOWN_HIBERNATE_DESC 50009 diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index 559b6c5b243..f2f5f3c2a01 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -48,11 +48,18 @@ #define BUTTON_SLEEP_FOCUSED (CY_BITMAP + BUTTON_SLEEP_PRESSED) #define BUTTON_SLEEP_DISABLED (CY_BITMAP + BUTTON_SLEEP_FOCUSED) +/* For bIsButtonHot */ +#define SHUTDOWN_BUTTON_HOT 0 +#define REBOOT_BUTTON_HOT 1 +#define SLEEP_BUTTON_HOT 2 +#define HIBERNATE_BUTTON_HOT 3 + typedef struct _SHUTDOWN_DLG_CONTEXT { PGINA_CONTEXT pgContext; HBITMAP hBitmap; HBITMAP hImageStrip; + DWORD ShutdownDialogId; DWORD ShutdownOptions; HBRUSH hBrush; HFONT hfFont; @@ -61,7 +68,8 @@ typedef struct _SHUTDOWN_DLG_CONTEXT BOOL bReasonUI; BOOL bFriendlyUI; BOOL bIsButtonHot[NUMBER_OF_BUTTONS]; - BOOL bIsDialogModal; + BOOL bTimer; + UINT_PTR iTimer; WNDPROC OldButtonProc; } SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT; @@ -333,7 +341,7 @@ DrawIconOnOwnerDrawnButtons( { y = BUTTON_SHUTDOWN_PRESSED; } - else if (pContext->bIsButtonHot[0] || (pdis->itemState & ODS_FOCUS)) + else if (pContext->bIsButtonHot[SHUTDOWN_BUTTON_HOT] || (pdis->itemState & ODS_FOCUS)) { y = BUTTON_SHUTDOWN_FOCUSED; } @@ -356,7 +364,7 @@ DrawIconOnOwnerDrawnButtons( { y = BUTTON_REBOOT_PRESSED; } - else if (pContext->bIsButtonHot[1] || (pdis->itemState & ODS_FOCUS)) + else if (pContext->bIsButtonHot[REBOOT_BUTTON_HOT] || (pdis->itemState & ODS_FOCUS)) { y = BUTTON_REBOOT_FOCUSED; } @@ -384,8 +392,8 @@ DrawIconOnOwnerDrawnButtons( { y = BUTTON_SLEEP_PRESSED; } - else if ((pdis->CtlID == IDC_BUTTON_SLEEP && pContext->bIsButtonHot[2]) || - (pdis->CtlID == IDC_BUTTON_HIBERNATE && pContext->bIsButtonHot[3]) || + else if ((pdis->CtlID == IDC_BUTTON_SLEEP && pContext->bIsButtonHot[SLEEP_BUTTON_HOT]) || + (pdis->CtlID == IDC_BUTTON_HIBERNATE && pContext->bIsButtonHot[HIBERNATE_BUTTON_HOT]) || (pdis->itemState & ODS_FOCUS)) { y = BUTTON_SLEEP_FOCUSED; @@ -504,8 +512,7 @@ OwnerDrawButtonSubclass( LPARAM lParam) { PSHUTDOWN_DLG_CONTEXT pContext; - pContext = (PSHUTDOWN_DLG_CONTEXT)GetWindowLongPtrW(hButton, GWLP_USERDATA); - + pContext = (PSHUTDOWN_DLG_CONTEXT)GetWindowLongPtrW(GetParent(hButton), GWLP_USERDATA); int buttonID = GetDlgCtrlID(hButton); switch (uMsg) @@ -520,19 +527,19 @@ OwnerDrawButtonSubclass( SetCapture(hButton); if (buttonID == IDC_BUTTON_SHUTDOWN) { - pContext->bIsButtonHot[0] = TRUE; + pContext->bIsButtonHot[SHUTDOWN_BUTTON_HOT] = TRUE; } else if (buttonID == IDC_BUTTON_REBOOT) { - pContext->bIsButtonHot[1] = TRUE; + pContext->bIsButtonHot[REBOOT_BUTTON_HOT] = TRUE; } else if (buttonID == IDC_BUTTON_SLEEP) { - pContext->bIsButtonHot[2] = TRUE; + pContext->bIsButtonHot[SLEEP_BUTTON_HOT] = TRUE; } else if (buttonID == IDC_BUTTON_HIBERNATE) { - pContext->bIsButtonHot[3] = TRUE; + pContext->bIsButtonHot[HIBERNATE_BUTTON_HOT] = TRUE; } SetCursor(LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_HAND))); } @@ -545,19 +552,19 @@ OwnerDrawButtonSubclass( ReleaseCapture(); if (buttonID == IDC_BUTTON_SHUTDOWN) { - pContext->bIsButtonHot[0] = FALSE; + pContext->bIsButtonHot[SHUTDOWN_BUTTON_HOT] = FALSE; } else if (buttonID == IDC_BUTTON_REBOOT) { - pContext->bIsButtonHot[1] = FALSE; + pContext->bIsButtonHot[REBOOT_BUTTON_HOT] = FALSE; } else if (buttonID == IDC_BUTTON_SLEEP) { - pContext->bIsButtonHot[2] = FALSE; + pContext->bIsButtonHot[SLEEP_BUTTON_HOT] = FALSE; } else if (buttonID == IDC_BUTTON_HIBERNATE) { - pContext->bIsButtonHot[3] = FALSE; + pContext->bIsButtonHot[HIBERNATE_BUTTON_HOT] = FALSE; } } InvalidateRect(hButton, NULL, FALSE); @@ -581,26 +588,6 @@ OwnerDrawButtonSubclass( return CallWindowProcW(pContext->OldButtonProc, hButton, uMsg, wParam, lParam); } -VOID -AddPrefixToStaticTexts( - HWND hDlg, - BOOL bIsSleepButtonReplaced) -{ - WCHAR szBuffer[30]; - - for (int i = 0; i < NUMBER_OF_BUTTONS; i++) - { - GetDlgItemTextW(hDlg, IDC_BUTTON_HIBERNATE + i, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hDlg, IDC_HIBERNATE_STATIC + i, szBuffer); - } - - if (bIsSleepButtonReplaced) - { - GetDlgItemTextW(hDlg, IDC_BUTTON_HIBERNATE, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); - } -} - VOID CreateToolTipForButtons( int controlID, @@ -637,11 +624,33 @@ CreateToolTipForButtons( } VOID -ReplaceRequiredButton( +EndFriendlyDialog( + HWND hDlg, + PSHUTDOWN_DLG_CONTEXT pContext) +{ + if (pContext->bTimer) + { + KillTimer(hDlg, pContext->iTimer); + } + + DeleteObject(pContext->hBitmap); + DeleteObject(pContext->hBrush); + DeleteObject(pContext->hImageStrip); + DeleteObject(pContext->hfFont); + + /* Remove the subclass from the buttons */ + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_SHUTDOWN + i), + GWLP_WNDPROC, + (LONG_PTR)pContext->OldButtonProc); + } +} + +VOID +ChangeRequiredButton( HWND hDlg, - HINSTANCE hInstance, - BOOL bIsAltKeyPressed, - BOOL bIsSleepButtonReplaced) + PSHUTDOWN_DLG_CONTEXT pContext) { int destID = IDC_BUTTON_SLEEP; int targetedID = IDC_BUTTON_HIBERNATE; @@ -650,7 +659,7 @@ ReplaceRequiredButton( WCHAR szBuffer[30]; /* If the sleep button has been already replaced earlier, bring sleep button back to its original position */ - if (bIsSleepButtonReplaced) + if (pContext->bIsSleepButtonReplaced) { destID = IDC_BUTTON_HIBERNATE; targetedID = IDC_BUTTON_SLEEP; @@ -678,31 +687,35 @@ ReplaceRequiredButton( ShowWindow(hwndTarget, SW_SHOW); SetFocus(hwndTarget); - if (bIsAltKeyPressed) + if (!pContext->bIsSleepButtonReplaced) { - if (!bIsSleepButtonReplaced) - { - GetDlgItemTextW(hDlg, IDC_BUTTON_HIBERNATE, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); - } - else - { - GetDlgItemTextW(hDlg, IDC_BUTTON_SLEEP, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); - } + LoadStringW(pContext->pgContext->hDllInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); } else { - if (!bIsSleepButtonReplaced) - { - LoadStringW(hInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); - } - else - { - LoadStringW(hInstance, IDS_SHUTDOWN_SLEEP, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); - } + LoadStringW(pContext->pgContext->hDllInstance, IDS_SHUTDOWN_SLEEP, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); + } + + InvalidateRect(hDlg, NULL, FALSE); +} + +VOID OnTimer( + HWND hDlg, + PSHUTDOWN_DLG_CONTEXT pContext) +{ + BOOL ReplaceButton = !!(GetKeyState(VK_SHIFT) & 0x8000); + + if (ReplaceButton && !pContext->bIsSleepButtonReplaced) + { + ChangeRequiredButton(hDlg, pContext); + pContext->bIsSleepButtonReplaced = TRUE; + } + else if (!ReplaceButton && pContext->bIsSleepButtonReplaced) + { + ChangeRequiredButton(hDlg, pContext); + pContext->bIsSleepButtonReplaced = FALSE; } } @@ -836,15 +849,11 @@ UpdateShutdownDesc( } static VOID -ShutdownOnInit( +ShutdownOnFriendlyInit( IN HWND hDlg, IN PSHUTDOWN_DLG_CONTEXT pContext) { PGINA_CONTEXT pgContext = pContext->pgContext; - HWND hwndList; - INT idx, count, i; - WCHAR szBuffer[256]; - WCHAR szBuffer2[256]; HDC hdc; LONG lfHeight; @@ -858,21 +867,61 @@ ShutdownOnInit( /* Create a brush for static controls for fancy shut down dialog */ pContext->hBrush = CreateSolidBrush(DARK_GREY_COLOR); + /* Gather image strip */ pContext->hImageStrip = LoadBitmapW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDB_IMAGE_STRIP)); - hwndList = GetDlgItem(hDlg, IDC_SHUTDOWN_ACTION); - - /* Clear the content before it's used */ - SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); - /* Set the boolean flags to false */ pContext->bIsSleepButtonReplaced = FALSE; + pContext->bTimer = FALSE; + + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SLEEP), IsPwrSuspendAllowed()); + + /* Gather old button func */ + pContext->OldButtonProc = (WNDPROC)GetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE), GWLP_WNDPROC); + /* Set bIsButtonHot to false, create tooltips for each buttons, make buttons to remember pContext and subclass the buttons */ for (int i = 0; i < NUMBER_OF_BUTTONS; i++) { pContext->bIsButtonHot[i] = FALSE; + SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_SHUTDOWN + i), + GWLP_WNDPROC, + (LONG_PTR)OwnerDrawButtonSubclass); + CreateToolTipForButtons(IDC_BUTTON_SHUTDOWN + i, + IDS_SHUTDOWN_SHUTDOWN_DESC + i, + hDlg, IDS_SHUTDOWN_SHUTDOWN + i, + pContext->pgContext->hDllInstance); } + if (pContext->ShutdownDialogId == IDD_SHUTDOWN_FANCY && IsPwrSuspendAllowed()) + { + pContext->iTimer = SetTimer(hDlg, 0, 50, NULL); + pContext->bTimer = TRUE; + } +} + +static VOID +ShutdownOnInit( + IN HWND hDlg, + IN PSHUTDOWN_DLG_CONTEXT pContext) +{ + PGINA_CONTEXT pgContext = pContext->pgContext; + HWND hwndList; + INT idx, count, i; + WCHAR szBuffer[256]; + WCHAR szBuffer2[256]; + + if (pContext->bFriendlyUI) + { + ShutdownOnFriendlyInit(hDlg, pContext); + return; + } + + hwndList = GetDlgItem(hDlg, IDC_SHUTDOWN_ACTION); + + /* Clear the content before it's used */ + SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); + /* Log off */ if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_LOGOFF) { @@ -891,10 +940,6 @@ ShutdownOnInit( if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); } - else if (pContext->bFriendlyUI) - { - EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SHUTDOWN), FALSE); - } /* Restart */ if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_REBOOT) @@ -904,10 +949,6 @@ ShutdownOnInit( if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_REBOOT); } - else if (pContext->bFriendlyUI) - { - EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_REBOOT), FALSE); - } // if (pContext->ShutdownOptions & 0x08) {} @@ -919,10 +960,6 @@ ShutdownOnInit( if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_SLEEP); } - else if (pContext->bFriendlyUI) - { - EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SLEEP), IsPwrSuspendAllowed()); - } // if (pContext->ShutdownOptions & 0x20) {} @@ -934,10 +971,6 @@ ShutdownOnInit( if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE); } - else if (pContext->bFriendlyUI) - { - EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE), FALSE); - } // if (pContext->ShutdownOptions & 0x80) {} @@ -952,34 +985,6 @@ ShutdownOnInit( } } - /* Create tool tips for the buttons of fancy log off dialog */ - CreateToolTipForButtons(IDC_BUTTON_HIBERNATE, - IDS_SHUTDOWN_HIBERNATE_DESC, - hDlg, IDS_SHUTDOWN_HIBERNATE, - pContext->pgContext->hDllInstance); - CreateToolTipForButtons(IDC_BUTTON_SHUTDOWN, - IDS_SHUTDOWN_SHUTDOWN_DESC, - hDlg, IDS_SHUTDOWN_SHUTDOWN, - pContext->pgContext->hDllInstance); - CreateToolTipForButtons(IDC_BUTTON_REBOOT, - IDS_SHUTDOWN_RESTART_DESC, - hDlg, IDS_SHUTDOWN_RESTART, - pContext->pgContext->hDllInstance); - CreateToolTipForButtons(IDC_BUTTON_SLEEP, - IDS_SHUTDOWN_SLEEP_DESC, - hDlg, IDS_SHUTDOWN_SLEEP, - pContext->pgContext->hDllInstance); - - /* Gather old button func */ - pContext->OldButtonProc = (WNDPROC)GetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE), GWLP_WNDPROC); - - /* Make buttons to remember pContext and subclass the buttons */ - for (int i = 0; i < NUMBER_OF_BUTTONS; i++) - { - SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE + i), GWLP_USERDATA, (LONG_PTR)pContext); - SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE + i), GWLP_WNDPROC, (LONG_PTR)OwnerDrawButtonSubclass); - } - /* Update the choice description based on the current selection */ UpdateShutdownDesc(hDlg, pContext); } @@ -1027,23 +1032,13 @@ ShutdownDialogProc( SetWindowLongPtrW(hDlg, GWLP_USERDATA, (LONG_PTR)pContext); ShutdownOnInit(hDlg, pContext); - - /* Draw the logo bitmap */ - pContext->hBitmap = - LoadImageW(pContext->pgContext->hDllInstance, MAKEINTRESOURCEW(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); return TRUE; } case WM_DESTROY: - DeleteObject(pContext->hBitmap); - DeleteObject(pContext->hBrush); - DeleteObject(pContext->hImageStrip); - DeleteObject(pContext->hfFont); - - /* Remove the subclass from the buttons */ - for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + if (pContext->bFriendlyUI) { - SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE + i), GWLP_WNDPROC, (LONG_PTR)pContext->OldButtonProc); + EndFriendlyDialog(hDlg, pContext); } return TRUE; @@ -1059,45 +1054,15 @@ ShutdownDialogProc( if (!pContext->bCloseDlg) { pContext->bCloseDlg = TRUE; - - if (pContext->bIsDialogModal) - { - EndDialog(hDlg, 0); - } - else - { - DestroyWindow(hDlg); - PostQuitMessage(0); - } + EndDialog(hDlg, IDCANCEL); } } return FALSE; } - case WM_PAINT: - { - PAINTSTRUCT ps; - if (pContext->hBitmap) - { - BeginPaint(hDlg, &ps); - DrawStateW(ps.hdc, NULL, NULL, (LPARAM)pContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); - EndPaint(hDlg, &ps); - } - return TRUE; - } - case WM_CLOSE: pContext->bCloseDlg = TRUE; - - if (pContext->bIsDialogModal) - { - EndDialog(hDlg, IDCANCEL); - } - else - { - DestroyWindow(hDlg); - PostQuitMessage(IDCANCEL); - } + EndDialog(hDlg, IDCANCEL); break; case WM_COMMAND: @@ -1122,16 +1087,7 @@ ShutdownDialogProc( case IDCANCEL: case IDHELP: pContext->bCloseDlg = TRUE; - - if (pContext->bIsDialogModal) - { - EndDialog(hDlg, LOWORD(wParam)); - } - else - { - DestroyWindow(hDlg); - PostQuitMessage(LOWORD(wParam)); - } + EndDialog(hDlg, LOWORD(wParam)); break; case IDC_SHUTDOWN_ACTION: @@ -1179,6 +1135,10 @@ ShutdownDialogProc( break; } + case WM_TIMER: + OnTimer(hDlg, pContext); + return TRUE; + default: return FALSE; } @@ -1193,10 +1153,6 @@ ShutdownDialog( { INT_PTR ret; SHUTDOWN_DLG_CONTEXT Context; - BOOL bIsAltKeyPressed = FALSE; - DWORD ShutdownDialogId = IDD_SHUTDOWN; - MSG Msg; - HWND hDlg; #if 0 DWORD ShutdownOptions; @@ -1208,13 +1164,13 @@ ShutdownDialog( Context.pgContext = pgContext; Context.ShutdownOptions = ShutdownOptions; + Context.ShutdownDialogId = IDD_SHUTDOWN; Context.bCloseDlg = FALSE; Context.bReasonUI = GetShutdownReasonUI(); Context.bFriendlyUI = ShellIsFriendlyUIActive(); if (pgContext->hWlx && pgContext->pWlxFuncs && !Context.bFriendlyUI) { - Context.bIsDialogModal = TRUE; ret = pgContext->pWlxFuncs->WlxDialogBoxParam(pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : IDD_SHUTDOWN), @@ -1228,90 +1184,19 @@ ShutdownDialog( { if (IsShowHibernateButtonActive()) { - ShutdownDialogId = IDD_SHUTDOWN_FANCY_LONG; + Context.ShutdownDialogId = IDD_SHUTDOWN_FANCY_LONG; } else { - ShutdownDialogId = IDD_SHUTDOWN_FANCY; + Context.ShutdownDialogId = IDD_SHUTDOWN_FANCY; } } - Context.bIsDialogModal = FALSE; - hDlg = CreateDialogParamW(pgContext->hDllInstance, - MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : ShutdownDialogId), - hwndDlg, - ShutdownDialogProc, - (LPARAM)&Context); - - ShowWindow(hDlg, SW_SHOW); - - /* Detect either Alt or Shift key have been pressed or released */ - while (GetMessageW(&Msg, NULL, 0, 0)) - { - if (!IsDialogMessageW(hDlg, &Msg)) - { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); - } - - switch (Msg.message) - { - case WM_SYSKEYDOWN: - { - /* If the Alt key has been pressed once, add prefix to static controls */ - if (Msg.wParam == VK_MENU && !bIsAltKeyPressed) - { - AddPrefixToStaticTexts(hDlg, Context.bIsSleepButtonReplaced); - bIsAltKeyPressed = TRUE; - } - } - break; - - case WM_KEYDOWN: - { - /* - * If the Shift key has been pressed once, and both hibernate button and sleep button are enabled - * replace the sleep button with hibernate button - */ - if (Msg.wParam == VK_SHIFT) - { - if (ShutdownDialogId == IDD_SHUTDOWN_FANCY && !Context.bIsSleepButtonReplaced) - { - if (IsPwrHibernateAllowed() && IsPwrSuspendAllowed()) - { - ReplaceRequiredButton(hDlg, - pgContext->hDllInstance, - bIsAltKeyPressed, - Context.bIsSleepButtonReplaced); - Context.bIsSleepButtonReplaced = TRUE; - } - } - } - } - break; - - case WM_KEYUP: - { - /* If the Shift key has been released after being pressed, replace the hibernate button with sleep button again */ - if (Msg.wParam == VK_SHIFT) - { - if (ShutdownDialogId == IDD_SHUTDOWN_FANCY && Context.bIsSleepButtonReplaced) - { - if (IsPwrHibernateAllowed() && IsPwrSuspendAllowed()) - { - ReplaceRequiredButton(hDlg, - pgContext->hDllInstance, - bIsAltKeyPressed, - Context.bIsSleepButtonReplaced); - Context.bIsSleepButtonReplaced = FALSE; - } - } - } - } - break; - } - } - ret = Msg.wParam; + ret = DialogBoxParamW(pgContext->hDllInstance, + MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : Context.ShutdownDialogId), + hwndDlg, + ShutdownDialogProc, + (LPARAM)&Context); } #if 0 diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 4b05a92ef31..f2ee6aa2278 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -1124,6 +1124,10 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D #define BUTTON_LOG_OFF_FOCUSED (CY_BITMAP + BUTTON_LOG_OFF_PRESSED) #define BUTTON_SWITCH_USER_DISABLED (CY_BITMAP + BUTTON_LOG_OFF_FOCUSED) // Temporary +/* For bIsButtonHot */ +#define LOG_OFF_BUTTON_HOT 0 +#define SWITCH_USER_BUTTON_HOT 1 + BOOL DrawIconOnOwnerDrawnButtons(DRAWITEMSTRUCT* pdis, PLOGOFF_DLG_CONTEXT pContext) { BOOL bRet = FALSE; @@ -1152,7 +1156,7 @@ BOOL DrawIconOnOwnerDrawnButtons(DRAWITEMSTRUCT* pdis, PLOGOFF_DLG_CONTEXT pCont { y = BUTTON_LOG_OFF_PRESSED; } - else if (pContext->bIsButtonHot[0] || (pdis->itemState & ODS_FOCUS)) + else if (pContext->bIsButtonHot[LOG_OFF_BUTTON_HOT] || (pdis->itemState & ODS_FOCUS)) { y = BUTTON_LOG_OFF_FOCUSED; } @@ -1175,7 +1179,7 @@ BOOL DrawIconOnOwnerDrawnButtons(DRAWITEMSTRUCT* pdis, PLOGOFF_DLG_CONTEXT pCont { y = BUTTON_SWITCH_USER_PRESSED; } - else if (pContext->bIsButtonHot[1] || (pdis->itemState & ODS_FOCUS)) + else if (pContext->bIsButtonHot[SWITCH_USER_BUTTON_HOT] || (pdis->itemState & ODS_FOCUS)) { y = BUTTON_SWITCH_USER_FOCUSED; } @@ -1210,7 +1214,7 @@ BOOL DrawIconOnOwnerDrawnButtons(DRAWITEMSTRUCT* pdis, PLOGOFF_DLG_CONTEXT pCont INT_PTR CALLBACK OwnerDrawButtonSubclass(HWND hButton, UINT uMsg, WPARAM wParam, LPARAM lParam) { PLOGOFF_DLG_CONTEXT pContext; - pContext = (PLOGOFF_DLG_CONTEXT)GetWindowLongPtrW(hButton, GWLP_USERDATA); + pContext = (PLOGOFF_DLG_CONTEXT)GetWindowLongPtrW(GetParent(hButton), GWLP_USERDATA); int buttonID = GetDlgCtrlID(hButton); @@ -1224,13 +1228,19 @@ INT_PTR CALLBACK OwnerDrawButtonSubclass(HWND hButton, UINT uMsg, WPARAM wParam, if (GetCapture() != hButton) { SetCapture(hButton); - if (buttonID == IDC_LOG_OFF_BUTTON) - { - pContext->bIsButtonHot[0] = TRUE; - } - else if (buttonID == IDC_SWITCH_USER_BUTTON) + + switch (buttonID) { - pContext->bIsButtonHot[1] = TRUE; + case IDC_LOG_OFF_BUTTON: + { + pContext->bIsButtonHot[LOG_OFF_BUTTON_HOT] = TRUE; + break; + } + case IDC_SWITCH_USER_BUTTON: + { + pContext->bIsButtonHot[SWITCH_USER_BUTTON_HOT] = TRUE; + break; + } } SetCursor(LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_HAND))); } @@ -1241,13 +1251,19 @@ INT_PTR CALLBACK OwnerDrawButtonSubclass(HWND hButton, UINT uMsg, WPARAM wParam, if (hwndTarget != hButton) { ReleaseCapture(); - if (buttonID == IDC_LOG_OFF_BUTTON) - { - pContext->bIsButtonHot[0] = FALSE; - } - else if (buttonID == IDC_SWITCH_USER_BUTTON) + + switch (buttonID) { - pContext->bIsButtonHot[1] = FALSE; + case IDC_LOG_OFF_BUTTON: + { + pContext->bIsButtonHot[LOG_OFF_BUTTON_HOT] = FALSE; + break; + } + case IDC_SWITCH_USER_BUTTON: + { + pContext->bIsButtonHot[SWITCH_USER_BUTTON_HOT] = FALSE; + break; + } } } InvalidateRect(hButton, NULL, FALSE); @@ -1300,6 +1316,21 @@ VOID CreateToolTipForButtons(int controlID, int detailID, HWND hDlg, int titleID SendMessageW(hwndTip, TTM_SETMAXTIPWIDTH, 0, 250); } +VOID EndFriendlyDialog(HWND hwnd, PLOGOFF_DLG_CONTEXT pContext) +{ + DeleteObject(pContext->hBrush); + DeleteObject(pContext->hImageStrip); + DeleteObject(pContext->hfFont); + + /* Remove the subclass from the buttons */ + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), + GWLP_WNDPROC, + (LONG_PTR)pContext->OldButtonProc); + } +} + static BOOL IsFriendlyUIActive(VOID) { DWORD dwType = 0, dwValue = 0, dwSize = 0; @@ -1389,18 +1420,20 @@ static VOID FancyLogoffOnInit(HWND hwnd, PLOGOFF_DLG_CONTEXT pContext) pContext->hImageStrip = LoadBitmapW(shell32_hInstance, MAKEINTRESOURCEW(IDB_IMAGE_STRIP)); - CreateToolTipForButtons(IDC_LOG_OFF_BUTTON, IDS_LOG_OFF_DESC, hwnd, IDS_LOG_OFF_TITLE); - CreateToolTipForButtons(IDC_SWITCH_USER_BUTTON, IDS_SWITCH_USER_DESC, hwnd, IDS_SWITCH_USER_TITLE); - /* Gather old button func */ pContext->OldButtonProc = (WNDPROC)GetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON), GWLP_WNDPROC); - /* Make buttons to remember pContext and subclass the buttons as well as set bIsButtonHot boolean flags to false */ + /* Set bIsButtonHot to false, create tooltips for each buttons and subclass the buttons */ for (int i = 0; i < NUMBER_OF_BUTTONS; i++) { pContext->bIsButtonHot[i] = FALSE; - SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), GWLP_USERDATA, (LONG_PTR)pContext); - SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), GWLP_WNDPROC, (LONG_PTR)OwnerDrawButtonSubclass); + SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), + GWLP_WNDPROC, + (LONG_PTR)OwnerDrawButtonSubclass); + CreateToolTipForButtons(IDC_LOG_OFF_BUTTON + i, + IDS_LOG_OFF_DESC + i, + hwnd, + IDS_LOG_OFF_TITLE + i); } } @@ -1428,8 +1461,7 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP } case WM_CLOSE: - DestroyWindow(hwnd); - PostQuitMessage(IDCANCEL); + EndDialog(hwnd, IDCANCEL); break; /* @@ -1441,8 +1473,7 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP { if (LOWORD(wParam) == WA_INACTIVE) { - DestroyWindow(hwnd); - PostQuitMessage(0); + EndDialog(hwnd, IDCANCEL); } return FALSE; } @@ -1456,22 +1487,14 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP break; case IDCANCEL: - DestroyWindow(hwnd); - PostQuitMessage(IDCANCEL); + EndDialog(hwnd, IDCANCEL); break; } break; case WM_DESTROY: - DeleteObject(pContext->hBrush); - DeleteObject(pContext->hImageStrip); - DeleteObject(pContext->hfFont); - - /* Remove the subclass from the buttons */ - for (int i = 0; i < NUMBER_OF_BUTTONS; i++) - { - SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), GWLP_WNDPROC, (LONG_PTR)pContext->OldButtonProc); - } + if (pContext->bFriendlyUI) + EndFriendlyDialog(hwnd, pContext); return TRUE; case WM_CTLCOLORSTATIC: @@ -1522,11 +1545,7 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner) { CComPtr<IUnknown> fadeHandler; - BOOL bIsAltKeyPressed = FALSE; - MSG Msg; HWND parent = NULL; - HWND hWndChild = NULL; - WCHAR szBuffer[30]; DWORD LogoffDialogID = IDD_LOG_OFF; LOGOFF_DLG_CONTEXT Context; @@ -1539,36 +1558,11 @@ EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner) LogoffDialogID = IDD_LOG_OFF_FANCY; } - hWndChild = CreateDialogParamW(shell32_hInstance, MAKEINTRESOURCEW(LogoffDialogID), parent, LogOffDialogProc, (LPARAM)&Context); - ShowWindow(hWndChild, SW_SHOWNORMAL); - - /* Detect either Alt key has been pressed */ - while (GetMessageW(&Msg, NULL, 0, 0)) - { - if(!IsDialogMessageW(hWndChild, &Msg)) - { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); - } - - switch (Msg.message) - { - case WM_SYSKEYDOWN: - { - /* If the Alt key has been pressed once, add prefix to static controls */ - if (Msg.wParam == VK_MENU && !bIsAltKeyPressed && Context.bFriendlyUI) - { - for (int i = 0; i < NUMBER_OF_BUTTONS; i++) - { - GetDlgItemTextW(hWndChild, IDC_LOG_OFF_BUTTON + i, szBuffer, _countof(szBuffer)); - SetDlgItemTextW(hWndChild, IDC_LOG_OFF_STATIC + i, szBuffer); - } - bIsAltKeyPressed = TRUE; - } - } - break; - } - } + DialogBoxParamW(shell32_hInstance, + MAKEINTRESOURCEW(LogoffDialogID), + parent, + LogOffDialogProc, + (LPARAM)&Context); return 0; }

1 year, 6 months

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