Ros-diffs February 2018

ros-diffs@reactos.org

24 participants
240 discussions

01/01: [SC] Support the paramchange and netbind* control codes in the control command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0d412b77a2818ba22927… commit a0d412b77a2818ba2292772c8e8410b2b90ce215 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 25 14:08:16 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 25 14:08:16 2018 +0100 [SC] Support the paramchange and netbind* control codes in the control command --- base/applications/sc/sc.c | 24 ++++++++++++++++++++---- base/applications/sc/usage.c | 8 ++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/base/applications/sc/sc.c b/base/applications/sc/sc.c index e2b75083e6..c6230c4801 100644 --- a/base/applications/sc/sc.c +++ b/base/applications/sc/sc.c @@ -157,19 +157,35 @@ ScControl(LPCTSTR Server, // remote machine name } else if (!lstrcmpi(Command, _T("control"))) { - INT CtlValue; + INT ControlCode = 0; if (ArgCount > 1) { ServiceName = *ServiceArgs++; ArgCount--; - CtlValue = _ttoi(ServiceArgs[0]); + if (!lstrcmpi(ServiceArgs[0], _T("paramchange"))) + ControlCode = SERVICE_CONTROL_PARAMCHANGE; + else if (!lstrcmpi(ServiceArgs[0], _T("netbindadd"))) + ControlCode = SERVICE_CONTROL_NETBINDADD; + else if (!lstrcmpi(ServiceArgs[0], _T("netbindremove"))) + ControlCode = SERVICE_CONTROL_NETBINDREMOVE; + else if (!lstrcmpi(ServiceArgs[0], _T("netbindenable"))) + ControlCode = SERVICE_CONTROL_NETBINDENABLE; + else if (!lstrcmpi(ServiceArgs[0], _T("netbinddisable"))) + ControlCode = SERVICE_CONTROL_NETBINDDISABLE; + else + { + ControlCode = _ttoi(ServiceArgs[0]); + if ((ControlCode < 128) && (ControlCode > 255)) + ControlCode = 0; + } + ServiceArgs++; ArgCount--; - if ((CtlValue >= 128) && (CtlValue <= 255)) - Control(CtlValue, + if (ControlCode != 0) + Control(ControlCode, ServiceName, ServiceArgs, ArgCount); diff --git a/base/applications/sc/usage.c b/base/applications/sc/usage.c index ec431f6856..b25aef8999 100644 --- a/base/applications/sc/usage.c +++ b/base/applications/sc/usage.c @@ -169,9 +169,13 @@ VOID CreateUsage(VOID) VOID ControlUsage(VOID) { _tprintf(_T("DESCRIPTION:\n") - _T(" Sends a CONTROL control request to a service.\n") + _T(" Sends a CONTROL code to a service.\n") _T("USAGE:\n") - _T(" sc <server> control [service name] <value>\n")); + _T(" sc <server> control [service name] <value>\n") + _T(" <value> = user-defined control code\n") + _T(" <value> = <paramchange|\n") + _T(" netbindadd|netbindremove|\n") + _T(" netbindenable|netbinddisable>\n")); } VOID SdShowUsage(VOID)

6 years, 10 months

01/01: [SC][SERVICES] Support SERVICE_CONTROL_PARAMCHANGE and SERVICE_CONTROL_NETBIND* control codes

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f0c54fcd3de17d31ac13… commit 9f0c54fcd3de17d31ac131c246b46e47088898d3 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 25 11:07:14 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 25 11:07:41 2018 +0100 [SC][SERVICES] Support SERVICE_CONTROL_PARAMCHANGE and SERVICE_CONTROL_NETBIND* control codes --- base/applications/sc/control.c | 16 ++++++++++------ base/system/services/rpcserver.c | 20 +++++++++++++++++++- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/base/applications/sc/control.c b/base/applications/sc/control.c index 5e5a4e84ac..b2c9d26d9c 100644 --- a/base/applications/sc/control.c +++ b/base/applications/sc/control.c @@ -44,10 +44,12 @@ Control(DWORD Control, break; case SERVICE_CONTROL_PAUSE: - dwDesiredAccess = SERVICE_PAUSE_CONTINUE; - break; - case SERVICE_CONTROL_CONTINUE: + case SERVICE_CONTROL_PARAMCHANGE: + case SERVICE_CONTROL_NETBINDADD: + case SERVICE_CONTROL_NETBINDREMOVE: + case SERVICE_CONTROL_NETBINDENABLE: + case SERVICE_CONTROL_NETBINDDISABLE: dwDesiredAccess = SERVICE_PAUSE_CONTINUE; break; @@ -55,10 +57,12 @@ Control(DWORD Control, dwDesiredAccess = SERVICE_INTERROGATE; break; - case SERVICE_CONTROL_SHUTDOWN: - dwDesiredAccess = 0; + default: + if (Control >= 128 && Control <= 255) + dwDesiredAccess = SERVICE_USER_DEFINED_CONTROL; + else + dwDesiredAccess = 0; break; - } hSCManager = OpenSCManager(NULL, diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index e022dff97c..43b953096b 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -1112,6 +1112,11 @@ RControlService( case SERVICE_CONTROL_PAUSE: case SERVICE_CONTROL_CONTINUE: + case SERVICE_CONTROL_PARAMCHANGE: + case SERVICE_CONTROL_NETBINDADD: + case SERVICE_CONTROL_NETBINDREMOVE: + case SERVICE_CONTROL_NETBINDENABLE: + case SERVICE_CONTROL_NETBINDDISABLE: DesiredAccess = SERVICE_PAUSE_CONTINUE; break; @@ -1226,6 +1231,19 @@ RControlService( if ((dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) == 0) return ERROR_INVALID_SERVICE_CONTROL; break; + + case SERVICE_CONTROL_PARAMCHANGE: + if ((dwControlsAccepted & SERVICE_ACCEPT_PARAMCHANGE) == 0) + return ERROR_INVALID_SERVICE_CONTROL; + break; + + case SERVICE_CONTROL_NETBINDADD: + case SERVICE_CONTROL_NETBINDREMOVE: + case SERVICE_CONTROL_NETBINDENABLE: + case SERVICE_CONTROL_NETBINDDISABLE: + if ((dwControlsAccepted & SERVICE_ACCEPT_NETBINDCHANGE) == 0) + return ERROR_INVALID_SERVICE_CONTROL; + break; } /* Send control code to the service */ @@ -1728,7 +1746,7 @@ RSetServiceStatus( /* Restore the previous service type */ lpService->Status.dwServiceType = dwPreviousType; - /* Handle a stopped service */ + /* Dereference a stopped service */ if ((lpServiceStatus->dwServiceType & SERVICE_WIN32) && (lpServiceStatus->dwCurrentState == SERVICE_STOPPED)) {

6 years, 10 months

01/01: [CDFS_NEW] Sync with HEAD.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1986049a380373cd3b527… commit 1986049a380373cd3b5279bc8489ea66363faf41 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Feb 25 10:13:15 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Feb 25 10:14:27 2018 +0100 [CDFS_NEW] Sync with HEAD. CORE-14315 --- drivers/filesystems/cdfs_new/resrcsup.c | 7 +------ media/doc/README.FSD | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs_new/resrcsup.c index 3bb38bb529..9b1d4ae83a 100755 --- a/drivers/filesystems/cdfs_new/resrcsup.c +++ b/drivers/filesystems/cdfs_new/resrcsup.c @@ -164,20 +164,15 @@ Return Value: { PAGED_CODE(); -#ifdef __REACTOS__ if (!ExAcquireResourceSharedLite( Fcb->Resource, Wait )) { + return FALSE; } -#endif NT_ASSERT(IoGetTopLevelIrp() == NULL); IoSetTopLevelIrp((PIRP)FSRTL_CACHE_TOP_LEVEL_IRP); -#ifndef __REACTOS__ - return ExAcquireResourceSharedLite( Fcb->Resource, Wait ); -#else return TRUE; -#endif } diff --git a/media/doc/README.FSD b/media/doc/README.FSD index 681a4a0fd5..8cb1f12970 100644 --- a/media/doc/README.FSD +++ b/media/doc/README.FSD @@ -19,4 +19,4 @@ reactos/drivers/filesystems/reiserfs # Synced to 0.26 The following FSD are shared with: https://github.com/Microsoft/Windows-driver-samples reactos/drivers/filesystems/fastfat_new # Synced to 2817004 -reactos/drivers/filesystems/cdfs_new # Synced to 2817004 +reactos/drivers/filesystems/cdfs_new # Synced to f73e552

6 years, 10 months

01/01: [BOOTDATA] Do not include caroots.inf in registry.inf. CORE-12020

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6158207c318bccaf1767d… commit 6158207c318bccaf1767d1a5c1545de45beb113d Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Feb 24 18:01:58 2018 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Feb 25 10:07:28 2018 +0100 [BOOTDATA] Do not include caroots.inf in registry.inf. CORE-12020 This splits registry.inf roughly in half, which massively reduces heap usage in 1st stage. DPH and low-memory scenarios benefit from this. --- boot/bootdata/CMakeLists.txt | 7 ++++++- boot/bootdata/txtsetup.sif | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt index 42dbfff18b..fd5696b46f 100644 --- a/boot/bootdata/CMakeLists.txt +++ b/boot/bootdata/CMakeLists.txt @@ -5,8 +5,13 @@ add_subdirectory(packages) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest) +add_custom_target(converted_caroots_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf) +add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf + COMMAND native-utf16le "${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf" "${CMAKE_CURRENT_BINARY_DIR}/caroots.inf" + DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf) +add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf DESTINATION reactos NO_CAB FOR all) + add_registry_inf( - caroots.inf hivecls.inf hivedef.inf hivesft.inf diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 7a86befd28..fc2aa63284 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -523,6 +523,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000048F = kbdeo.dll [HiveInfs.Install] +AddReg=caroots.inf,AddReg AddReg=registry.inf,AddReg ; EOF

6 years, 10 months

03/03: [SERVICES] Use safe-string routines in some places, and do not hardcode buffer lengths.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6d65fec691ea650789b1… commit c6d65fec691ea650789b1b2fa5eaf4b8e1d859c4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 00:48:43 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 00:50:01 2018 +0100 [SERVICES] Use safe-string routines in some places, and do not hardcode buffer lengths. --- base/system/services/database.c | 22 ++++++++------- base/system/services/rpcserver.c | 58 ++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 9ae8441b64..580dc0fd69 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -15,6 +15,7 @@ #include "services.h" #include <userenv.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -88,7 +89,8 @@ ScmCreateNewControlPipe(PSERVICE_IMAGE pServiceImage) } /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ - swprintf(szControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%lu", ServiceCurrent); + StringCchPrintfW(szControlPipeName, ARRAYSIZE(szControlPipeName), + L"\\\\.\\pipe\\net\\NtControlPipe%lu", ServiceCurrent); DPRINT("PipeName: %S\n", szControlPipeName); @@ -1861,7 +1863,8 @@ ScmLoadService(PSERVICE Service, if (Service->dwErrorControl != SERVICE_ERROR_IGNORE) { /* Log a failed service start */ - swprintf(szLogBuffer, L"%lu", dwError); + StringCchPrintfW(szLogBuffer, ARRAYSIZE(szLogBuffer), + L"%lu", dwError); lpLogStrings[0] = Service->lpServiceName; lpLogStrings[1] = szLogBuffer; ScmLogEvent(EVENT_SERVICE_START_FAILED, @@ -1990,19 +1993,21 @@ ScmAutoStartServices(VOID) CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); /* Build the safe boot path */ - wcscpy(szSafeBootServicePath, - L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot"); + StringCchCopyW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + L"SYSTEM\\CurrentControlSet\\Control\\SafeBoot"); switch (SafeBootEnabled) { /* NOTE: Assumes MINIMAL (1) and DSREPAIR (3) load same items */ case 1: case 3: - wcscat(szSafeBootServicePath, L"\\Minimal\\"); + StringCchCatW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + L"\\Minimal\\"); break; case 2: - wcscat(szSafeBootServicePath, L"\\Network\\"); + StringCchCatW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + L"\\Network\\"); break; } @@ -2019,9 +2024,8 @@ ScmAutoStartServices(VOID) RegCloseKey(hKey); /* Finish Safe Boot path off */ - wcsncat(szSafeBootServicePath, - CurrentService->lpServiceName, - MAX_PATH - wcslen(szSafeBootServicePath)); + StringCchCatW(szSafeBootServicePath, ARRAYSIZE(szSafeBootServicePath), + CurrentService->lpServiceName); /* Check that the key is in the Safe Boot path */ dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index 0a518d06ad..e022dff97c 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -13,6 +13,7 @@ #include "services.h" #include <winnls.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -1241,36 +1242,36 @@ RControlService( if (dwError == ERROR_SUCCESS) { - if (dwControl == SERVICE_CONTROL_STOP || - dwControl == SERVICE_CONTROL_PAUSE || - dwControl == SERVICE_CONTROL_CONTINUE) - { - /* Log a successful send control */ + if (dwControl == SERVICE_CONTROL_STOP || + dwControl == SERVICE_CONTROL_PAUSE || + dwControl == SERVICE_CONTROL_CONTINUE) + { + /* Log a successful send control */ - switch (dwControl) - { - case SERVICE_CONTROL_STOP: - uID = IDS_SERVICE_STOP; - break; + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + uID = IDS_SERVICE_STOP; + break; - case SERVICE_CONTROL_PAUSE: - uID = IDS_SERVICE_PAUSE; - break; + case SERVICE_CONTROL_PAUSE: + uID = IDS_SERVICE_PAUSE; + break; - case SERVICE_CONTROL_CONTINUE: - uID = IDS_SERVICE_RESUME; - break; - } - LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, 80); + case SERVICE_CONTROL_CONTINUE: + uID = IDS_SERVICE_RESUME; + break; + } + LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, ARRAYSIZE(szLogBuffer)); - lpLogStrings[0] = lpService->lpDisplayName; - lpLogStrings[1] = szLogBuffer; + lpLogStrings[0] = lpService->lpDisplayName; + lpLogStrings[1] = szLogBuffer; - ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, - EVENTLOG_INFORMATION_TYPE, - 2, - lpLogStrings); - } + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, + EVENTLOG_INFORMATION_TYPE, + 2, + lpLogStrings); + } } return dwError; @@ -1757,7 +1758,8 @@ RSetServiceStatus( (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS)) { /* Log a failed service stop */ - swprintf(szLogBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); + StringCchPrintfW(szLogBuffer, ARRAYSIZE(szLogBuffer), + L"%lu", lpServiceStatus->dwWin32ExitCode); lpLogStrings[0] = lpService->lpDisplayName; lpLogStrings[1] = szLogBuffer; @@ -1787,7 +1789,7 @@ RSetServiceStatus( break; } - LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, 80); + LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, ARRAYSIZE(szLogBuffer)); lpLogStrings[0] = lpService->lpDisplayName; lpLogStrings[1] = szLogBuffer; @@ -1797,8 +1799,6 @@ RSetServiceStatus( lpLogStrings); } - - DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); DPRINT("RSetServiceStatus() done\n");

6 years, 10 months

02/03: [SERVICES] Send services shutdown notifications only if they accept them.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aa359ec7f5cd7597d3d1… commit 1aa359ec7f5cd7597d3d138c7323dedac9774e41 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 00:31:17 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 00:49:58 2018 +0100 [SERVICES] Send services shutdown notifications only if they accept them. --- base/system/services/database.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index d28a98c082..9ae8441b64 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -2164,10 +2164,11 @@ ScmAutoShutdownServices(VOID) { CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); - if (CurrentService->Status.dwCurrentState == SERVICE_RUNNING || - CurrentService->Status.dwCurrentState == SERVICE_START_PENDING) + if ((CurrentService->Status.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN) && + (CurrentService->Status.dwCurrentState == SERVICE_RUNNING || + CurrentService->Status.dwCurrentState == SERVICE_START_PENDING)) { - /* shutdown service */ + /* Send the shutdown notification */ DPRINT("Shutdown service: %S\n", CurrentService->lpServiceName); ScmControlService(CurrentService->lpImage->hControlPipe, CurrentService->lpServiceName,

6 years, 10 months

01/03: [SERVICES] Add french translation.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c097b47404ef88f6522f… commit 6c097b47404ef88f6522f9242c4b5cb4b7964b5b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 00:06:27 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 00:49:55 2018 +0100 [SERVICES] Add french translation. --- base/system/services/lang/fr-FR.rc | 12 ++++++++++++ base/system/services/services.rc | 20 +++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/base/system/services/lang/fr-FR.rc b/base/system/services/lang/fr-FR.rc new file mode 100644 index 0000000000..8e5bdf78dd --- /dev/null +++ b/base/system/services/lang/fr-FR.rc @@ -0,0 +1,12 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SERVICE_START "démarrer" + IDS_SERVICE_STOP "arrêt" + IDS_SERVICE_PAUSE "pause" + IDS_SERVICE_RESUME "continuer" + IDS_SERVICE_RUNNING "En cours d'exécution" + IDS_SERVICE_STOPPED "Arrêté" + IDS_SERVICE_PAUSED "En pause" +END diff --git a/base/system/services/services.rc b/base/system/services/services.rc index 94f2f20c8f..71070cdf30 100644 --- a/base/system/services/services.rc +++ b/base/system/services/services.rc @@ -3,9 +3,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "Service Control Manager" -#define REACTOS_STR_INTERNAL_NAME "Services" -#define REACTOS_STR_ORIGINAL_FILENAME "Services.exe" +#define REACTOS_STR_FILE_DESCRIPTION "Service Control Manager" +#define REACTOS_STR_INTERNAL_NAME "services" +#define REACTOS_STR_ORIGINAL_FILENAME "services.exe" #include <reactos/version.rc> @@ -15,39 +15,33 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif - #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif - #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif - +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif - #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif - #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif - #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif - #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif - #ifdef LANGUAGE_ZH_CN #include "lang/zh-CN.rc" #endif - #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif \ No newline at end of file +#endif

6 years, 10 months

01/01: [TRANSLATION] German syntax fix.

by Simon Dräger

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd3b6d8c09facf7887381… commit fd3b6d8c09facf78873814a7271c329b0d741c31 Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Sat Feb 24 17:13:53 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 24 23:32:31 2018 +0100 [TRANSLATION] German syntax fix. It is rather unusual to put a "then" after "If..", so removed that. --- base/setup/reactos/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index f2528f61e3..7287cfed83 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -123,7 +123,7 @@ BEGIN IDS_RESTARTSUBTITLE "Die erste Stufe des Setup wurde abgeschlossen, starten Sie den Rechner neu, um mit der zweiten Stufe fortzufahren." IDS_SUMMARYTITLE "Installationszusammenfassung" IDS_SUMMARYSUBTITLE "Liste alle Installationseinstellungen vor Anwendung auf die Geräte auf" - IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?" + IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, müssen Sie das Setup nochmals ausführen, um ReactOS zu installieren. Wirklich beenden?" IDS_ABORTSETUP2 "Installation abbrechen?" IDS_NO_TXTSETUP_SIF "Die Datei 'txtsetup.sif' konnte nicht gefunden werden.\nSetup kann nicht fortfahren." IDS_CAPTION "ReactOS Setup"

6 years, 10 months

01/01: [BOOTDATA] Fix path to temp folder for the Swedish locale (#381)

by Harteex

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23a6b69c4d5156072a2a6… commit 23a6b69c4d5156072a2a6a99b8a089fe3c2261ac Author: Harteex <harteex(a)gmail.com> AuthorDate: Sat Feb 24 23:08:55 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Feb 24 23:08:55 2018 +0100 [BOOTDATA] Fix path to temp folder for the Swedish locale (#381) --- boot/bootdata/hivedef.inf | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index 07aad189c9..618635a7d7 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -2747,8 +2747,43 @@ TEMP_DIR="%USERPROFILE%\Local Settings\Temp" ; LANG_SWEDISH SUBLANG_NEUTRAL -;[Strings.001D] -;TEMP_DIR="%USERPROFILE%\..." +[Strings.001D] +POWERCFG_NAME_0="Home/Office Desk" +POWERCFG_DESC_0="This scheme is suited to most home or desktop computers that are left plugged in all the time." +POWERCFG_NAME_1="Portable/Laptop" +POWERCFG_DESC_1="This scheme is designed for extended battery life for portable computers on the road." +POWERCFG_NAME_2="Presentation" +POWERCFG_DESC_2="This scheme keeps the monitor on for doing presentations." +POWERCFG_NAME_3="Always On" +POWERCFG_DESC_3="This scheme keeps the computer running so that it can be accessed from the network. Use this scheme if you do not have network wakeup hardware." +POWERCFG_NAME_4="Minimal Power Management" +POWERCFG_DESC_4="This scheme keeps the computer on and optimizes it for high performance." +POWERCFG_NAME_5="Max Battery" +POWERCFG_DESC_5="This scheme is extremely aggressive for saving power." +DESKTOP_SCHEME_0="ReactOS Standard" +DESKTOP_SCHEME_1="Brick" +DESKTOP_SCHEME_2="Eggplant" +DESKTOP_SCHEME_3="Green Olive" +DESKTOP_SCHEME_4="High Contrast 1" +DESKTOP_SCHEME_5="High Contrast 2" +DESKTOP_SCHEME_6="High Contrast Black" +DESKTOP_SCHEME_7="High Contrast White" +DESKTOP_SCHEME_8="Lilac" +DESKTOP_SCHEME_9="Maple" +DESKTOP_SCHEME_10="Marine" +DESKTOP_SCHEME_11="Plum" +DESKTOP_SCHEME_12="Pumpkin" +DESKTOP_SCHEME_13="Rainy Day" +DESKTOP_SCHEME_14="ReactOS Classic" +DESKTOP_SCHEME_15="Rose" +DESKTOP_SCHEME_16="Sand" +DESKTOP_SCHEME_17="Sky" +DESKTOP_SCHEME_18="Slate" +DESKTOP_SCHEME_19="Storm" +DESKTOP_SCHEME_20="Teal" +DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_SIZE_0="Default size" +TEMP_DIR="%USERPROFILE%\Lokala inställningar\Temp" ; LANG_THAI SUBLANG_NEUTRAL

6 years, 10 months

01/01: [NTOSKRNL] Implement ThreadHideFromDebugger in NtSetInformationThread()

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62facb7a4976868f9356a… commit 62facb7a4976868f9356aaf03c224cfeac149a57 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 24 22:06:18 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 24 22:07:12 2018 +0100 [NTOSKRNL] Implement ThreadHideFromDebugger in NtSetInformationThread() --- ntoskrnl/ps/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index ad281e63c0..40a365a253 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -2420,6 +2420,19 @@ NtSetInformationThread(IN HANDLE ThreadHandle, } break; + case ThreadHideFromDebugger: + + /* Check buffer length */ + if (ThreadInformationLength != 0) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Set the flag */ + PspSetCrossThreadFlag(Thread, CT_HIDE_FROM_DEBUGGER_BIT); + break; + default: /* We don't implement it yet */ DPRINT1("Not implemented: %d\n", ThreadInformationClass);

6 years, 10 months

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 February 2018