Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/05: [ADVAPI32] Take into account the service handler context when dispatching a control notification to a service. (Used e.g. by tcpsvcs.)
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91b50f9ccb530e9544a22… commit 91b50f9ccb530e9544a224df0f0a3e5630441ab6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 18:53:05 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:36:57 2018 +0100 [ADVAPI32] Take into account the service handler context when dispatching a control notification to a service. (Used e.g. by tcpsvcs.) --- dll/win32/advapi32/service/scm.c | 2 +- dll/win32/advapi32/service/sctrl.c | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index ec1b84cb20..5a20508f69 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); +WINE_DEFAULT_DEBUG_CHANNEL(advapi_service); /* FUNCTIONS *****************************************************************/ diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index fe2469732f..5afa8dfc14 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); +WINE_DEFAULT_DEBUG_CHANNEL(advapi_service); /* TYPES *********************************************************************/ @@ -514,26 +514,31 @@ static DWORD ScControlService(PACTIVE_SERVICE lpService, PSCM_CONTROL_PACKET ControlPacket) { + DWORD dwError; + if (lpService == NULL || ControlPacket == NULL) return ERROR_INVALID_PARAMETER; - TRACE("ScControlService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + TRACE("ScControlService(Size: %lu, Service: '%S') called\n", + ControlPacket->dwSize, + (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); if (lpService->HandlerFunction) { (lpService->HandlerFunction)(ControlPacket->dwControl); + dwError = ERROR_SUCCESS; } else if (lpService->HandlerFunctionEx) { - /* FIXME: send correct params */ - (lpService->HandlerFunctionEx)(ControlPacket->dwControl, 0, NULL, NULL); + /* FIXME: Send correct 2nd and 3rd parameters */ + dwError = (lpService->HandlerFunctionEx)(ControlPacket->dwControl, + 0, NULL, + lpService->HandlerContext); } - TRACE("ScControlService() done\n"); + TRACE("ScControlService() done (error %lu)\n", dwError); - return ERROR_SUCCESS; + return dwError; }

1 0

01/05: [ADVAPI32] Use RPC types where needed. Comments cleanup.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=635aabb011949e6d9a8b1… commit 635aabb011949e6d9a8b1619ae1a5d5301860049 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 16:31:00 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 26 00:36:53 2018 +0100 [ADVAPI32] Use RPC types where needed. Comments cleanup. --- dll/win32/advapi32/service/eventlog.c | 74 +++++++++++++------------- dll/win32/advapi32/service/scm.c | 97 +++++++++++++---------------------- 2 files changed, 72 insertions(+), 99 deletions(-) diff --git a/dll/win32/advapi32/service/eventlog.c b/dll/win32/advapi32/service/eventlog.c index fcf1000405..d3afa467ce 100644 --- a/dll/win32/advapi32/service/eventlog.c +++ b/dll/win32/advapi32/service/eventlog.c @@ -4,7 +4,7 @@ * Copyright 1995 Sven Verdoolaege * Copyright 1998 Juergen Schmied * Copyright 2003 Mike Hearn - * Copyright 2007 Herv� Poussineau + * Copyright 2007 Hervé Poussineau * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,35 +40,35 @@ handle_t __RPC_USER EVENTLOG_HANDLE_A_bind(EVENTLOG_HANDLE_A UNCServerName) { handle_t hBinding = NULL; - UCHAR *pszStringBinding; - RPC_STATUS status; + RPC_CSTR pszStringBinding; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_A_bind() called\n"); - status = RpcStringBindingComposeA(NULL, - (UCHAR *)"ncacn_np", - (UCHAR *)UNCServerName, - (UCHAR *)"\\pipe\\EventLog", + Status = RpcStringBindingComposeA(NULL, + (RPC_CSTR)"ncacn_np", + (RPC_CSTR)UNCServerName, + (RPC_CSTR)"\\pipe\\EventLog", NULL, - (UCHAR **)&pszStringBinding); - if (status) + &pszStringBinding); + if (Status) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingA(pszStringBinding, + Status = RpcBindingFromStringBindingA(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeA(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeA(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -79,14 +79,14 @@ void __RPC_USER EVENTLOG_HANDLE_A_unbind(EVENTLOG_HANDLE_A UNCServerName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_A_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } @@ -95,35 +95,35 @@ handle_t __RPC_USER EVENTLOG_HANDLE_W_bind(EVENTLOG_HANDLE_W UNCServerName) { handle_t hBinding = NULL; - LPWSTR pszStringBinding; - RPC_STATUS status; + RPC_WSTR pszStringBinding; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_W_bind() called\n"); - status = RpcStringBindingComposeW(NULL, + Status = RpcStringBindingComposeW(NULL, L"ncacn_np", UNCServerName, L"\\pipe\\EventLog", NULL, &pszStringBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, + Status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeW(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeW(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -134,14 +134,14 @@ void __RPC_USER EVENTLOG_HANDLE_W_unbind(EVENTLOG_HANDLE_W UNCServerName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("EVENTLOG_HANDLE_W_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } @@ -1352,7 +1352,7 @@ ElfReportEventA(IN HANDLE hEventLog, NumStrings, DataSize, (PRPC_STRING)&ComputerName, - UserSID, + (PRPC_SID)UserSID, (PRPC_STRING*)Strings, Data, Flags, @@ -1491,7 +1491,7 @@ ElfReportEventW(IN HANDLE hEventLog, NumStrings, DataSize, (PRPC_UNICODE_STRING)&ComputerName, - UserSID, + (PRPC_SID)UserSID, (PRPC_UNICODE_STRING*)Strings, Data, Flags, diff --git a/dll/win32/advapi32/service/scm.c b/dll/win32/advapi32/service/scm.c index 42aec43f7c..ec1b84cb20 100644 --- a/dll/win32/advapi32/service/scm.c +++ b/dll/win32/advapi32/service/scm.c @@ -5,9 +5,6 @@ * PURPOSE: Service control manager functions * PROGRAMMER: Emanuele Aliberti * Eric Kohl - * UPDATE HISTORY: - * 19990413 EA created - * 19990515 EA */ /* INCLUDES ******************************************************************/ @@ -22,35 +19,35 @@ handle_t __RPC_USER SVCCTL_HANDLEA_bind(SVCCTL_HANDLEA szMachineName) { handle_t hBinding = NULL; - UCHAR *pszStringBinding; - RPC_STATUS status; + RPC_CSTR pszStringBinding; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEA_bind() called\n"); - status = RpcStringBindingComposeA(NULL, - (UCHAR *)"ncacn_np", - (UCHAR *)szMachineName, - (UCHAR *)"\\pipe\\ntsvcs", + Status = RpcStringBindingComposeA(NULL, + (RPC_CSTR)"ncacn_np", + (RPC_CSTR)szMachineName, + (RPC_CSTR)"\\pipe\\ntsvcs", NULL, - (UCHAR **)&pszStringBinding); - if (status != RPC_S_OK) + &pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingA(pszStringBinding, + Status = RpcBindingFromStringBindingA(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeA(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeA(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -61,14 +58,14 @@ void __RPC_USER SVCCTL_HANDLEA_unbind(SVCCTL_HANDLEA szMachineName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEA_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } @@ -77,35 +74,35 @@ handle_t __RPC_USER SVCCTL_HANDLEW_bind(SVCCTL_HANDLEW szMachineName) { handle_t hBinding = NULL; - LPWSTR pszStringBinding; - RPC_STATUS status; + RPC_WSTR pszStringBinding; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEW_bind() called\n"); - status = RpcStringBindingComposeW(NULL, + Status = RpcStringBindingComposeW(NULL, L"ncacn_np", szMachineName, L"\\pipe\\ntsvcs", NULL, &pszStringBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcStringBindingCompose returned 0x%x\n", status); + ERR("RpcStringBindingCompose returned 0x%x\n", Status); return NULL; } /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, + Status = RpcBindingFromStringBindingW(pszStringBinding, &hBinding); - if (status != RPC_S_OK) + if (Status != RPC_S_OK) { - ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + ERR("RpcBindingFromStringBinding returned 0x%x\n", Status); } - status = RpcStringFreeW(&pszStringBinding); - if (status != RPC_S_OK) + Status = RpcStringFreeW(&pszStringBinding); + if (Status != RPC_S_OK) { - ERR("RpcStringFree returned 0x%x\n", status); + ERR("RpcStringFree returned 0x%x\n", Status); } return hBinding; @@ -116,18 +113,19 @@ void __RPC_USER SVCCTL_HANDLEW_unbind(SVCCTL_HANDLEW szMachineName, handle_t hBinding) { - RPC_STATUS status; + RPC_STATUS Status; TRACE("SVCCTL_HANDLEW_unbind() called\n"); - status = RpcBindingFree(&hBinding); - if (status != RPC_S_OK) + Status = RpcBindingFree(&hBinding); + if (Status != RPC_S_OK) { - ERR("RpcBindingFree returned 0x%x\n", status); + ERR("RpcBindingFree returned 0x%x\n", Status); } } +/* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ DWORD ScmRpcStatusToWinError(RPC_STATUS Status) { @@ -332,7 +330,6 @@ ChangeServiceConfigA(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RChangeServiceConfigA((SC_RPC_HANDLE)hService, dwServiceType, dwStartType, @@ -417,7 +414,6 @@ ChangeServiceConfigW(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RChangeServiceConfigW((SC_RPC_HANDLE)hService, dwServiceType, dwStartType, @@ -469,7 +465,6 @@ CloseServiceHandle(SC_HANDLE hSCObject) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RCloseServiceHandle((LPSC_RPC_HANDLE)&hSCObject); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -508,7 +503,6 @@ ControlService(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RControlService((SC_RPC_HANDLE)hService, dwControl, lpServiceStatus); @@ -628,7 +622,6 @@ CreateServiceA(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RCreateServiceA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpServiceName, (LPSTR)lpDisplayName, @@ -727,7 +720,6 @@ CreateServiceW(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RCreateServiceW((SC_RPC_HANDLE)hSCManager, lpServiceName, lpDisplayName, @@ -776,7 +768,6 @@ DeleteService(SC_HANDLE hService) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RDeleteService((SC_RPC_HANDLE)hService); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1494,7 +1485,6 @@ GetServiceDisplayNameA(SC_HANDLE hSCManager, } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { - /* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ dwError = ScmRpcStatusToWinError(RpcExceptionCode()); } RpcEndExcept; @@ -1732,7 +1722,6 @@ LockServiceDatabase(SC_HANDLE hSCManager) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RLockServiceDatabase((SC_RPC_HANDLE)hSCManager, (SC_RPC_LOCK *)&hLock); } @@ -1801,7 +1790,6 @@ OpenSCManagerA(LPCSTR lpMachineName, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenSCManagerA((LPSTR)lpMachineName, (LPSTR)lpDatabaseName, dwDesiredAccess, @@ -1846,7 +1834,6 @@ OpenSCManagerW(LPCWSTR lpMachineName, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenSCManagerW((LPWSTR)lpMachineName, (LPWSTR)lpDatabaseName, dwDesiredAccess, @@ -1895,7 +1882,6 @@ OpenServiceA(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenServiceA((SC_RPC_HANDLE)hSCManager, (LPSTR)lpServiceName, dwDesiredAccess, @@ -1944,7 +1930,6 @@ OpenServiceW(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = ROpenServiceW((SC_RPC_HANDLE)hSCManager, (LPWSTR)lpServiceName, dwDesiredAccess, @@ -2002,7 +1987,6 @@ QueryServiceConfigA(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfigA((SC_RPC_HANDLE)hService, (LPBYTE)lpConfigPtr, dwBufferSize, @@ -2086,7 +2070,6 @@ QueryServiceConfigW(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfigW((SC_RPC_HANDLE)hService, (LPBYTE)lpConfigPtr, dwBufferSize, @@ -2190,7 +2173,6 @@ QueryServiceConfig2A(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2A((SC_RPC_HANDLE)hService, dwInfoLevel, lpTempBuffer, @@ -2308,7 +2290,6 @@ QueryServiceConfig2W(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceConfig2W((SC_RPC_HANDLE)hService, dwInfoLevel, lpTempBuffer, @@ -2404,7 +2385,6 @@ QueryServiceLockStatusA(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusA((SC_RPC_HANDLE)hSCManager, (LPBYTE)lpStatusPtr, dwBufferSize, @@ -2466,7 +2446,6 @@ QueryServiceLockStatusW(SC_HANDLE hSCManager, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusW((SC_RPC_HANDLE)hSCManager, (LPBYTE)lpStatusPtr, dwBufferSize, @@ -2516,7 +2495,6 @@ QueryServiceObjectSecurity(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceObjectSecurity((SC_RPC_HANDLE)hService, dwSecurityInformation, (LPBYTE)lpSecurityDescriptor, @@ -2583,7 +2561,6 @@ SetServiceObjectSecurity(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RSetServiceObjectSecurity((SC_RPC_HANDLE)hService, dwSecurityInformation, (LPBYTE)SelfRelativeSD, @@ -2630,7 +2607,6 @@ QueryServiceStatus(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceStatus((SC_RPC_HANDLE)hService, lpServiceStatus); } @@ -2682,7 +2658,6 @@ QueryServiceStatusEx(SC_HANDLE hService, RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RQueryServiceStatusEx((SC_RPC_HANDLE)hService, InfoLevel, lpBuffer, @@ -2790,7 +2765,6 @@ UnlockServiceDatabase(SC_LOCK ScLock) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RUnlockServiceDatabase((LPSC_RPC_LOCK)&ScLock); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -2827,7 +2801,6 @@ NotifyBootConfigStatus(BOOL BootAcceptable) RpcTryExcept { - /* Call to services.exe using RPC */ dwError = RNotifyBootConfigStatus(NULL, BootAcceptable); }

1 0

01/01: [TRANSLATION] Completed German translation in stobject (#401)
by Simon Dräger 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82720432eb345e850c0f5… commit 82720432eb345e850c0f5986c587f9e594dcc240 Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Sun Feb 25 23:36:05 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 23:36:05 2018 +0100 [TRANSLATION] Completed German translation in stobject (#401) --- dll/shellext/stobject/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/shellext/stobject/lang/de-DE.rc b/dll/shellext/stobject/lang/de-DE.rc index cdb3aa2d48..7d0657dcef 100644 --- a/dll/shellext/stobject/lang/de-DE.rc +++ b/dll/shellext/stobject/lang/de-DE.rc @@ -19,7 +19,7 @@ BEGIN IDS_PWR_METER "Batterieanzeige ö&ffnen" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" IDS_PWR_PERCENT_REMAINING "%.2f%% verbleibend" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_CHARGING "%.2f%% und wird geladen" IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" IDS_PWR_AC "Mit Wechselstrom" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! Stunden (%3!u!%%) verbleibend"

1 0

01/01: [TRANSLATION] Minor German grammatical improvements
by Simon Dräger 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff231236154d1ef35ed76… commit ff231236154d1ef35ed76ba23d08071a209acadd Author: Simon Dräger <20014538+C0nflict(a)users.noreply.github.com> AuthorDate: Sun Feb 25 15:21:35 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 17:26:43 2018 +0100 [TRANSLATION] Minor German grammatical improvements --- base/setup/reactos/lang/de-DE.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/setup/reactos/lang/de-DE.rc b/base/setup/reactos/lang/de-DE.rc index 7287cfed83..c8aaea7d4a 100644 --- a/base/setup/reactos/lang/de-DE.rc +++ b/base/setup/reactos/lang/de-DE.rc @@ -106,13 +106,13 @@ BEGIN LTEXT "Sie haben die erste Stufe des ReactOS-Setup erfolgreich abgeschlossen.", IDC_STATIC, 20, 50, 277, 10 LTEXT "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie sie. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Wenn eine CD im Laufwerk ist, entfernen Sie diese. Klicken Sie zum Neustart auf Beenden.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN IDS_TYPETITLE "Willkommen zum ReactOS-Setup" - IDS_TYPESUBTITLE "Wählen Sie einen Setuptyp." + IDS_TYPESUBTITLE "Wählen Sie einen Setuptypen." IDS_DEVICETITLE "Einstellen der Basisgeräte" IDS_DEVICESUBTITLE "Einstellungen der Anzeigegeräte und der Tastatur." IDS_DRIVETITLE "Richte Installationspartition und Systemverzeichnis ein"

1 0

01/01: [ADVAPI32_APITEST] Open services & SCM handles with correct access rights; improve a check order.
by Hermès Bélusca-Maïto 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f4a4b35e63ccd6a39d05… commit 5f4a4b35e63ccd6a39d054c29a44da3e6d8bea62 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 25 16:09:21 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 25 16:11:00 2018 +0100 [ADVAPI32_APITEST] Open services & SCM handles with correct access rights; improve a check order. --- .../rostests/apitests/advapi32/LockServiceDatabase.c | 2 +- modules/rostests/apitests/advapi32/ServiceArgs.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/advapi32/LockServiceDatabase.c b/modules/rostests/apitests/advapi32/LockServiceDatabase.c index 850cc4c70a..d52610a030 100644 --- a/modules/rostests/apitests/advapi32/LockServiceDatabase.c +++ b/modules/rostests/apitests/advapi32/LockServiceDatabase.c @@ -77,8 +77,8 @@ static void Test_LockUnlockServiceDatabase(void) SetLastError(0xdeadbeef); hLock = LockServiceDatabase(hScm); - ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); ok_err(ERROR_SUCCESS); + ok(hLock != NULL, "hLock = 0x%p, expected non-zero\n", hLock); /* Now unlock it */ if (hLock) diff --git a/modules/rostests/apitests/advapi32/ServiceArgs.c b/modules/rostests/apitests/advapi32/ServiceArgs.c index 18d9b82096..e50ca7bf9f 100644 --- a/modules/rostests/apitests/advapi32/ServiceArgs.c +++ b/modules/rostests/apitests/advapi32/ServiceArgs.c @@ -236,7 +236,7 @@ static SC_HANDLE register_service(PCWSTR extra_args) trace("service_cmd \"%ls\"\n", service_cmd); - service = CreateServiceW(scm_handle, service_nameW, service_nameW, GENERIC_ALL, + service = CreateServiceW(scm_handle, service_nameW, service_nameW, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_IGNORE, service_cmd, NULL, NULL, NULL, NULL, NULL); if (!service && GetLastError() == ERROR_ACCESS_DENIED) @@ -351,11 +351,11 @@ static void test_runner(BOOLEAN unicode, PCWSTR extra_args, int service_argc, vo thread = CreateThread(NULL, 0, pipe_thread, NULL, 0, NULL); ok(thread != NULL, "CreateThread failed: %lu\n", GetLastError()); if (!thread) - return; + goto Quit; service_handle = register_service(extra_args); if (!service_handle) - return; + goto Quit; //trace("starting...\n"); @@ -370,15 +370,20 @@ static void test_runner(BOOLEAN unicode, PCWSTR extra_args, int service_argc, vo CloseServiceHandle(service_handle); ok(WaitForSingleObject(thread, 10000) == WAIT_OBJECT_0, "Timeout waiting for thread\n"); - CloseHandle(thread); - CloseHandle(pipe_handle); + +Quit: + if (thread) + CloseHandle(thread); + + if (pipe_handle != INVALID_HANDLE_VALUE) + CloseHandle(pipe_handle); } START_TEST(ServiceArgs) { argc = winetest_get_mainargs(&argv); - scm_handle = OpenSCManagerW(NULL, NULL, GENERIC_ALL); + scm_handle = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(scm_handle != NULL, "OpenSCManager failed: %lu\n", GetLastError()); if (!scm_handle) {

1 0

01/01: [CONTRIBUTING] Update .gitmessage
by Alexander Shaposhnikov 25 Feb '18

25 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=509dd4e6452ff11addafb… commit 509dd4e6452ff11addafb65f2ae16704b507445b Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sun Feb 25 16:14:41 2018 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 25 16:14:41 2018 +0200 [CONTRIBUTING] Update .gitmessage The template is made more clear and specific. Added non-mandatory width hints. --- .gitmessage | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitmessage b/.gitmessage index f0b7ea10e1..75664741de 100644 --- a/.gitmessage +++ b/.gitmessage @@ -1,20 +1,22 @@ -# [MODULE] A short but descriptive summary (#pr-num) - -# A comprehensible description of WHY you did this work. +# Commit message example +# ---------------------- +# [MODULE] A short but descriptive summary (#pr-num) +# +# A comprehensible description of WHY you did this work. Do not limit +# yourself here. +# The width of the description is arbitary, but it is a good idea to +# wrap the text by 72 chars. +# # CORE-XXXX CIDXXXXX - +# ---------------------- # * [MODULE] should usually be the name of the CMake module, written # in all caps. -# -# * Summary should be imperative (not past tense), and not end with -# a period. -# -# * Description of commit should explain WHY a change was made. -# -# * JIRA, Coverity ID references should be placed at the bottom and -# preceded by the newline. -# -# * Pull request should always be referenced in the summary in parens -# unless it doesn't fit. In this case it should be placed after bug -# IDs if any. +# * Summary should be imperative (not past tense) and not end with a +# period. +# * Description of a commit should explain WHY a change was made. +# * JIRA, Coverity ID references should be placed at the bottom row. +# * There must be a newline between summary, description and bug IDs. +# * GitHub Pull Request ID should be referenced in the summary in +# parens. If the resulting summary is longer than 70 chars it may +# be placed last in the ID row to prevent hard wrapping on GitHub.

1 0

01/01: [SC] Support the paramchange and netbind* control codes in the control command
by Eric Kohl 25 Feb '18

25 Feb '18

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)

1 0

01/01: [SC][SERVICES] Support SERVICE_CONTROL_PARAMCHANGE and SERVICE_CONTROL_NETBIND* control codes
by Eric Kohl 25 Feb '18

25 Feb '18

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)) {

1 0

01/01: [CDFS_NEW] Sync with HEAD.
by Pierre Schweitzer 25 Feb '18

25 Feb '18

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

1 0

01/01: [BOOTDATA] Do not include caroots.inf in registry.inf. CORE-12020
by Thomas Faber 25 Feb '18

25 Feb '18

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs