Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 70422: [MKHIVE] Fix indentation. No code changes!
by ekohl＠svn.reactos.org 26 Dec '15

26 Dec '15

Author: ekohl Date: Sat Dec 26 01:34:49 2015 New Revision: 70422 URL: http://svn.reactos.org/svn/reactos?rev=70422&view=rev Log: [MKHIVE] Fix indentation. No code changes! Modified: trunk/reactos/tools/mkhive/cmi.c Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=704… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sat Dec 26 01:34:49 2015 @@ -150,7 +150,7 @@ CmiAddKeyToHashTable( IN PCMHIVE RegistryHive, IN OUT PCM_KEY_FAST_INDEX HashCell, - IN HCELL_INDEX HashCellIndex, + IN HCELL_INDEX HashCellIndex, IN PCM_KEY_NODE NewKeyCell, IN HCELL_INDEX NKBOffset) { @@ -181,7 +181,7 @@ HashCell->List[i].Cell = NKBOffset; HashCell->List[i].HashKey = HashKey; - HashCell->Count++; + HashCell->Count++; HvMarkCellDirty(&RegistryHive->Hive, HashCellIndex, FALSE); return STATUS_SUCCESS; }

1 0

[ekohl] 70421: [BOOTDATA] Add missing service groups.
by ekohl＠svn.reactos.org 26 Dec '15

26 Dec '15

Author: ekohl Date: Sat Dec 26 01:23:10 2015 New Revision: 70421 URL: http://svn.reactos.org/svn/reactos?rev=70421&view=rev Log: [BOOTDATA] Add missing service groups. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Dec 26 01:23:10 2015 @@ -1234,8 +1234,31 @@ "Boot Bus Extender", \ "System Bus Extender", \ "SCSI Miniport", \ + "Port", \ "Primary Disk", \ "SCSI Class", \ + "SCSI CDROM Class", \ + "FSFilter Infrastructure", \ + "FSFilter System", \ + "FSFilter Bottom", \ + "FSFilter Copy Protection", \ + "FSFilter Security Enhancer", \ + "FSFilter Open File", \ + "FSFilter Physical Quota Management", \ + "FSFilter Encryption", \ + "FSFilter Compression", \ + "FSFilter HSM", \ + "FSFilter Cluster File System", \ + "FSFilter System Recovery", \ + "FSFilter Quota Management", \ + "FSFilter Content Screener", \ + "FSFilter Continuous Backup", \ + "FSFilter Replication", \ + "FSFilter Anti-Virus", \ + "FSFilter Undelete", \ + "FSFilter Activity Monitor", \ + "FSFilter Top", \ + "Filter", \ "Boot File System", \ "Base", \ "Pointer Port", \ @@ -1247,16 +1270,29 @@ "Video", \ "Video Save", \ "File System", \ - "Event log", \ + "Event Log", \ + "Streams Drivers", \ + "NDIS Wrapper", \ "COM Infrastructure", \ + "UIGroup", \ + "LocalValidation", \ + "PlugPlay", \ + "PNP_TDI", \ "NDIS", \ - "PNP_TDI", \ "TDI", \ - "PlugPlay", \ + "NetBIOSGroup", \ + "ShellSvcGroup", \ "SchedulerGroup", \ "SpoolerGroup", \ - "UIGroup", \ - "Extended Base" + "AudioGroup", \ + "SmartCardGroup", \ + "NetworkProvider" \ + "RemoteValidation", \ + "NetDDEGroup", \ + "Parallel arbitrator", \ + "Extended Base" \ + "PCI Configuration", \ + "MS Transactions ; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 @@ -1409,7 +1445,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","DisplayName",0x00000000,"Event Logger" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Logs events or messages sent by the operating system in a database accessible via the event log viewer" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event log" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event Log" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000,"%SystemRoot%\system32\eventlog.exe" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Start",0x00010001,0x00000002

1 0

[ekohl] 70420: [ADVAPI32] - Implement AbortSystemShutdownW by a call to BaseAbortSystemShutdown. - Implement InitiateSystemShutdownW by a call to BaseInitiateSystemShutdown. - Implement InitiateSys...
by ekohl＠svn.reactos.org 26 Dec '15

26 Dec '15

Author: ekohl Date: Sat Dec 26 01:14:18 2015 New Revision: 70420 URL: http://svn.reactos.org/svn/reactos?rev=70420&view=rev Log: [ADVAPI32] - Implement AbortSystemShutdownW by a call to BaseAbortSystemShutdown. - Implement InitiateSystemShutdownW by a call to BaseInitiateSystemShutdown. - Implement InitiateSystemShutdownExW by a call to BaseInitiateSystemShutdownEx. - Add RPC binding code for the winreg server (in winlogon.exe). Added: trunk/reactos/dll/win32/advapi32/service/winreg.c (with props) Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/advapi32.h trunk/reactos/dll/win32/advapi32/misc/shutdown.c Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -14,7 +14,8 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl - ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) + ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl + ${REACTOS_SOURCE_DIR}/include/reactos/idl/winreg.idl) list(APPEND SOURCE misc/dllmain.c @@ -37,6 +38,7 @@ service/rpc.c service/scm.c service/sctrl.c + service/winreg.c token/token.c wine/cred.c wine/crypt.c @@ -52,7 +54,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/advapi32.def ${CMAKE_CURRENT_BINARY_DIR}/eventlogrpc_c.c ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c - ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) + ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c + ${CMAKE_CURRENT_BINARY_DIR}/winreg_c.c) set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/advapi32/advapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.h [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -35,6 +35,7 @@ #include <services/services.h> #include <svcctl_c.h> +#include <winreg_c.h> #include <wine/debug.h> #include <wine/unicode.h> Modified: trunk/reactos/dll/win32/advapi32/misc/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sh… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/shutdown.c [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -9,22 +9,7 @@ #include <advapi32.h> -#include <ndk/exfuncs.h> - WINE_DEFAULT_DEBUG_CHANNEL(advapi); - -/********************************************************************** - * AbortSystemShutdownW - * - * @unimplemented - */ -BOOL WINAPI -AbortSystemShutdownW(LPCWSTR lpMachineName) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /********************************************************************** * AbortSystemShutdownA @@ -53,28 +38,37 @@ return rv; } + /********************************************************************** - * InitiateSystemShutdownW + * AbortSystemShutdownW * * @implemented */ BOOL WINAPI -InitiateSystemShutdownW(LPWSTR lpMachineName, - LPWSTR lpMessage, - DWORD dwTimeout, - BOOL bForceAppsClosed, - BOOL bRebootAfterShutdown) -{ - return InitiateSystemShutdownExW(lpMachineName, - lpMessage, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown, - SHTDN_REASON_MAJOR_OTHER | - SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED - /* SHTDN_REASON_MAJOR_LEGACY_API */); -} +AbortSystemShutdownW(LPCWSTR lpMachineName) +{ + DWORD dwError; + + RpcTryExcept + { + dwError = BaseAbortSystemShutdown((PREGISTRY_SERVER_NAME)lpMachineName); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RtlNtStatusToDosError(RpcExceptionCode()); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + TRACE("BaseAbortSystemShutdown() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + /********************************************************************** * InitiateSystemShutdownA @@ -89,16 +83,167 @@ BOOL bForceAppsClosed, BOOL bRebootAfterShutdown) { - return InitiateSystemShutdownExA(lpMachineName, - lpMessage, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown, - SHTDN_REASON_MAJOR_OTHER | - SHTDN_REASON_MINOR_OTHER | - SHTDN_REASON_FLAG_PLANNED - /* SHTDN_REASON_MAJOR_LEGACY_API */); -} + ANSI_STRING MachineNameA, MessageA; + UNICODE_STRING MachineNameW, MessageW; + NTSTATUS Status; + BOOL res; + + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + + if (lpMachineName) + { + RtlInitAnsiString(&MachineNameA, lpMachineName); + Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); + if (STATUS_SUCCESS != Status) + { + if(MachineNameW.Buffer) + RtlFreeUnicodeString(&MachineNameW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + if (lpMessage) + { + RtlInitAnsiString(&MessageA, lpMessage); + Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); + if (STATUS_SUCCESS != Status) + { + if (MessageW.Buffer) + RtlFreeUnicodeString(&MessageW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + res = InitiateSystemShutdownW(MachineNameW.Buffer, + MessageW.Buffer, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown); + + /* Clear the values of both strings */ + if (lpMachineName) + RtlFreeUnicodeString(&MachineNameW); + + if (lpMessage) + RtlFreeUnicodeString(&MessageW); + + return res; +} + + +/********************************************************************** + * InitiateSystemShutdownW + * + * @implemented + */ +BOOL WINAPI +InitiateSystemShutdownW(LPWSTR lpMachineName, + LPWSTR lpMessage, + DWORD dwTimeout, + BOOL bForceAppsClosed, + BOOL bRebootAfterShutdown) +{ + UNICODE_STRING Message; + DWORD dwError; + + RtlInitUnicodeString(&Message, lpMessage); + + RpcTryExcept + { + dwError = BaseInitiateSystemShutdown((PREGISTRY_SERVER_NAME)lpMachineName, + (PRPC_UNICODE_STRING)&Message, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RtlNtStatusToDosError(RpcExceptionCode()); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + TRACE("BaseInitiateSystemShutdown() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + + +/****************************************************************************** + * InitiateSystemShutdownExA [ADVAPI32.@] + * + * see InitiateSystemShutdownExW + */ +BOOL WINAPI +InitiateSystemShutdownExA(LPSTR lpMachineName, + LPSTR lpMessage, + DWORD dwTimeout, + BOOL bForceAppsClosed, + BOOL bRebootAfterShutdown, + DWORD dwReason) +{ + ANSI_STRING MachineNameA, MessageA; + UNICODE_STRING MachineNameW, MessageW; + NTSTATUS Status; + BOOL res; + + MachineNameW.Buffer = NULL; + MessageW.Buffer = NULL; + + if (lpMachineName) + { + RtlInitAnsiString(&MachineNameA, lpMachineName); + Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); + if (STATUS_SUCCESS != Status) + { + if(MachineNameW.Buffer) + RtlFreeUnicodeString(&MachineNameW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + if (lpMessage) + { + RtlInitAnsiString(&MessageA, lpMessage); + Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); + if (STATUS_SUCCESS != Status) + { + if (MessageW.Buffer) + RtlFreeUnicodeString(&MessageW); + + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + } + + res = InitiateSystemShutdownExW(MachineNameW.Buffer, + MessageW.Buffer, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + dwReason); + + /* Clear the values of both strings */ + if (lpMachineName) + RtlFreeUnicodeString(&MachineNameW); + + if (lpMessage) + RtlFreeUnicodeString(&MessageW); + + return res; +} + /****************************************************************************** * InitiateSystemShutdownExW [ADVAPI32.@] @@ -113,109 +258,36 @@ BOOL bRebootAfterShutdown, DWORD dwReason) { - SHUTDOWN_ACTION action; - NTSTATUS Status; - ULONG Timeout_ms; - - DBG_UNREFERENCED_LOCAL_VARIABLE(Timeout_ms); - - /* Convert to milliseconds so we can use the value later on */ - Timeout_ms = dwTimeout * 1000; - - if (lpMachineName != NULL) - { - /* FIXME: Remote system shutdown not supported yet */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + UNICODE_STRING Message; + DWORD dwError; + + RtlInitUnicodeString(&Message, lpMessage); + + RpcTryExcept + { + dwError = BaseInitiateSystemShutdownEx((PREGISTRY_SERVER_NAME)lpMachineName, + (PRPC_UNICODE_STRING)&Message, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + dwReason); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = RpcExceptionCode(); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + TRACE("BaseInitiateSystemShutdownEx() failed (Error %lu)\n", dwError); + SetLastError(dwError); return FALSE; } - else /* The local system is being used */ - { - /* FIXME: Right now, only basic shutting down and rebooting - is supported */ - if(bRebootAfterShutdown == TRUE) - { - action = ShutdownReboot; - } - else - { - action = ShutdownNoReboot; - } - - Status = NtShutdownSystem(action); - } - - SetLastError(RtlNtStatusToDosError(Status)); - return (Status == STATUS_SUCCESS); -} - -/****************************************************************************** - * InitiateSystemShutdownExA [ADVAPI32.@] - * - * see InitiateSystemShutdownExW - */ -BOOL WINAPI -InitiateSystemShutdownExA(LPSTR lpMachineName, - LPSTR lpMessage, - DWORD dwTimeout, - BOOL bForceAppsClosed, - BOOL bRebootAfterShutdown, - DWORD dwReason) -{ - ANSI_STRING MachineNameA, MessageA; - UNICODE_STRING MachineNameW, MessageW; - NTSTATUS Status; - INT LastError; - BOOL rv; - - MachineNameW.Buffer = NULL; - MessageW.Buffer = NULL; - - if (lpMachineName) - { - RtlInitAnsiString(&MachineNameA, lpMachineName); - Status = RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); - if (STATUS_SUCCESS != Status) - { - if(MachineNameW.Buffer) - RtlFreeUnicodeString(&MachineNameW); - - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - if (lpMessage) - { - RtlInitAnsiString(&MessageA, lpMessage); - Status = RtlAnsiStringToUnicodeString(&MessageW, &MessageA, TRUE); - if (STATUS_SUCCESS != Status) - { - if (MessageW.Buffer) - RtlFreeUnicodeString(&MessageW); - - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - } - - rv = InitiateSystemShutdownExW(MachineNameW.Buffer, - MessageW.Buffer, - dwTimeout, - bForceAppsClosed, - bRebootAfterShutdown, - dwReason); - LastError = GetLastError(); - - /* Clear the values of both strings */ - if (lpMachineName) - RtlFreeUnicodeString(&MachineNameW); - - if (lpMessage) - RtlFreeUnicodeString(&MessageW); - - SetLastError(LastError); - return rv; -} + + return TRUE; +} + /****************************************************************************** * InitiateShutdownW [ADVAPI32.@] Added: trunk/reactos/dll/win32/advapi32/service/winreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/winreg.c (added) +++ trunk/reactos/dll/win32/advapi32/service/winreg.c [iso-8859-1] Sat Dec 26 01:14:18 2015 @@ -0,0 +1,72 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/advapi32/service/winreg.c + * PURPOSE: Remote registry functions + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include <advapi32.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + + +/* FUNCTIONS *****************************************************************/ + + +handle_t __RPC_USER +PREGISTRY_SERVER_NAME_bind(PREGISTRY_SERVER_NAME pszServerName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("PREGISTRY_SERVER_NAME_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszServerName, + L"\\pipe\\winreg", + NULL, + &pszStringBinding); + if (status != RPC_S_OK) + { + 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, + &hBinding); + if (status != RPC_S_OK) + { + ERR("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status != RPC_S_OK) + { + ERR("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +PREGISTRY_SERVER_NAME_unbind(PREGISTRY_SERVER_NAME pszServerName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("PREGISTRY_SERVER_NAME_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status != RPC_S_OK) + { + ERR("RpcBindingFree returned 0x%x\n", status); + } +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/advapi32/service/winreg.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 70419: [SHUTDOWN][WINLOGON] SHUTDOWN: Fix the hack be calling InitiateSystemShutdownExW instead of ExitWindowsEx. WINLOGON: Add a hack by calling ExitWindowsEx in BaseInitiateSystemShutdownEx.
by ekohl＠svn.reactos.org 26 Dec '15

26 Dec '15

Author: ekohl Date: Sat Dec 26 00:38:37 2015 New Revision: 70419 URL: http://svn.reactos.org/svn/reactos?rev=70419&view=rev Log: [SHUTDOWN][WINLOGON] SHUTDOWN: Fix the hack be calling InitiateSystemShutdownExW instead of ExitWindowsEx. WINLOGON: Add a hack by calling ExitWindowsEx in BaseInitiateSystemShutdownEx. Modified: trunk/reactos/base/applications/shutdown/shutdown.c trunk/reactos/base/system/winlogon/rpcserver.c Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c [iso-8859-1] Sat Dec 26 00:38:37 2015 @@ -342,20 +342,13 @@ return EXIT_SUCCESS; } - /** - ** HACK: When InitiateSystemShutdownExW will become really implemented, - ** activate this line and delete the other... - ** - if(!InitiateSystemShutdownExW(opts.remote_system, - opts.message, - opts.shutdown_delay, - opts.force, - opts.restart, - opts.reason)) - ***/ - if (!ExitWindowsEx((opts.shutdown ? EWX_SHUTDOWN : EWX_REBOOT) | - (opts.force ? EWX_FORCE : 0), - opts.reason)) + /* Initiate the shutdown */ + if (!InitiateSystemShutdownExW(opts.remote_system, + opts.message, + opts.shutdown_delay, + opts.force, + opts.restart, + opts.reason)) { /* * If there is an error, give the proper output depending Modified: trunk/reactos/base/system/winlogon/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rpcse… ============================================================================== --- trunk/reactos/base/system/winlogon/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/rpcserver.c [iso-8859-1] Sat Dec 26 00:38:37 2015 @@ -21,7 +21,7 @@ { RPC_STATUS Status; - TRACE("ScmStartRpcServer() called\n"); + TRACE("StartRpcServer() called\n"); Status = RpcServerUseProtseqEpW(L"ncacn_np", 10, @@ -415,7 +415,12 @@ BOOLEAN bRebootAfterShutdown) { TRACE("BaseInitiateSystemShutdown()\n"); - return ERROR_SUCCESS; + return BaseInitiateSystemShutdownEx(ServerName, + lpMessage, + dwTimeout, + bForceAppsClosed, + bRebootAfterShutdown, + 0); } @@ -425,7 +430,7 @@ BaseAbortSystemShutdown( PREGISTRY_SERVER_NAME ServerName) { - TRACE("\n"); + TRACE("BaseAbortSystemShutdown()\n"); return ERROR_SUCCESS; } @@ -492,8 +497,19 @@ BOOLEAN bRebootAfterShutdown, ULONG dwReason) { - TRACE("\n"); - return ERROR_SUCCESS; + TRACE("BaseInitiateSystemShutdownEx()\n"); + TRACE(" Message: %wZ\n", lpMessage); + TRACE(" Timeout: %lu\n", dwTimeout); + TRACE(" Force: %d\n", bForceAppsClosed); + TRACE(" Reboot: %d\n", bRebootAfterShutdown); + TRACE(" Reason: %lu\n", dwReason); + +// return ERROR_SUCCESS; + + /* FIXME */ + return ExitWindowsEx((bRebootAfterShutdown ? EWX_REBOOT : EWX_SHUTDOWN) | + (bForceAppsClosed ? EWX_FORCE : 0), + dwReason); }

1 0

[hbelusca] 70418: [NTOS] Disable again the DR7 check until we correctly understand why bit 10 of DR7 (reserved) is almost always set (this lead to MSVC-built ReactOS crashing when being starting in...
by hbelusca＠svn.reactos.org 26 Dec '15

26 Dec '15

Author: hbelusca Date: Sat Dec 26 00:29:07 2015 New Revision: 70418 URL: http://svn.reactos.org/svn/reactos?rev=70418&view=rev Log: [NTOS] Disable again the DR7 check until we correctly understand why bit 10 of DR7 (reserved) is almost always set (this lead to MSVC-built ReactOS crashing when being starting in non-debugging mode). See also r69244. CORE-10165 #comment DR7 check again disabled in r70418. Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sat Dec 26 00:29:07 2015 @@ -177,7 +177,7 @@ CheckDr(1, Prcb->ProcessorState.SpecialRegisters.KernelDr1); CheckDr(2, Prcb->ProcessorState.SpecialRegisters.KernelDr2); CheckDr(3, Prcb->ProcessorState.SpecialRegisters.KernelDr3); - CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); + // CheckDr(7, Prcb->ProcessorState.SpecialRegisters.KernelDr7); // Disabled, see CORE-10165 for more details. } #endif

1 0

[hbelusca] 70417: [KDCOM] For MSVC builds (using KDCOM kd64 WinDbg protocol): Bail out for droppable packets after a given number of retries, if no debugger is attached (list of droppable packets c...
by hbelusca＠svn.reactos.org 25 Dec '15

25 Dec '15

Author: hbelusca Date: Fri Dec 25 18:43:16 2015 New Revision: 70417 URL: http://svn.reactos.org/svn/reactos?rev=70417&view=rev Log: [KDCOM] For MSVC builds (using KDCOM kd64 WinDbg protocol): Bail out for droppable packets after a given number of retries, if no debugger is attached (list of droppable packets can be found in http://articles.sysprogs.org/kdvmware/kdcom.shtml section "KDCOM protocol", subsection "Droppable packets"). CORE-10541 #resolve #comment Finally fixed in revision r70417! CORE-7106 Modified: trunk/reactos/drivers/base/kdcom/kddll.c Modified: trunk/reactos/drivers/base/kdcom/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.c [iso-8859-1] Fri Dec 25 18:43:16 2015 @@ -11,7 +11,7 @@ /* GLOBALS ********************************************************************/ ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; -ULONG RemotePacketId = INITIAL_PACKET_ID; +ULONG RemotePacketId = INITIAL_PACKET_ID; /* PRIVATE FUNCTIONS **********************************************************/ @@ -90,7 +90,7 @@ ULONG Checksum; /* Special handling for breakin packet */ - if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) { return KdpPollBreakIn(); } @@ -170,14 +170,14 @@ CurrentPacketId ^= 1; return KDP_PACKET_RECEIVED; } - /* That's not what we were waiting for, start over. */ + /* That's not what we were waiting for, start over */ continue; case PACKET_TYPE_KD_RESET: - KDDBGPRINT("KdReceivePacket - got a reset packet\n"); + KDDBGPRINT("KdReceivePacket - got PACKET_TYPE_KD_RESET\n"); + CurrentPacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); - CurrentPacketId = INITIAL_PACKET_ID; - RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -187,7 +187,8 @@ default: KDDBGPRINT("KdReceivePacket - got unknown control packet\n"); - return KDP_PACKET_RESEND; + /* We got an invalid packet, ignore it and start over */ + continue; } } @@ -218,7 +219,7 @@ /* Receive the message header data */ KdStatus = KdpReceiveBuffer(MessageHeader->Buffer, - MessageHeader->Length); + MessageHeader->Length); if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive data. Packet needs to be resent. */ @@ -277,7 +278,7 @@ if (Packet.Checksum != Checksum) { KDDBGPRINT("KdReceivePacket - wrong cheksum, got %x, calculated %x\n", - Packet.Checksum, Checksum); + Packet.Checksum, Checksum); KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); continue; } @@ -369,6 +370,7 @@ { /* Packet received, we can quit the loop */ CurrentPacketId &= ~SYNC_PACKET_ID; + Retries = KdContext->KdpDefaultRetries; break; } else if (KdStatus == KDP_PACKET_TIMEOUT) @@ -383,10 +385,36 @@ */ if (Retries == 0) { - if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + ULONG MessageId = *(PULONG)MessageHeader->Buffer; + switch (PacketType) { - return; + case PACKET_TYPE_KD_DEBUG_IO: + { + if (MessageId != DbgKdPrintStringApi) continue; + break; + } + + case PACKET_TYPE_KD_STATE_CHANGE32: + case PACKET_TYPE_KD_STATE_CHANGE64: + { + if (MessageId != DbgKdLoadSymbolsStateChange) continue; + break; + } + + case PACKET_TYPE_KD_FILE_IO: + { + if (MessageId != DbgKdCreateFileApi) continue; + break; + } } + + /* Reset debugger state */ + KD_DEBUGGER_NOT_PRESENT = TRUE; + SharedUserData->KdDebuggerEnabled &= ~0x00000002; + CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; + + return; } } // else (KdStatus == KDP_PACKET_RESEND) /* Resend the packet */

1 0

[tkreuzer] 70416: [NTOS/KDBK] Fix the value for EIP used by KDBG after an INT3 set by KDBG itself. The address is already fixed by KiDispatchException, but only in the context frame, not in the tra...
by tkreuzer＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: tkreuzer Date: Wed Dec 23 22:38:46 2015 New Revision: 70416 URL: http://svn.reactos.org/svn/reactos?rev=70416&view=rev Log: [NTOS/KDBK] Fix the value for EIP used by KDBG after an INT3 set by KDBG itself. The address is already fixed by KiDispatchException, but only in the context frame, not in the trap frame and KDBG insists to use the trap frame for a lot of things. Also, after a cont from such an int3, KDBG uses a single step to re-enable the breakpoint (it needs to disable it after it was hit to be able to execute the actual instruction), but it used to dismiss *any* single steps after that. So make sure, that an actual single step, as created by the debugger is not being dismissed, but the break point is still restored after the next single step entry. You might expect that a kernel debugger would at least support setting breakpoints, but this is KDBG. Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=70… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Wed Dec 23 22:38:46 2015 @@ -38,6 +38,7 @@ static PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */ static PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after a software breakpoint was hit, to reenable it */ +static BOOLEAN KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep; LONG KdbLastBreakPointNr = -1; /* Index of the breakpoint which cause KDB to be entered */ ULONG KdbNumSingleSteps = 0; /* How many single steps to do */ BOOLEAN KdbSingleStepOver = FALSE; /* Whether to step over calls/reps. */ @@ -1407,6 +1408,15 @@ KdbpPrint("Couldn't restore original instruction after INT3! Cannot continue execution.\n"); KeBugCheck(0); // FIXME: Proper bugcode! } + + /* Also since we are past the int3 now, decrement EIP in the + TrapFrame. This is only needed because KDBG insists on working + with the TrapFrame instead of with the Context, as it is supposed + to do. The context has already EIP point to the int3, since + KiDispatchException accounts for that. Whatever we do here with + the TrapFrame does not matter anyway, since KiDispatchException + will overwrite it with the values from the Context! */ + TrapFrame->Eip--; } if ((BreakPoint->Type == KdbBreakPointHardware) && @@ -1427,8 +1437,6 @@ /* Delete the temporary breakpoint which was used to step over or into the instruction. */ KdbpDeleteBreakPoint(-1, BreakPoint); - - TrapFrame->Eip--; if (--KdbNumSingleSteps > 0) { @@ -1520,8 +1528,14 @@ if (KdbNumSingleSteps == 0) Context->EFlags &= ~EFLAGS_TF; - goto continue_execution; /* return */ - } + if (!KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep) + { + goto continue_execution; /* return */ + } + } + + /* Quoth the raven, 'Nevermore!' */ + KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep = FALSE; /* Check if we expect a single step */ if ((TrapFrame->Dr6 & 0xf) == 0 && KdbNumSingleSteps > 0) @@ -1645,6 +1659,9 @@ /* Check if we should single step */ if (KdbNumSingleSteps > 0) { + /* Variable explains itself! */ + KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep = TRUE; + if ((KdbSingleStepOver && KdbpStepOverInstruction(KdbCurrentTrapFrame->Tf.Eip)) || (!KdbSingleStepOver && KdbpStepIntoInstruction(KdbCurrentTrapFrame->Tf.Eip))) {

1 0

[akhaldi] 70415: [0.4.0] * Apply the second part of the hackfix from CORE-9836 by Joachim Henze. Addendum to r70393.
by akhaldi＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: akhaldi Date: Wed Dec 23 18:13:34 2015 New Revision: 70415 URL: http://svn.reactos.org/svn/reactos?rev=70415&view=rev Log: [0.4.0] * Apply the second part of the hackfix from CORE-9836 by Joachim Henze. Addendum to r70393. Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Wed Dec 23 18:13:34 2015 @@ -1086,11 +1086,14 @@ goto leave; } + pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; + /* See if it was destroyed in the meantime */ if (UserObjectInDestroy(hOldCursor)) - hOldCursor = NULL; - pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; - UserDereferenceObject(pcurOld); + { + UserDereferenceObject(pcurOld); + pcurOld = NULL; + } } leave: Modified: branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/win32s… ============================================================================== --- branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Dec 23 18:13:34 2015 @@ -2280,8 +2280,12 @@ IntGetSysCursorInfo()->CurrentCursorObject = NULL; } - TRACE("DereferenceObject pCursor\n"); - UserDereferenceObject(pCursor); + if (pCursor && UserObjectInDestroy(UserHMGetHandle(pCursor))) + { + TRACE("DereferenceObject pCursor\n"); + UserDereferenceObject(pCursor); + pCursor = NULL; + } } if (gpqForeground == MessageQueue)

1 0

[gedmurphy] 70414: [FLTMGR] - Change the start type to demand. - Should stop free loader from throwing a tantrum because it can't load a non-existant boot driver
by gedmurphy＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: gedmurphy Date: Wed Dec 23 16:29:33 2015 New Revision: 70414 URL: http://svn.reactos.org/svn/reactos?rev=70414&view=rev Log: [FLTMGR] - Change the start type to demand. - Should stop free loader from throwing a tantrum because it can't load a non-existant boot driver Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Wed Dec 23 16:29:33 2015 @@ -1947,7 +1947,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ErrorControl",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","ImagePath",0x00020000,"system32\drivers\rosfltmgr.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\rosfltmgr","Type",0x00010001,0x00000002 ; ControlSet selection settings

1 0

[hbelusca] 70413: [XDK] Correctly fix the definition of DRIVER_FS_NOTIFICATION (done the same way as the other DRIVER_xxx "callback" functions; by the way you'll notice they are all NTAPI aka. __st...
by hbelusca＠svn.reactos.org 23 Dec '15

23 Dec '15

Author: hbelusca Date: Wed Dec 23 16:15:08 2015 New Revision: 70413 URL: http://svn.reactos.org/svn/reactos?rev=70413&view=rev Log: [XDK] Correctly fix the definition of DRIVER_FS_NOTIFICATION (done the same way as the other DRIVER_xxx "callback" functions; by the way you'll notice they are all NTAPI aka. __stdcall. This is not explicitely mentioned in the W(D)DK, because MS supposes you compile all your kernel-mode code in stdcall convention, the WDK environment coming with preset default compiler switches enabling that. But if you try changing them, you'll run into big troubles. In our headers on the contrary we explicitely mention the calling conventions). [FLTMGR] Fix FltpFsNotification to adhere to the correct DRIVER_FS_NOTIFICATION definition. Addendum to r70410. Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c trunk/reactos/include/xdk/iotypes.h Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Wed Dec 23 16:15:08 2015 @@ -66,6 +66,7 @@ DRIVER_FS_NOTIFICATION FltpFsNotification; VOID +NTAPI FltpFsNotification( _In_ PDEVICE_OBJECT DeviceObject, _In_ BOOLEAN FsActive @@ -586,6 +587,7 @@ DRIVER_FS_NOTIFICATION FltpFsNotification; VOID +NTAPI FltpFsNotification(_In_ PDEVICE_OBJECT DeviceObject, _In_ BOOLEAN FsActive) { Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Wed Dec 23 16:15:08 2015 @@ -6939,17 +6939,11 @@ #define IO_STOP_ON_SYMLINK 0x0008 #define IO_MM_PAGING_FILE 0x0010 -//typedef VOID -//( *PDRIVER_FS_NOTIFICATION) ( -// _In_ PDEVICE_OBJECT DeviceObject, -// _In_ BOOLEAN FsActive); - -typedef -VOID -DRIVER_FS_NOTIFICATION( - _In_ PDEVICE_OBJECT DeviceObject, - _In_ BOOLEAN FsActive -); +_Function_class_(DRIVER_FS_NOTIFICATION) +typedef VOID +(NTAPI DRIVER_FS_NOTIFICATION)( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ BOOLEAN FsActive); typedef DRIVER_FS_NOTIFICATION *PDRIVER_FS_NOTIFICATION; typedef enum _FS_FILTER_SECTION_SYNC_TYPE {

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