Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 01/01: [SHELL32] Implement Recycler Bin icons (#4221)

by Jesús Sanz del Rey

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c6f1958d986b97eb0838… commit 9c6f1958d986b97eb08385a2035ed8bb794134f4 Author: Jesús Sanz del Rey <jesussanz2003(a)gmail.com> AuthorDate: Mon Jan 17 00:20:07 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 17 00:20:07 2022 +0100 [SHELL32] Implement Recycler Bin icons (#4221) CORE-3938 Icon extraction from the recycle bin was not possible due to the partial absence of IExtractIcon interface support. Adding it inside the RecycleBinFile's QueryInterface private implementation, and then calling it from CRecycleBin, now allows retrieving and displaying the files' icons. --- dll/win32/shell32/folders/CRecycleBin.cpp | 50 ++++++++++++++++++---- .../shell32/shellrecyclebin/recyclebin_private.h | 2 + .../shellrecyclebin/recyclebin_v5_enumerator.c | 13 ++++++ 3 files changed, 56 insertions(+), 9 deletions(-) diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index 48d285c9ac7..ee6c6d60754 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -62,14 +62,53 @@ static const columninfo RecycleBinColumns[] = * Recycle Bin folder */ -HRESULT CRecyclerExtractIcon_CreateInstance(LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) +BOOL WINAPI CBSearchRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile); + +static PIDLRecycleStruct * _ILGetRecycleStruct(LPCITEMIDLIST pidl); + +typedef struct _SEARCH_CONTEXT +{ + PIDLRecycleStruct *pFileDetails; + HANDLE hDeletedFile; + BOOL bFound; +} SEARCH_CONTEXT, *PSEARCH_CONTEXT; + +HRESULT CRecyclerExtractIcon_CreateInstance( + LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { + PIDLRecycleStruct *pFileDetails = _ILGetRecycleStruct(pidl); + if (pFileDetails == NULL) + goto fallback; + + // Try to obtain the file + SEARCH_CONTEXT Context; + Context.pFileDetails = pFileDetails; + Context.bFound = FALSE; + + EnumerateRecycleBinW(NULL, CBSearchRecycleBin, &Context); + if (Context.bFound) + { + // This should be executed any time, if not, there are some errors in the implementation + IRecycleBinFile* pRecycleFile = (IRecycleBinFile*)Context.hDeletedFile; + + // Query the interface from the private interface + HRESULT hr = pRecycleFile->QueryInterface(riid, ppvOut); + + // Close the file handle as we don't need it anymore + CloseRecycleBinHandle(Context.hDeletedFile); + + return hr; + } + +fallback: + // In case the search fails we use a default icon + ERR("Recycler could not retrieve the icon, this shouldn't happen\n"); + CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - /* FIXME: This is completely unimplemented */ initIcon->SetNormalIcon(swShell32Name, 0); return initIcon->QueryInterface(riid, ppvOut); @@ -116,13 +155,6 @@ class CRecycleBinItemContextMenu : END_COM_MAP() }; -typedef struct -{ - PIDLRecycleStruct *pFileDetails; - HANDLE hDeletedFile; - BOOL bFound; -} SEARCH_CONTEXT, *PSEARCH_CONTEXT; - BOOL WINAPI CBSearchRecycleBin(IN PVOID Context, IN HANDLE hDeletedFile) { PSEARCH_CONTEXT pContext = (PSEARCH_CONTEXT)Context; diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_private.h b/dll/win32/shell32/shellrecyclebin/recyclebin_private.h index 9686bdfccee..6c90aa94728 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_private.h +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_private.h @@ -5,6 +5,8 @@ #define COBJMACROS +#include <shlobj.h> + #include "recyclebin.h" #include "recyclebin_v5.h" diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c index bbe4fa1e834..411c623b3a2 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c @@ -17,6 +17,11 @@ struct RecycleBin5File WCHAR FullName[ANY_SIZE]; }; +static HRESULT STDMETHODCALLTYPE +RecycleBin5File_RecycleBinFile_GetAttributes( + IN IRecycleBinFile *This, + OUT DWORD *pAttributes); + static HRESULT STDMETHODCALLTYPE RecycleBin5File_RecycleBinFile_QueryInterface( IN IRecycleBinFile *This, @@ -34,6 +39,14 @@ RecycleBin5File_RecycleBinFile_QueryInterface( *ppvObject = &s->recycleBinFileImpl; else if (IsEqualIID(riid, &IID_IRecycleBinFile)) *ppvObject = &s->recycleBinFileImpl; + else if (IsEqualIID(riid, &IID_IExtractIconA) || IsEqualIID(riid, &IID_IExtractIconW)) + { + DWORD dwAttributes; + if (RecycleBin5File_RecycleBinFile_GetAttributes(This, &dwAttributes) == S_OK) + return SHCreateFileExtractIconW(s->FullName, dwAttributes, riid, ppvObject); + else + return S_FALSE; + } else { *ppvObject = NULL;

2 years, 11 months

[reactos] 01/01: [BOOTDATA] Make Secondary Logon service name and description translatable

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63cd5d54b87b26a3201b1… commit 63cd5d54b87b26a3201b1cf21571e364632fa7c0 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jan 16 22:46:36 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Jan 16 22:46:36 2022 +0300 [BOOTDATA] Make Secondary Logon service name and description translatable Addendum to 43fa9548. --- boot/bootdata/hivesys.inf | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index bc10f421afd..cc4b106ab3e 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2057,8 +2057,8 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceMain",0x000 ; Secondary Logon service HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DependOnService",0x00010000,"RPCSS" -HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Description",0x00000000,"Secondary Logon service" -HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DisplayName",0x00000000,"Secondary Logon" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Description",0x00000000,%SECLOGON_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DisplayName",0x00000000,%SECLOGON_SERVICE% HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Group",0x00000000,"SchedulerGroup" HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" @@ -2303,6 +2303,9 @@ SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services th SCHEDULE_SERVICE="Scheduler service" SCHEDULE_SERVICE_DESCRIPTION="Allows starting of programs at specific times." +SECLOGON_SERVICE="Secondary Logon" +SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." + SERVER_SERVICE="Server" SERVER_SERVICE_DESCRIPTION="Supports sharing for file, printers and resources on the network." @@ -2456,6 +2459,9 @@ SAMSS_SERVICE_DESCRIPTION="El arranque de este servicio señala a otros servicio SCHEDULE_SERVICE="Programador de tareas" SCHEDULE_SERVICE_DESCRIPTION="Permite iniciar programas automáticamente en unas horas o instantes específicos." +SECLOGON_SERVICE="Secondary Logon" +SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." + SERVER_SERVICE="Servidor" SERVER_SERVICE_DESCRIPTION="Ofrece compatibilidad para archivos, impresoras y recursos en la red." @@ -2609,6 +2615,9 @@ SAMSS_SERVICE_DESCRIPTION="Uruchomienie tej usługi informuje inne usługi, że SCHEDULE_SERVICE="Usługa Harmonogram" SCHEDULE_SERVICE_DESCRIPTION="Umożliwia uruchamianie programów w określonym czasie." +SECLOGON_SERVICE="Secondary Logon" +SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." + SERVER_SERVICE="Serwer" SERVER_SERVICE_DESCRIPTION="Oferuje udostępnianie w sieci plików, drukarek i potoków dla tego komputera." @@ -2759,6 +2768,9 @@ SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services th SCHEDULE_SERVICE="Serviciu de planificare" SCHEDULE_SERVICE_DESCRIPTION="Permite pornirea de programe la o anumită oră." +SECLOGON_SERVICE="Secondary Logon" +SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." + SERVER_SERVICE="Server" SERVER_SERVICE_DESCRIPTION="Permite partajarea în rețea a fișierelor, imprimantelor și a altor resurse." @@ -2912,6 +2924,9 @@ SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services th SCHEDULE_SERVICE="Планировщик заданий" SCHEDULE_SERVICE_DESCRIPTION="Позволяет запускать программы в определенное время." +SECLOGON_SERVICE="Secondary Logon" +SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." + SERVER_SERVICE="Сервер" SERVER_SERVICE_DESCRIPTION="Поддержка совместного использования файлов, принтеров и ресурсов в сети." @@ -3065,6 +3080,9 @@ SAMSS_SERVICE_DESCRIPTION="Bu hizmetin başlaması, diğer hizmetlere Güvenlik SCHEDULE_SERVICE="Zamanlayıcı hizmeti" SCHEDULE_SERVICE_DESCRIPTION="Programların belirli zamanlarda başlatılmasını sağlar." +SECLOGON_SERVICE="Secondary Logon" +SECLOGON_SERVICE_DESCRIPTION="Allows to start processes under alternative credentials." + SERVER_SERVICE="Sunucu" SERVER_SERVICE_DESCRIPTION="Ağda dosya, yazıcı ve kaynakların paylaşımını destekler."

2 years, 11 months

[reactos] 01/01: [reactos] Add missing prototypes for svchost callbacks

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24a727a23bd1c6f136ef7… commit 24a727a23bd1c6f136ef77ff7d1d394b4c0b6c24 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 16 19:56:28 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 16 19:56:28 2022 +0100 [reactos] Add missing prototypes for svchost callbacks Addendum to 43fa9548d32a10967f9d53c73c1d4484c8927ee8 --- sdk/include/reactos/svc.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/include/reactos/svc.h b/sdk/include/reactos/svc.h index b028f1a0bf5..009c2e77703 100644 --- a/sdk/include/reactos/svc.h +++ b/sdk/include/reactos/svc.h @@ -10,6 +10,20 @@ #ifndef __SVC_H #define __SVC_H +#ifndef __RPC_H__ +#include <rpc.h> +#endif + + +typedef RPC_STATUS +(CALLBACK *LPSTART_RPC_SERVER) ( + _In_ RPC_WSTR PipeName, + _In_ RPC_IF_HANDLE IfSpec); + +typedef RPC_STATUS +(CALLBACK *LPSTOP_RPC_SERVER) ( + _In_ RPC_IF_HANDLE IfSpec); + // // This is the callback that a hosted service can register for stop notification //

2 years, 11 months

[reactos] 01/01: [dhcpsvc][srvsvc][wkssvc] Servcies run by svchost must be shared process services

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69bd857e39795c577d351… commit 69bd857e39795c577d351e9c637c83eb1df74ec2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 16 17:59:41 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 16 17:59:41 2022 +0100 [dhcpsvc][srvsvc][wkssvc] Servcies run by svchost must be shared process services --- base/services/dhcpcsvc/dhcpcsvc.c | 2 +- base/services/srvsvc/srvsvc.c | 2 +- base/services/wkssvc/wkssvc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/services/dhcpcsvc/dhcpcsvc.c b/base/services/dhcpcsvc/dhcpcsvc.c index c9c9025ebc6..661a217e4cf 100644 --- a/base/services/dhcpcsvc/dhcpcsvc.c +++ b/base/services/dhcpcsvc/dhcpcsvc.c @@ -343,7 +343,7 @@ DhcpRosGetAdapterInfo(DWORD AdapterIndex, static VOID UpdateServiceStatus(DWORD dwState) { - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwServiceType = SERVICE_WIN32_SHARE_PROCESS; ServiceStatus.dwCurrentState = dwState; if (dwState == SERVICE_RUNNING) diff --git a/base/services/srvsvc/srvsvc.c b/base/services/srvsvc/srvsvc.c index 32d73ea89b4..14beadbdd41 100644 --- a/base/services/srvsvc/srvsvc.c +++ b/base/services/srvsvc/srvsvc.c @@ -45,7 +45,7 @@ DWORD dwServiceBits = 0; static VOID UpdateServiceStatus(DWORD dwState) { - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwServiceType = SERVICE_WIN32_SHARE_PROCESS; ServiceStatus.dwCurrentState = dwState; ServiceStatus.dwControlsAccepted = 0; ServiceStatus.dwWin32ExitCode = 0; diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c index 61472132fe1..dbb485f5a6e 100644 --- a/base/services/wkssvc/wkssvc.c +++ b/base/services/wkssvc/wkssvc.c @@ -46,7 +46,7 @@ ULONG LsaAuthenticationPackage = 0; static VOID UpdateServiceStatus(DWORD dwState) { - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwServiceType = SERVICE_WIN32_SHARE_PROCESS; ServiceStatus.dwCurrentState = dwState; ServiceStatus.dwControlsAccepted = 0; ServiceStatus.dwWin32ExitCode = 0;

2 years, 11 months

[reactos] 01/01: [NEWDEV] Disable NewFolder btn and Show browser title when selecting a directory (#4288)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5165179ad8c5c07c0c9a1… commit 5165179ad8c5c07c0c9a1afa88048eba3651fbde Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Jan 16 16:34:59 2022 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 16 17:34:59 2022 +0100 [NEWDEV] Disable NewFolder btn and Show browser title when selecting a directory (#4288) * [NEWDEV] Add browser title to rc files * [NEWDEV] Show browser title when selecting a directory * Update dll/win32/newdev/lang/pl-PL.rc Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com> * Update dll/win32/newdev/lang/bg-BG.rc Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> * Update dll/win32/newdev/wizard.c Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> * Update dll/win32/newdev/lang/pl-PL.rc Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com> * Update dll/win32/newdev/lang/pt-PT.rc Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> * Remove obvious comment * Add de-DE and ru-RU translations * Add French translation Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com> Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/newdev/lang/bg-BG.rc | 1 + dll/win32/newdev/lang/cs-CZ.rc | 1 + dll/win32/newdev/lang/de-DE.rc | 1 + dll/win32/newdev/lang/el-GR.rc | 1 + dll/win32/newdev/lang/en-US.rc | 1 + dll/win32/newdev/lang/es-ES.rc | 1 + dll/win32/newdev/lang/fr-FR.rc | 1 + dll/win32/newdev/lang/he-IL.rc | 1 + dll/win32/newdev/lang/hu-HU.rc | 1 + dll/win32/newdev/lang/id-ID.rc | 1 + dll/win32/newdev/lang/it-IT.rc | 1 + dll/win32/newdev/lang/ja-JP.rc | 1 + dll/win32/newdev/lang/nl-NL.rc | 1 + dll/win32/newdev/lang/no-NO.rc | 1 + dll/win32/newdev/lang/pl-PL.rc | 1 + dll/win32/newdev/lang/pt-PT.rc | 1 + dll/win32/newdev/lang/ro-RO.rc | 1 + dll/win32/newdev/lang/ru-RU.rc | 1 + dll/win32/newdev/lang/sk-SK.rc | 1 + dll/win32/newdev/lang/sq-AL.rc | 1 + dll/win32/newdev/lang/th-TH.rc | 1 + dll/win32/newdev/lang/tr-TR.rc | 1 + dll/win32/newdev/lang/uk-UA.rc | 1 + dll/win32/newdev/lang/zh-CN.rc | 1 + dll/win32/newdev/lang/zh-TW.rc | 1 + dll/win32/newdev/resource.h | 1 + dll/win32/newdev/wizard.c | 5 ++++- 27 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dll/win32/newdev/lang/bg-BG.rc b/dll/win32/newdev/lang/bg-BG.rc index bb09ef8321d..b1a1e6dee5a 100644 --- a/dll/win32/newdev/lang/bg-BG.rc +++ b/dll/win32/newdev/lang/bg-BG.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/cs-CZ.rc b/dll/win32/newdev/lang/cs-CZ.rc index a2b757f221a..7b41c2dd6cf 100644 --- a/dll/win32/newdev/lang/cs-CZ.rc +++ b/dll/win32/newdev/lang/cs-CZ.rc @@ -98,4 +98,5 @@ BEGIN IDS_CHSOURCE_TITLE "Zvolte možnosti vyhledávání a instalace" IDS_SEARCHDRV_TITLE "Hledání..." IDS_INSTALLDRV_TITLE "Instalace..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/de-DE.rc b/dll/win32/newdev/lang/de-DE.rc index aba3e533372..2ea8df0e84e 100644 --- a/dll/win32/newdev/lang/de-DE.rc +++ b/dll/win32/newdev/lang/de-DE.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Wählen Sie Such- und Installationsoptionen" IDS_SEARCHDRV_TITLE "Suche..." IDS_INSTALLDRV_TITLE "Installiere..." + IDS_BROWSE_FOR_FOLDER_TITLE "Wählen Sie den Ordner aus, der den korrekten Treiber für dieses Gerät enthält." END diff --git a/dll/win32/newdev/lang/el-GR.rc b/dll/win32/newdev/lang/el-GR.rc index a2669f84dd8..8dbdf5bf637 100644 --- a/dll/win32/newdev/lang/el-GR.rc +++ b/dll/win32/newdev/lang/el-GR.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/en-US.rc b/dll/win32/newdev/lang/en-US.rc index 64e3ec466a1..2641f498ac3 100644 --- a/dll/win32/newdev/lang/en-US.rc +++ b/dll/win32/newdev/lang/en-US.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/es-ES.rc b/dll/win32/newdev/lang/es-ES.rc index 5981412dcf5..fe529e15607 100644 --- a/dll/win32/newdev/lang/es-ES.rc +++ b/dll/win32/newdev/lang/es-ES.rc @@ -98,4 +98,5 @@ BEGIN IDS_CHSOURCE_TITLE "Elija las opciones de buscar e instalar" IDS_SEARCHDRV_TITLE "Buscando..." IDS_INSTALLDRV_TITLE "Instalando..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/fr-FR.rc b/dll/win32/newdev/lang/fr-FR.rc index e38edee1fce..6f01db54b8d 100644 --- a/dll/win32/newdev/lang/fr-FR.rc +++ b/dll/win32/newdev/lang/fr-FR.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Options de recherche et d'installation" IDS_SEARCHDRV_TITLE "Recherche..." IDS_INSTALLDRV_TITLE "Installation..." + IDS_BROWSE_FOR_FOLDER_TITLE "Veuillez sélectionner le dossier contenant les pilotes correspondant à ce matériel." END diff --git a/dll/win32/newdev/lang/he-IL.rc b/dll/win32/newdev/lang/he-IL.rc index 078f82db4a2..3abcb514305 100644 --- a/dll/win32/newdev/lang/he-IL.rc +++ b/dll/win32/newdev/lang/he-IL.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "בחר בין האפשרויות של חיפוש והתקנה" IDS_SEARCHDRV_TITLE "מחפש..." IDS_INSTALLDRV_TITLE "מתקין..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/hu-HU.rc b/dll/win32/newdev/lang/hu-HU.rc index 7731a6790e4..3322fba87dd 100644 --- a/dll/win32/newdev/lang/hu-HU.rc +++ b/dll/win32/newdev/lang/hu-HU.rc @@ -98,4 +98,5 @@ BEGIN IDS_CHSOURCE_TITLE "Keresési és telepítési beállítások kiválasztása" IDS_SEARCHDRV_TITLE "Keresés..." IDS_INSTALLDRV_TITLE "Telepítés..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/id-ID.rc b/dll/win32/newdev/lang/id-ID.rc index 7a1da2465ca..1214456ef7d 100644 --- a/dll/win32/newdev/lang/id-ID.rc +++ b/dll/win32/newdev/lang/id-ID.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Pilih cari dan pilihan pemasangan" IDS_SEARCHDRV_TITLE "Mencari..." IDS_INSTALLDRV_TITLE "Memasang..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/it-IT.rc b/dll/win32/newdev/lang/it-IT.rc index d7bc5854340..9d1581d0076 100644 --- a/dll/win32/newdev/lang/it-IT.rc +++ b/dll/win32/newdev/lang/it-IT.rc @@ -95,4 +95,5 @@ BEGIN IDS_CHSOURCE_TITLE "Opzioni Scegli, cerca e installa" IDS_SEARCHDRV_TITLE "Cercando....." IDS_INSTALLDRV_TITLE "Installando..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/ja-JP.rc b/dll/win32/newdev/lang/ja-JP.rc index 5557f7a7ec1..c165295844d 100644 --- a/dll/win32/newdev/lang/ja-JP.rc +++ b/dll/win32/newdev/lang/ja-JP.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/nl-NL.rc b/dll/win32/newdev/lang/nl-NL.rc index 52734aa8e41..98558858f5d 100644 --- a/dll/win32/newdev/lang/nl-NL.rc +++ b/dll/win32/newdev/lang/nl-NL.rc @@ -100,4 +100,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/no-NO.rc b/dll/win32/newdev/lang/no-NO.rc index 14de601019f..4d402e56154 100644 --- a/dll/win32/newdev/lang/no-NO.rc +++ b/dll/win32/newdev/lang/no-NO.rc @@ -95,4 +95,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/pl-PL.rc b/dll/win32/newdev/lang/pl-PL.rc index 55b9ebb0514..d205da4f3b7 100644 --- a/dll/win32/newdev/lang/pl-PL.rc +++ b/dll/win32/newdev/lang/pl-PL.rc @@ -101,4 +101,5 @@ BEGIN IDS_CHSOURCE_TITLE "Wybierz opcje wyszukiwania i instalacji" IDS_SEARCHDRV_TITLE "Szukanie..." IDS_INSTALLDRV_TITLE "Instalowanie..." + IDS_BROWSE_FOR_FOLDER_TITLE "Wybierz folder zawierający odpowiednie sterowniki dla tego sprzętu." END diff --git a/dll/win32/newdev/lang/pt-PT.rc b/dll/win32/newdev/lang/pt-PT.rc index 82c0c2104c3..c2671174126 100644 --- a/dll/win32/newdev/lang/pt-PT.rc +++ b/dll/win32/newdev/lang/pt-PT.rc @@ -98,4 +98,5 @@ BEGIN IDS_CHSOURCE_TITLE "Escolha as opções de pesquisa e instalação" IDS_SEARCHDRV_TITLE "A procurar..." IDS_INSTALLDRV_TITLE "A instalar..." + IDS_BROWSE_FOR_FOLDER_TITLE "Seleccione a pasta que contém controladores adequados para este hardware." END diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc index d9a612d2ec8..adee0696203 100644 --- a/dll/win32/newdev/lang/ro-RO.rc +++ b/dll/win32/newdev/lang/ro-RO.rc @@ -102,4 +102,5 @@ BEGIN IDS_CHSOURCE_TITLE "Alegere opțiuni de căutare și instalare" IDS_SEARCHDRV_TITLE "Căutare…" IDS_INSTALLDRV_TITLE "Instalare…" + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/ru-RU.rc b/dll/win32/newdev/lang/ru-RU.rc index 7ed91c3e63e..cab9096a7a5 100644 --- a/dll/win32/newdev/lang/ru-RU.rc +++ b/dll/win32/newdev/lang/ru-RU.rc @@ -93,4 +93,5 @@ BEGIN IDS_CHSOURCE_TITLE "Выберите настройки поиска и установки" IDS_SEARCHDRV_TITLE "Поиск..." IDS_INSTALLDRV_TITLE "Установка..." + IDS_BROWSE_FOR_FOLDER_TITLE "Выберите папку, содержащую подходящие драйверы для этого оборудования." END diff --git a/dll/win32/newdev/lang/sk-SK.rc b/dll/win32/newdev/lang/sk-SK.rc index d7b68583074..d6577f7c97a 100644 --- a/dll/win32/newdev/lang/sk-SK.rc +++ b/dll/win32/newdev/lang/sk-SK.rc @@ -98,4 +98,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/sq-AL.rc b/dll/win32/newdev/lang/sq-AL.rc index 6a07be29be2..d34b841348f 100644 --- a/dll/win32/newdev/lang/sq-AL.rc +++ b/dll/win32/newdev/lang/sq-AL.rc @@ -97,4 +97,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/th-TH.rc b/dll/win32/newdev/lang/th-TH.rc index 30deb12b9c3..7e17d292f63 100644 --- a/dll/win32/newdev/lang/th-TH.rc +++ b/dll/win32/newdev/lang/th-TH.rc @@ -95,4 +95,5 @@ BEGIN IDS_CHSOURCE_TITLE "Choose search and install options" IDS_SEARCHDRV_TITLE "Searching..." IDS_INSTALLDRV_TITLE "Installing..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/tr-TR.rc b/dll/win32/newdev/lang/tr-TR.rc index fc4746be80a..58f3ad46db1 100644 --- a/dll/win32/newdev/lang/tr-TR.rc +++ b/dll/win32/newdev/lang/tr-TR.rc @@ -95,4 +95,5 @@ BEGIN IDS_CHSOURCE_TITLE "Sürücü Arama ve Kurma Seçeneklerini Seç" IDS_SEARCHDRV_TITLE "Arıyor..." IDS_INSTALLDRV_TITLE "Kuruyor..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/uk-UA.rc b/dll/win32/newdev/lang/uk-UA.rc index 346e09a5b07..5c226d729a4 100644 --- a/dll/win32/newdev/lang/uk-UA.rc +++ b/dll/win32/newdev/lang/uk-UA.rc @@ -101,4 +101,5 @@ BEGIN IDS_CHSOURCE_TITLE "Виберіть налаштування пошуку" IDS_SEARCHDRV_TITLE "Пошук драйверів..." IDS_INSTALLDRV_TITLE "Встановлення драйверу..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/zh-CN.rc b/dll/win32/newdev/lang/zh-CN.rc index 0332e095c32..71252a6faf1 100644 --- a/dll/win32/newdev/lang/zh-CN.rc +++ b/dll/win32/newdev/lang/zh-CN.rc @@ -96,4 +96,5 @@ BEGIN IDS_CHSOURCE_TITLE "选择搜索和安装选项" IDS_SEARCHDRV_TITLE "正在搜索..." IDS_INSTALLDRV_TITLE "正在安装..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/lang/zh-TW.rc b/dll/win32/newdev/lang/zh-TW.rc index 219bbb8cf29..ea171ed8128 100644 --- a/dll/win32/newdev/lang/zh-TW.rc +++ b/dll/win32/newdev/lang/zh-TW.rc @@ -101,4 +101,5 @@ BEGIN IDS_CHSOURCE_TITLE "選擇搜尋和安裝選項" IDS_SEARCHDRV_TITLE "正在搜尋..." IDS_INSTALLDRV_TITLE "正在安裝..." + IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for this hardware." END diff --git a/dll/win32/newdev/resource.h b/dll/win32/newdev/resource.h index 119ee82713c..9555d8e75b0 100644 --- a/dll/win32/newdev/resource.h +++ b/dll/win32/newdev/resource.h @@ -34,3 +34,4 @@ #define IDS_CHSOURCE_TITLE 1002 #define IDS_SEARCHDRV_TITLE 1003 #define IDS_INSTALLDRV_TITLE 1004 +#define IDS_BROWSE_FOR_FOLDER_TITLE 1005 diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index 9f65e1bef47..533624607bb 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -641,9 +641,12 @@ CHSourceDlgProc( { BROWSEINFO bi = { 0 }; LPITEMIDLIST pidl; + WCHAR Title[MAX_PATH]; + LoadStringW(hDllInstance, IDS_BROWSE_FOR_FOLDER_TITLE, Title, _countof(Title)); bi.hwndOwner = hwndDlg; - bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS; + bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NONEWFOLDERBUTTON; + bi.lpszTitle = Title; pidl = SHBrowseForFolder(&bi); if (pidl) {

2 years, 11 months

[reactos] 01/01: [services] Add the secondary logon service

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=43fa9548d32a10967f9d5… commit 43fa9548d32a10967f9d53c73c1d4484c8927ee8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 16 17:02:01 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 16 17:02:01 2022 +0100 [services] Add the secondary logon service --- base/services/CMakeLists.txt | 1 + base/services/seclogon/CMakeLists.txt | 22 +++++ base/services/seclogon/precomp.h | 36 +++++++ base/services/seclogon/rpcserver.c | 80 +++++++++++++++ base/services/seclogon/seclogon.c | 181 ++++++++++++++++++++++++++++++++++ base/services/seclogon/seclogon.rc | 5 + base/services/seclogon/seclogon.spec | 2 + boot/bootdata/hivesft.inf | 2 +- boot/bootdata/hivesys.inf | 13 +++ 9 files changed, 341 insertions(+), 1 deletion(-) diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt index 98bae238acc..2a6f1fee768 100644 --- a/base/services/CMakeLists.txt +++ b/base/services/CMakeLists.txt @@ -9,6 +9,7 @@ add_subdirectory(netlogon) add_subdirectory(nfsd) add_subdirectory(rpcss) add_subdirectory(schedsvc) +add_subdirectory(seclogon) add_subdirectory(shsvcs) add_subdirectory(srvsvc) add_subdirectory(svchost) diff --git a/base/services/seclogon/CMakeLists.txt b/base/services/seclogon/CMakeLists.txt new file mode 100644 index 00000000000..8ab9611b965 --- /dev/null +++ b/base/services/seclogon/CMakeLists.txt @@ -0,0 +1,22 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/seclogon.idl) +spec2def(seclogon.dll seclogon.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + rpcserver.c + seclogon.c + precomp.h) + +add_library(seclogon MODULE + ${SOURCE} + seclogon.rc + ${CMAKE_CURRENT_BINARY_DIR}/seclogon_s.c + ${CMAKE_CURRENT_BINARY_DIR}/seclogon_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/seclogon.def) + +set_module_type(seclogon win32dll UNICODE) +target_link_libraries(seclogon wine ${PSEH_LIB}) +add_importlibs(seclogon advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_pch(seclogon precomp.h SOURCE) +add_cd_file(TARGET seclogon DESTINATION reactos/system32 FOR all) diff --git a/base/services/seclogon/precomp.h b/base/services/seclogon/precomp.h new file mode 100644 index 00000000000..b1475ec2ead --- /dev/null +++ b/base/services/seclogon/precomp.h @@ -0,0 +1,36 @@ +/* + * PROJECT: ReactOS Secondary Logon Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Secondary Logon service RPC server + * COPYRIGHT: Eric Kohl 2022 <eric.kohl(a)reactos.org> + */ + +#ifndef _SECLOGON_PCH_ +#define _SECLOGON_PCH_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <limits.h> +#include <stdarg.h> +#include <stdio.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> +#include <svc.h> + +#include <ndk/rtlfuncs.h> + +#include <wine/debug.h> + +extern HINSTANCE hDllInstance; +extern SVCHOST_GLOBALS *lpServiceGlobals; + +DWORD +StartRpcServer(VOID); + +DWORD +StopRpcServer(VOID); + +#endif /* _SECLOGON_PCH_ */ diff --git a/base/services/seclogon/rpcserver.c b/base/services/seclogon/rpcserver.c new file mode 100644 index 00000000000..991ea703f4a --- /dev/null +++ b/base/services/seclogon/rpcserver.c @@ -0,0 +1,80 @@ +/* + * PROJECT: ReactOS Secondary Logon Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Secondary Logon service RPC server + * COPYRIGHT: Eric Kohl 2022 <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include <seclogon_s.h> + +WINE_DEFAULT_DEBUG_CHANNEL(seclogon); + +/* FUNCTIONS *****************************************************************/ + + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +DWORD +StartRpcServer(VOID) +{ + ULONG Status; + + Status = ((LPSTART_RPC_SERVER)lpServiceGlobals->RpcpStartRpcServer)(L"seclogon", ISeclogon_v1_0_s_ifspec); + TRACE("RpcpStartRpcServer returned 0x%08lx\n", Status); + + return RtlNtStatusToDosError(Status); +} + + +DWORD +StopRpcServer(VOID) +{ + ULONG Status; + + Status = ((LPSTOP_RPC_SERVER)lpServiceGlobals->RpcpStopRpcServer)(ISeclogon_v1_0_s_ifspec); + TRACE("RpcpStopRpcServer returned 0x%08lx\n", Status); + + return RtlNtStatusToDosError(Status); +} + + +VOID +__stdcall +SeclCreateProcessWithLogonW( + _In_ handle_t hBinding, + _In_ SECL_REQUEST *pRequest, + _Out_ SECL_RESPONSE *pResponse) +{ + TRACE("SeclCreateProcessWithLogonW(%p %p %p)\n", hBinding, pRequest, pResponse); + + if (pRequest != NULL) + { + TRACE("Username: '%S'\n", pRequest->Username); + TRACE("Domain: '%S'\n", pRequest->Domain); + TRACE("Password: '%S'\n", pRequest->Password); + TRACE("ApplicationName: '%S'\n", pRequest->ApplicationName); + TRACE("CommandLine: '%S'\n", pRequest->CommandLine); + TRACE("CurrentDirectory: '%S'\n", pRequest->CurrentDirectory); + } + + /* FIXME: Logon */ + + /* FIXME: Create Process */ + + if (pResponse != NULL) + pResponse->ulError = 4; +} diff --git a/base/services/seclogon/seclogon.c b/base/services/seclogon/seclogon.c new file mode 100644 index 00000000000..afe90befb0e --- /dev/null +++ b/base/services/seclogon/seclogon.c @@ -0,0 +1,181 @@ +/* + * PROJECT: ReactOS Secondary Logon Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Secondary Logon service RPC server + * COPYRIGHT: Eric Kohl 2022 <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(seclogon); + + +/* GLOBALS ******************************************************************/ + +HINSTANCE hDllInstance; +SVCHOST_GLOBALS *lpServiceGlobals; + +static WCHAR ServiceName[] = L"seclogon"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + + +/* FUNCTIONS *****************************************************************/ + +static +VOID +UpdateServiceStatus( + _In_ DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_SHARE_PROCESS; + ServiceStatus.dwCurrentState = dwState; + + if (dwState == SERVICE_PAUSED || dwState == SERVICE_RUNNING) + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | + SERVICE_ACCEPT_SHUTDOWN | + SERVICE_ACCEPT_PAUSE_CONTINUE; + else + ServiceStatus.dwControlsAccepted = 0; + + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + + +static +DWORD +WINAPI +ServiceControlHandlerEx( + _In_ DWORD dwControl, + _In_ DWORD dwEventType, + _In_ LPVOID lpEventData, + _In_ LPVOID lpContext) +{ + TRACE("ServiceControlHandlerEx()\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + UpdateServiceStatus(SERVICE_STOP_PENDING); + StopRpcServer(); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSE_PENDING); + StopRpcServer(); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_CONTINUE_PENDING); + StartRpcServer(); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOP_PENDING); + StopRpcServer(); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n", dwControl); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +VOID +WINAPI +SvchostPushServiceGlobals( + _In_ SVCHOST_GLOBALS *lpGlobals) +{ + TRACE("SvchostPushServiceGlobals(%p)\n", lpGlobals); + lpServiceGlobals = lpGlobals; +} + + +VOID +WINAPI +SvcEntry_Seclogon( + _In_ INT ArgCount, + _In_ PWSTR *ArgVector) +{ + DWORD dwError; + + UNREFERENCED_PARAMETER(ArgCount); + UNREFERENCED_PARAMETER(ArgVector); + + TRACE("ServiceMain(%d %p)\n", ArgCount, ArgVector); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandlerEx, + NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = StartRpcServer(); + if (dwError != ERROR_SUCCESS) + { + ERR("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); +} + + +BOOL +WINAPI +DllMain( + _In_ HINSTANCE hinstDLL, + _In_ DWORD fdwReason, + _In_ PVOID pvReserved) +{ + UNREFERENCED_PARAMETER(pvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hDllInstance = hinstDLL; + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +/* EOF */ diff --git a/base/services/seclogon/seclogon.rc b/base/services/seclogon/seclogon.rc new file mode 100644 index 00000000000..d00d082ce61 --- /dev/null +++ b/base/services/seclogon/seclogon.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Secondary Logon Service Dll" +#define REACTOS_STR_INTERNAL_NAME "seclogon" +#define REACTOS_STR_ORIGINAL_FILENAME "seclogon.dll" +#include <reactos/version.rc> diff --git a/base/services/seclogon/seclogon.spec b/base/services/seclogon/seclogon.spec new file mode 100644 index 00000000000..738004676e2 --- /dev/null +++ b/base/services/seclogon/seclogon.spec @@ -0,0 +1,2 @@ +@ stdcall SvcEntry_Seclogon(long ptr) +@ stdcall SvchostPushServiceGlobals(ptr) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index aa4cdcf4f29..0d718f8984b 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1818,7 +1818,7 @@ HKLM,"SOFTWARE\Microsoft\Ole","EnableRemoteConnect",0x00000000,"N" ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"DcomLaunch","PlugPlay" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanserver","lanmanworkstation","Schedule","Themes","W32Time","winmgmt","wuauserv" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"BITS","DHCP","lanmanserver","lanmanworkstation","Schedule","seclogon","Themes","W32Time","winmgmt","wuauserv" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Svchost","NetworkService",0x00010000,"DnsCache" ; Win32 config diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 20838a451a4..bc10f421afd 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2055,6 +2055,19 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Type",0x00010001,0x00000020 HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\schedsvc.dll" HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceMain",0x00000000,"SchedServiceMain" +; Secondary Logon service +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Description",0x00000000,"Secondary Logon service" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","DisplayName",0x00000000,"Secondary Logon" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Group",0x00000000,"SchedulerGroup" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\seclogon.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\Seclogon\Parameters","ServiceMain",0x00000000,"SvcEntry_Seclogon" + ; Spooler service HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","Description",0x00000000,%SPOOLER_SERVICE_DESCRIPTION%

2 years, 11 months

[reactos] 01/01: [IDL] Add idl file for the secondary logon service

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c28db81193d5f80429d14… commit c28db81193d5f80429d14dd8b63f3cc034136fce Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 16 14:27:13 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 16 14:27:13 2022 +0100 [IDL] Add idl file for the secondary logon service --- sdk/include/reactos/idl/seclogon.acf | 6 +++++ sdk/include/reactos/idl/seclogon.idl | 47 ++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/sdk/include/reactos/idl/seclogon.acf b/sdk/include/reactos/idl/seclogon.acf new file mode 100644 index 00000000000..decd052ec0e --- /dev/null +++ b/sdk/include/reactos/idl/seclogon.acf @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface ISeclogon +{ +} diff --git a/sdk/include/reactos/idl/seclogon.idl b/sdk/include/reactos/idl/seclogon.idl new file mode 100644 index 00000000000..dd3392ae349 --- /dev/null +++ b/sdk/include/reactos/idl/seclogon.idl @@ -0,0 +1,47 @@ +/* + * Secondary Logon service interface definition + */ + +#include <ms-dtyp.idl> + +typedef struct _SECL_REQUEST +{ + [string] WCHAR *Username; + [string] WCHAR *Domain; + [string] WCHAR *Password; + [string] WCHAR *ApplicationName; + [string] WCHAR *CommandLine; + [string] WCHAR *CurrentDirectory; +} SECL_REQUEST, *PSECL_REQUEST; + +typedef struct _SECL_RESPONSE +{ + ULONG ulError; +} SECL_RESPONSE, *PSECL_RESPONSE; + +[ + uuid(12b81e99-f207-4a4c-85d3-77b42f76fd14), + version(1.0), + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\seclogon]") +] +interface ISeclogon +{ + /* Function 0 */ + void + __stdcall + SeclCreateProcessWithLogonW( + [in] handle_t hBinding, + [in, ref] SECL_REQUEST *pRequest, + [out, ref] SECL_RESPONSE *pResponse); + + /* Function 1 */ +/* + void + __stdcall + SeclCreateProcessWithLogonExW( + [in] handle_t hBinding, + [in, ref] SECL_REQUEST *pRequest, + [out, ref] SECL_RESPONSE *pResponse); +*/ +}

2 years, 11 months

[reactos] 01/01: [SYSDM] Update pl translation (#4289)

by Adam Stachowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54140ba23dd2fe0fecf40… commit 54140ba23dd2fe0fecf40284f4519d5c48f7c76d Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Sun Jan 16 12:58:41 2022 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 16 13:58:41 2022 +0100 [SYSDM] Update pl translation (#4289) Addendum to https://github.com/reactos/reactos/commit/ecfd01eefc430876a95cbaca595d2f2e6… and other --- dll/cpl/sysdm/lang/pl-PL.rc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 259f998d3ca..bef7fb5ec40 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -4,7 +4,7 @@ * https://sourceforge.net/projects/reactospl * Updated by Caemyr - Olaf Siejka (Jan, 2008) * UTF-8 conversion by Caemyr (May, 2011) - * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (April, 2014) + * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (January, 2022) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -290,7 +290,7 @@ END IDD_EDIT_VARIABLE DIALOGEX 10, 15, 372, 71 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION | WS_THICKFRAME | WS_VISIBLE -CAPTION "Edit Variable" +CAPTION "Edycja zmiennej" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN SCROLLBAR IDC_DIALOG_GRIP, 365, 64, 7, 7, SBS_SIZEGRIP @@ -300,8 +300,8 @@ BEGIN EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 289, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 260, 50, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 314, 50, 50, 14 - PUSHBUTTON "Browse &Directory...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 - PUSHBUTTON "Browse &Files...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 + PUSHBUTTON "Przeglą&daj katalog...", IDC_BUTTON_BROWSE_FOLDER, 6, 50, 75, 14 + PUSHBUTTON "&Przeglądaj plik...", IDC_BUTTON_BROWSE_FILE, 86, 50, 75, 14 END IDD_EDIT_VARIABLE_FANCY DIALOGEX 10, 15, 300, 250 @@ -312,13 +312,13 @@ BEGIN SCROLLBAR IDC_DIALOG_GRIP, 293, 243, 7, 7, SBS_SIZEGRIP CONTROL "", IDC_LIST_VARIABLE_VALUE, "SysListView32", LVS_NOCOLUMNHEADER | LVS_EDITLABELS | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_REPORT | WS_BORDER | WS_TABSTOP, 10, 10, 224, 208, WS_EX_CLIENTEDGE - PUSHBUTTON "&New", IDC_BUTTON_NEW, 242, 10, 50, 14 - PUSHBUTTON "&Edit", IDC_BUTTON_EDIT, 242, 30, 50, 14 - PUSHBUTTON "&Browse...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 - PUSHBUTTON "&Delete", IDC_BUTTON_DELETE, 242, 70, 50, 14 - PUSHBUTTON "Move &Up", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 - PUSHBUTTON "Move D&own", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 - PUSHBUTTON "Edit &text...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 + PUSHBUTTON "&Nowy", IDC_BUTTON_NEW, 242, 10, 50, 14 + PUSHBUTTON "&Edytuj", IDC_BUTTON_EDIT, 242, 30, 50, 14 + PUSHBUTTON "&Przeglądaj...", IDC_BUTTON_BROWSE_FOLDER, 242, 50, 50, 14 + PUSHBUTTON "&Usuń", IDC_BUTTON_DELETE, 242, 70, 50, 14 + PUSHBUTTON "P&rzenieś w górę", IDC_BUTTON_MOVE_UP, 242, 100, 50, 14 + PUSHBUTTON "P&rzenieś w dół", IDC_BUTTON_MOVE_DOWN, 242, 120, 50, 14 + PUSHBUTTON "Edy&tuj tekst...", IDC_BUTTON_EDIT_TEXT, 242, 150, 50, 14 DEFPUSHBUTTON "OK", IDOK, 188, 228, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 242, 228, 50, 14 END @@ -376,7 +376,7 @@ BEGIN IDS_HWPROFILE_ALREADY_IN_USE "Nazwa profilu jest już w użyciu." IDS_HWPROFILE_PROFILE "Profil" IDS_HWPROFILE_WARNING "Uwaga" - IDS_ENVIRONMENT_WARNING "Any changes that have been done will be discarded and the variable's value will be edited as text." - IDS_ENVIRONMENT_WARNING_TITLE "System Properties" - IDS_FILE_BROWSE_FILTER "All Files (*.*)\0*.*\0" + IDS_ENVIRONMENT_WARNING "Wszelkie zmiany, które zostały dokonane, zostaną odrzucone, a wartość zmiennej zostanie edytowana jako tekst." + IDS_ENVIRONMENT_WARNING_TITLE "Właściwości systemu" + IDS_FILE_BROWSE_FILTER "Wszystkie pliki (*.*)\0*.*\0" END

2 years, 11 months

[reactos] 01/01: [SYSDM] pt-PT.rc Fix compiler warning RC4206 CORE-17827

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf984cc9fe38a57a735aa… commit cf984cc9fe38a57a735aabf5ed6089f1fe4dbc28 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 16 12:06:26 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 16 12:06:26 2022 +0100 [SYSDM] pt-PT.rc Fix compiler warning RC4206 CORE-17827 Thanks to Twitter user @denzilferreira for that shortened string. --- dll/cpl/sysdm/lang/pt-PT.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/pt-PT.rc b/dll/cpl/sysdm/lang/pt-PT.rc index 88b7222da66..6ec4cd443f4 100644 --- a/dll/cpl/sysdm/lang/pt-PT.rc +++ b/dll/cpl/sysdm/lang/pt-PT.rc @@ -156,7 +156,7 @@ CAPTION "Perfis de utilizador" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Os perfis de utilizador contêm definições para o ambiente de trabalho e outras informações relacionadas ao inicio de sessão. Pode criar um perfil diferente em cada computador que utilizar, ou pode seleccionar o mesmo perfil guardado no servidor, em cada um dos computadores que utiliza.", IDC_STATIC, 40, 5, 211, 43 + LTEXT "Os perfis de utilizador contêm definições para o ambiente de trabalho e outras informações relacionadas ao início de sessão. Crie um perfil novo, ou restaure um perfil do servidor por cada computador.", IDC_STATIC, 40, 5, 211, 43 LTEXT "Perfis armazenados neste computador:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE

2 years, 11 months

[reactos] 01/01: [SYSDM] sq-AL.rc Fix compiler warning RC4206 CORE-17827

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bacc0479ce6779821760a… commit bacc0479ce6779821760aab7a6bc7665fc8daad9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Jan 16 10:13:40 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Jan 16 10:13:40 2022 +0100 [SYSDM] sq-AL.rc Fix compiler warning RC4206 CORE-17827 Thanks to Twitter users @illyrian598 and @jan_shkreli for that shortened string. --- dll/cpl/sysdm/lang/sq-AL.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 3e70ea1e83e..9126bda3707 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -152,7 +152,7 @@ CAPTION "Profili Përdoruesit" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON - LTEXT "Profilet e përdoruesve përmbajnë parametrat e desktop-it dhe informacione të tjera në lidhje me hyrjen tuaj. Një profil i ndryshëm mund të krijohet në çdo kompjuter që ju përdorni, ose ju mund të zgjidhni një profil kryesorë që është i njëjtë në çdo kompjuter që ju përdorni.", IDC_STATIC, 40, 11, 211, 35 //TOO LONG, MAX 256 CHARS ALLOWED + LTEXT "Profilet e përdoruesve përmbajnë parametrat e desktop-it dhe informacione të tjera në lidhje me hyrjen. Një profil i ndryshëm mund të krijohet në çdo kompjuter që ju përdorni. Zgjidhni një profil kryesor që është i njëjtë në çdo kompjuter në pëdorim.", IDC_STATIC, 40, 11, 211, 35 LTEXT "Profilet e ruajtura në këtë kompjuter:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE

2 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2022