Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 65819: [NETSHELL] Fix flags usage for LoadImage / CopyImage, that made network tray applet icons uglily being downscaled from 32px versions instead of their 16px counterparts.
by hbelusca＠svn.reactos.org 24 Dec '14

24 Dec '14

Author: hbelusca Date: Wed Dec 24 15:25:42 2014 New Revision: 65819 URL: http://svn.reactos.org/svn/reactos?rev=65819&view=rev Log: [NETSHELL] Fix flags usage for LoadImage / CopyImage, that made network tray applet icons uglily being downscaled from 32px versions instead of their 16px counterparts. Modified: trunk/reactos/dll/shellext/netshell/lanstatusui.cpp Modified: trunk/reactos/dll/shellext/netshell/lanstatusui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lans… ============================================================================== --- trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/lanstatusui.cpp [iso-8859-1] Wed Dec 24 15:25:42 2014 @@ -185,22 +185,22 @@ { if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) { - hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 32, 32, LR_SHARED); pContext->Status = 0; } else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1) { - hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 32, 32, LR_SHARED); pContext->Status = 1; } else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) { - hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 32, 32, LR_SHARED); pContext->Status = 2; } else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3) { - hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 32, 32, LR_SHARED); pContext->Status = 3; } } @@ -208,7 +208,7 @@ { if (pContext->Status != 4) { - hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_SHARED); pContext->Status = 4; } } @@ -216,7 +216,7 @@ { if (pContext->Status != 5) { - hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); + hIcon = (HICON)LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 32, 32, LR_SHARED); pContext->Status = 5; } } @@ -239,7 +239,7 @@ if (pProperties->dwCharacter & NCCF_SHOW_ICON) { if (hwndDlg) - nid.hIcon = (HICON)CopyImage(hIcon, IMAGE_ICON, 16, 16, 0); + nid.hIcon = (HICON)CopyImage(hIcon, IMAGE_ICON, 16, 16, LR_COPYFROMRESOURCE); else nid.hIcon = hIcon;

1 0

[jimtabor] 65818: - Fix, always something, thank you Thomas.
by jimtabor＠svn.reactos.org 24 Dec '14

24 Dec '14

Author: jimtabor Date: Wed Dec 24 00:18:03 2014 New Revision: 65818 URL: http://svn.reactos.org/svn/reactos?rev=65818&view=rev Log: - Fix, always something, thank you Thomas. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Dec 24 00:18:03 2014 @@ -732,7 +732,7 @@ return NULL; } - RtlZeroMemory(Message, sizeof(Message)); + RtlZeroMemory(Message, sizeof(*Message)); RtlMoveMemory(&Message->Msg, Msg, sizeof(MSG)); return Message;

1 0

[hbelusca] 65817: [WIN32K] Reintroduce CSR support for kernel mode, based on code from Ge that was wiped out in revision 58770, and by ntdll CSR code. Is needed for kernel to user-mode CSR callback...
by hbelusca＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: hbelusca Date: Tue Dec 23 21:17:24 2014 New Revision: 65817 URL: http://svn.reactos.org/svn/reactos?rev=65817&view=rev Log: [WIN32K] Reintroduce CSR support for kernel mode, based on code from Ge that was wiped out in revision 58770, and by ntdll CSR code. Is needed for kernel to user-mode CSR callbacks. For readers, I remind you the big callback picture in the Win32 subsystem: - In Windows NT 3.1 and 3.51, USER and GDI was modeled against client/server model (USER32.DLL and WINSRV.DLL, and GDI32.DLL and GDISRV.DLL), all running in user mode (using the CSR API). - Starting Windows NT 4.0 (and up), some USER and GDI parts were moved into kernel mode (in the WIN32K.SYS driver) to speedup communication. We get: * GDI32.DLL as the client, doing win32k system calls (kernel-mode system calls to win32k), * and USER32.DLL, WINSRV.DLL and WIN32K.SYS working in tandem, USER32.DLL being the client and {WINSRV.DLL, WIN32K.SYS} being the server. USER32.DLL can do win32k system calls or CSR calls to WINSRV.DLL (client to server calls). For server-to-server calls, we have WINSRV.DLL doing win32k system calls, or WIN32K.SYS doing CSR calls back to WINSRV.DLL . Also, there is the possibility for WIN32K.SYS to make user-mode callbacks to USER32.DLL. Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/csr.c trunk/reactos/win32ss/user/ntuser/csr.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -105,6 +105,7 @@ user/ntuser/caret.c user/ntuser/class.c user/ntuser/clipboard.c + user/ntuser/csr.c user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c Modified: trunk/reactos/win32ss/user/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.c [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -1,91 +1,201 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Interface to CSRSS / USERSRV + * PURPOSE: Interface between Win32k and USERSRV * FILE: subsystems/win32/win32k/ntuser/csr.c - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) + * PROGRAMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr), based on + * the original code by Ge van Geldorp (ge(a)gse.nl) and by + * the CSR code in NTDLL. */ #include <win32k.h> -static HANDLE WindowsApiPort = NULL; -// See gpepCSRSS in ntuser/ntuser.c and its initialization into NtUserInitialize() -PEPROCESS CsrProcess = NULL; - -NTSTATUS FASTCALL -CsrInit(void) +DBG_DEFAULT_CHANNEL(UserCsr); + +PEPROCESS gpepCSRSS = NULL; +PVOID CsrApiPort = NULL; + +VOID +InitCsrProcess(VOID /*IN PEPROCESS CsrProcess*/) +{ + /* Save the EPROCESS of CSRSS */ + gpepCSRSS = PsGetCurrentProcess(); + // gpepCSRSS = CsrProcess; + ObReferenceObject(gpepCSRSS); +} + +VOID +ResetCsrProcess(VOID) +{ + if (gpepCSRSS) + ObDereferenceObject(gpepCSRSS); + + gpepCSRSS = NULL; +} + +NTSTATUS +InitCsrApiPort(IN HANDLE CsrPortHandle) { NTSTATUS Status; - UNICODE_STRING PortName; - ULONG ConnectInfoLength; - SECURITY_QUALITY_OF_SERVICE Qos; - - RtlInitUnicodeString(&PortName, L"\\Windows\\ApiPort"); - ConnectInfoLength = 0; - Qos.Length = sizeof(Qos); - Qos.ImpersonationLevel = SecurityDelegation; - Qos.ContextTrackingMode = SECURITY_STATIC_TRACKING; - Qos.EffectiveOnly = FALSE; - - Status = ZwConnectPort(&WindowsApiPort, - &PortName, - &Qos, - NULL, - NULL, - NULL, - NULL, - &ConnectInfoLength); + + Status = ObReferenceObjectByHandle(CsrPortHandle, + 0, + /* * */LpcPortObjectType, // or NULL, + UserMode, + &CsrApiPort, + NULL); if (!NT_SUCCESS(Status)) { - return Status; - } - - CsrProcess = PsGetCurrentProcess(); - - return STATUS_SUCCESS; -} - -NTSTATUS FASTCALL -co_CsrNotify(PCSR_API_MESSAGE Request) -{ - NTSTATUS Status; - PEPROCESS OldProcess; - - if (NULL == CsrProcess) - { - return STATUS_INVALID_PORT_HANDLE; - } - - Request->Header.u2.ZeroInit = 0; - Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); - - /* Switch to the process in which the WindowsApiPort handle is valid */ - OldProcess = PsGetCurrentProcess(); - if (CsrProcess != OldProcess) - { - KeAttachProcess(&CsrProcess->Pcb); - } - - UserLeaveCo(); - - Status = ZwRequestWaitReplyPort(WindowsApiPort, - &Request->Header, - &Request->Header); - - UserEnterCo(); - - if (CsrProcess != OldProcess) - { - KeDetachProcess(); - } - - if (NT_SUCCESS(Status)) - { - Status = Request->Status; - } - - return Status; + CsrApiPort = NULL; + ERR("Failed to set CSR API Port.\n"); + } + + return Status; +} + +VOID +ResetCsrApiPort(VOID) +{ + if (CsrApiPort) + ObDereferenceObject(CsrApiPort); + + CsrApiPort = NULL; +} + +/* + * Function copied from ntdll/csr/connect.c::CsrClientCallServer + * and adapted for kernel-mode. + * + * NOTE: This is really a co_* function! + */ +NTSTATUS +NTAPI +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength) +{ + NTSTATUS Status; +#if 0 + ULONG PointerCount; + PULONG_PTR OffsetPointer; +#endif + + /* Do we have a connection to CSR yet? */ + if (!CsrApiPort) + return STATUS_INVALID_PORT_HANDLE; + + /* Fill out the Port Message Header */ + ApiMessage->Header.u2.ZeroInit = 0; + ApiMessage->Header.u1.s1.TotalLength = DataLength + + sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); // FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; + ApiMessage->Header.u1.s1.DataLength = DataLength + + FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header); // ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + + /* Fill out the CSR Header */ + ApiMessage->ApiNumber = ApiNumber; + ApiMessage->CsrCaptureData = NULL; + + TRACE("API: %lx, u1.s1.DataLength: %x, u1.s1.TotalLength: %x\n", + ApiNumber, + ApiMessage->Header.u1.s1.DataLength, + ApiMessage->Header.u1.s1.TotalLength); + +#if 0 + /* Check if we got a Capture Buffer */ + if (CaptureBuffer) + { + /* + * We have to convert from our local (client) view + * to the remote (server) view. + */ + ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) + ((ULONG_PTR)CaptureBuffer + CsrPortMemoryDelta); + + /* Lock the buffer. */ + CaptureBuffer->BufferEnd = NULL; + + /* + * Each client pointer inside the CSR message is converted into + * a server pointer, and each pointer to these message pointers + * is converted into an offset. + */ + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) + { + if (*OffsetPointer != 0) + { + *(PULONG_PTR)*OffsetPointer += CsrPortMemoryDelta; + *OffsetPointer -= (ULONG_PTR)ApiMessage; + } + ++OffsetPointer; + } + } +#endif + + UserLeaveCo(); + + /* Send the LPC Message */ + + // The wait logic below is subject to change in the future. One can + // imagine adding an external parameter to CsrClientCallServer, or write + // two versions of CsrClientCallServer, synchronous and asynchronous. + if (PsGetCurrentProcess() == gpepCSRSS) + { + Status = LpcRequestPort(CsrApiPort, + &ApiMessage->Header); + } + else + { + Status = LpcRequestWaitReplyPort(CsrApiPort, + &ApiMessage->Header, + &ApiMessage->Header); + } + + UserEnterCo(); + +#if 0 + /* Check if we got a Capture Buffer */ + if (CaptureBuffer) + { + /* + * We have to convert back from the remote (server) view + * to our local (client) view. + */ + ApiMessage->CsrCaptureData = (PCSR_CAPTURE_BUFFER) + ((ULONG_PTR)ApiMessage->CsrCaptureData - CsrPortMemoryDelta); + + /* + * Convert back the offsets into pointers to CSR message + * pointers, and convert back these message server pointers + * into client pointers. + */ + PointerCount = CaptureBuffer->PointerCount; + OffsetPointer = CaptureBuffer->PointerOffsetsArray; + while (PointerCount--) + { + if (*OffsetPointer != 0) + { + *OffsetPointer += (ULONG_PTR)ApiMessage; + *(PULONG_PTR)*OffsetPointer -= CsrPortMemoryDelta; + } + ++OffsetPointer; + } + } +#endif + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* We failed. Overwrite the return value with the failure. */ + ERR("LPC Failed: %lx\n", Status); + ApiMessage->Status = Status; + } + + /* Return the CSR Result */ + TRACE("Got back: 0x%lx\n", ApiMessage->Status); + return ApiMessage->Status; } /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/csr.h?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/csr.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/csr.h [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -1,16 +1,35 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Interface to CSRSS / USERSRV + * PURPOSE: Interface between Win32k and USERSRV * FILE: subsystems/win32/win32k/ntuser/csr.h - * PROGRAMER: Ge van Geldorp (ge(a)gse.nl) + * PROGRAMER: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr), based on + * the original code by Ge van Geldorp (ge(a)gse.nl) and by + * the CSR code in NTDLL. */ #pragma once -extern PEPROCESS CsrProcess; +/* NDK Headers */ +#include <ndk/lpcfuncs.h> -NTSTATUS FASTCALL CsrInit(void); -NTSTATUS FASTCALL co_CsrNotify(PCSR_API_MESSAGE Request); +/* CSRSS Header */ +#include <csr/csr.h> +#include <win/winmsg.h> + +extern PEPROCESS gpepCSRSS; +extern PVOID CsrApiPort; + +VOID InitCsrProcess(VOID /*IN PEPROCESS CsrProcess*/); +VOID ResetCsrProcess(VOID); +NTSTATUS InitCsrApiPort(IN HANDLE CsrPortHandle); +VOID ResetCsrApiPort(VOID); + +NTSTATUS +NTAPI +CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, + IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, + IN CSR_API_NUMBER ApiNumber, + IN ULONG DataLength); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -724,18 +724,30 @@ return Status; } + +VOID NTAPI +DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + // TODO: Do more cleanup! + + ResetCsrApiPort(); + ResetCsrProcess(); +} + #ifdef _M_IX86 C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE); #endif // Return on failure #define NT_ROF(x) \ +{ \ Status = (x); \ if (!NT_SUCCESS(Status)) \ { \ DPRINT1("Failed '%s' (0x%lx)\n", #x, Status); \ return Status; \ - } + } \ +} /* * This definition doesn't work @@ -744,8 +756,8 @@ NTSTATUS APIENTRY DriverEntry( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath) + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) { NTSTATUS Status; BOOLEAN Result; @@ -768,7 +780,9 @@ } hModuleWin = MmPageEntireDriver(DriverEntry); - DPRINT("Win32k hInstance 0x%p!\n",hModuleWin); + DPRINT("Win32k hInstance 0x%p!\n", hModuleWin); + + DriverObject->DriverUnload = DriverUnload; /* Register Object Manager Callbacks */ CalloutData.ProcessCallout = Win32kProcessCallback; Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -939,9 +939,13 @@ case UserThreadCsrApiPort: { ERR("Set CSR API Port for Win32k\n"); - STUB; - // Return success to make usersrv happy. - Status = STATUS_SUCCESS; + + if (ThreadInformationLength != sizeof(HANDLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + Status = InitCsrApiPort(*(PHANDLE)ThreadInformation); break; } Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -19,7 +19,6 @@ ATOM AtomFlashWndState; // Window Flash State atom. HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; -PEPROCESS gpepCSRSS = NULL; ATOM gaGuiConsoleWndClass; /* PRIVATE FUNCTIONS *********************************************************/ @@ -175,7 +174,7 @@ UserEnterExclusive(); /* Save the EPROCESS of CSRSS */ - gpepCSRSS = PsGetCurrentProcess(); + InitCsrProcess(/*PsGetCurrentProcess()*/); // Initialize Power Request List (use hPowerRequestEvent). // Initialize Media Change (use hMediaRequestEvent). Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -14,7 +14,6 @@ extern PPROCESSINFO gppiList; extern PPROCESSINFO ppiScrnSaver; extern PPROCESSINFO gppiInputProvider; -extern PEPROCESS gpepCSRSS; extern ATOM gaGuiConsoleWndClass; INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID); Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=6581… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Tue Dec 23 21:17:24 2014 @@ -26,7 +26,10 @@ #define DBG_ENABLE_EVENT_LOGGING 0 #define DBG_ENABLE_SERVICE_HOOKS 0 -/* Misc headers */ +/* CSRSS Interface */ +#include "user/ntuser/csr.h" + +/* Misc headers */ #include "user/ntuser/win32kdebug.h" #include "user/ntuser/mmcopy.h" #include "user/ntuser/tags.h"

1 0

[hbelusca] 65816: [NTDLL]: Whitespace fixes. No code changes.
by hbelusca＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: hbelusca Date: Tue Dec 23 20:35:42 2014 New Revision: 65816 URL: http://svn.reactos.org/svn/reactos?rev=65816&view=rev Log: [NTDLL]: Whitespace fixes. No code changes. Modified: trunk/reactos/dll/ntdll/csr/connect.c Modified: trunk/reactos/dll/ntdll/csr/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/connect.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/connect.c [iso-8859-1] Tue Dec 23 20:35:42 2014 @@ -325,7 +325,7 @@ return Status; } -#if 0 +#if 0 // // Structures can be padded at the end, causing the size of the entire structure // minus the size of the last field, not to be equal to the offset of the last @@ -355,7 +355,7 @@ /* * @implemented */ -NTSTATUS +NTSTATUS NTAPI CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage, IN OUT PCSR_CAPTURE_BUFFER CaptureBuffer OPTIONAL, @@ -371,7 +371,7 @@ ApiMessage->Header.u1.s1.TotalLength = DataLength + sizeof(CSR_API_MESSAGE) - sizeof(ApiMessage->Data); // FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength; ApiMessage->Header.u1.s1.DataLength = DataLength + - FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header);// ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); + FIELD_OFFSET(CSR_API_MESSAGE, Data) - sizeof(ApiMessage->Header); // ApiMessage->Header.u1.s1.TotalLength - sizeof(PORT_MESSAGE); /* Fill out the CSR Header */ ApiMessage->ApiNumber = ApiNumber; @@ -381,7 +381,7 @@ ApiNumber, ApiMessage->Header.u1.s1.DataLength, ApiMessage->Header.u1.s1.TotalLength); - + /* Check if we are already inside a CSR Server */ if (!InsideCsrProcess) {

1 0

[jimtabor] 65815: [NtUser] - Crash while in recursion through hook calls. Move fast calls to api. Placed safe guards for removing message queue structures. Lock threads while calling hooks. Just ad...
by jimtabor＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: jimtabor Date: Tue Dec 23 19:05:44 2014 New Revision: 65815 URL: http://svn.reactos.org/svn/reactos?rev=65815&view=rev Log: [NtUser] - Crash while in recursion through hook calls. Move fast calls to api. Placed safe guards for removing message queue structures. Lock threads while calling hooks. Just add paranoid code to prevent recursion freeing that will crash the kernel at some point. Fixes OpenMPT crashes, see CORE-8819. This might improve the same issues with CORE-6734. Modified: trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/hook.h trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Tue Dec 23 19:05:44 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window event handlers - * FILE: subsystems/win32/win32k/ntuser/event.c + * FILE: win32ss/user/ntuser/event.c * PROGRAMER: James Tabor (james.tabor(a)rectos.org) */ @@ -153,7 +153,7 @@ // Dispatch MsgQueue Event Call processor! // LRESULT -FASTCALL +APIENTRY co_EVENT_CallEvents( DWORD event, HWND hwnd, UINT_PTR idObject, Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Tue Dec 23 19:05:44 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window hooks - * FILE: subsystems/win32/win32k/ntuser/hook.c + * FILE: win32ss/user/ntuser/hook.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * James Tabor (james.tabor(a)rectos.org) * Rafal Harabien (rafalh(a)reactos.org) @@ -92,7 +92,7 @@ PLIST_ENTRY ListEntry; PPROCESSINFO ppiCsr; - ERR("IntHookModuleUnloaded: iHookID=%d\n", iHookID); + TRACE("IntHookModuleUnloaded: iHookID=%d\n", iHookID); ppiCsr = PsGetProcessWin32Process(gpepCSRSS); @@ -222,7 +222,7 @@ return FALSE; } - ERR("UserUnregisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess)); + TRACE("UserUnregisterUserApiHook. Server PID: %p\n", PsGetProcessId(pti->ppi->peProcess)); /* Unregister the api hook */ gpsi->dwSRVIFlags &= ~SRVINFO_APIHOOK; @@ -318,7 +318,7 @@ // Dispatch MsgQueue Hook Call processor! // LRESULT -FASTCALL +APIENTRY co_CallHook( INT HookId, INT Code, WPARAM wParam, @@ -335,14 +335,13 @@ { case WH_JOURNALPLAYBACK: case WH_JOURNALRECORD: - case WH_KEYBOARD: case WH_KEYBOARD_LL: case WH_MOUSE_LL: case WH_MOUSE: lParam = (LPARAM)pHP->pHookStructs; + case WH_KEYBOARD: break; } - /* The odds are high for this to be a Global call. */ Result = co_IntCallHookProc( HookId, Code, @@ -362,7 +361,7 @@ static LRESULT -FASTCALL +APIENTRY co_HOOK_CallHookNext( PHOOK Hook, INT Code, WPARAM wParam, @@ -516,7 +515,7 @@ static LRESULT -FASTCALL +APIENTRY co_UserCallNextHookEx(PHOOK Hook, int Code, WPARAM wParam, @@ -1080,7 +1079,7 @@ Win32k Kernel Space Hook Caller. */ LRESULT -FASTCALL +APIENTRY co_HOOK_CallHooks( INT HookId, INT Code, WPARAM wParam, @@ -1150,6 +1149,8 @@ } Hook = CONTAINING_RECORD(pLastHead->Flink, HOOK, Chain); + ObReferenceObject(pti->pEThread); + IntReferenceThreadInfo(pti); UserRefObjectCo(Hook, &Ref); ClientInfo = pti->pClientInfo; @@ -1199,6 +1200,8 @@ pti->sphkCurrent = SaveHook; Hook->phkNext = NULL; UserDerefObjectCo(Hook); + IntDereferenceThreadInfo(pti); + ObDereferenceObject(pti->pEThread); } if ( Global ) @@ -1224,7 +1227,6 @@ ERR("Invalid hook!\n"); continue; } - UserRefObjectCo(Hook, &Ref); /* Hook->Thread is null, we hax around this with Hook->head.pti. */ ptiHook = Hook->head.pti; @@ -1234,6 +1236,7 @@ TRACE("Next Hook %p, %p\n", ptiHook->rpdesk, pdo); continue; } + UserRefObjectCo(Hook, &Ref); if (ptiHook != pti ) { @@ -1251,7 +1254,9 @@ } else { /* Make the direct call. */ - TRACE("Local Hook calling to Thread! %d\n",HookId ); + TRACE("Global going Local Hook calling to Thread! %d\n",HookId ); + ObReferenceObject(pti->pEThread); + IntReferenceThreadInfo(pti); Result = co_IntCallHookProc( HookId, Code, wParam, @@ -1261,6 +1266,8 @@ Hook->offPfn, Hook->Ansi, &Hook->ModuleName); + IntDereferenceThreadInfo(pti); + ObDereferenceObject(pti->pEThread); } UserDerefObjectCo(Hook); } @@ -1434,7 +1441,7 @@ HookId == WH_MOUSE_LL || HookId == WH_SYSMSGFILTER) { - ERR("Local hook installing Global HookId: %d\n",HookId); + TRACE("Local hook installing Global HookId: %d\n",HookId); /* these can only be global */ EngSetLastError(ERROR_GLOBAL_ONLY_HOOK); RETURN( NULL); Modified: trunk/reactos/win32ss/user/ntuser/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.h [iso-8859-1] Tue Dec 23 19:05:44 2014 @@ -40,12 +40,12 @@ DWORD flags; } NOTIFYEVENT, *PNOTIFYEVENT; -LRESULT FASTCALL co_CallHook(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); -LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); -LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, UINT_PTR, LONG_PTR); +LRESULT APIENTRY co_CallHook(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); +LRESULT APIENTRY co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); +LRESULT APIENTRY co_EVENT_CallEvents(DWORD, HWND, UINT_PTR, LONG_PTR); PHOOK FASTCALL IntGetHookObject(HHOOK); PHOOK FASTCALL IntGetNextHook(PHOOK Hook); -LRESULT FASTCALL UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); +LRESULT APIENTRY UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); BOOL FASTCALL IntUnhookWindowsHook(int,HOOKPROC); BOOLEAN IntRemoveHook(PVOID Object); BOOLEAN IntRemoveEvent(PVOID Object); Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Tue Dec 23 19:05:44 2014 @@ -766,7 +766,7 @@ * WM_PAINT messages * WM_TIMER messages */ -BOOL FASTCALL +BOOL APIENTRY co_IntPeekMessage( PMSG Msg, PWND Window, UINT MsgFilterMin, @@ -952,7 +952,7 @@ return FALSE; } -BOOL FASTCALL +BOOL APIENTRY co_IntGetPeekMessage( PMSG pMsg, HWND hWnd, UINT MsgFilterMin, Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Tue Dec 23 19:05:44 2014 @@ -26,9 +26,9 @@ NTAPI MsqInitializeImpl(VOID) { - pgMessageLookasideList = ExAllocatePoolWithTag(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST), TAG_USRMSG); - if(!pgMessageLookasideList) - return STATUS_NO_MEMORY; + pgMessageLookasideList = ExAllocatePoolWithTag(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST), TAG_USRMSG); + if (!pgMessageLookasideList) + return STATUS_NO_MEMORY; ExInitializePagedLookasideList(pgMessageLookasideList, NULL, NULL, @@ -732,6 +732,7 @@ return NULL; } + RtlZeroMemory(Message, sizeof(Message)); RtlMoveMemory(&Message->Msg, Msg, sizeof(MSG)); return Message; @@ -740,6 +741,12 @@ VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message) { + if (Message->pti == NULL) + { + ERR("Double Free Message\n"); + return; + } + Message->pti = NULL; ExFreeToPagedLookasideList(pgMessageLookasideList, Message); } @@ -1141,7 +1148,6 @@ UserLeaveCo(); - /* Don't process messages sent to the thread */ WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, UserMode, FALSE, (uTimeout ? &Timeout : NULL), NULL); @@ -1306,7 +1312,7 @@ ERR("User APC Returned\n"); // Should not see this message. } - if (WaitStatus != STATUS_TIMEOUT) + if ( WaitStatus != STATUS_TIMEOUT ) { if (uResult) { @@ -1344,18 +1350,15 @@ if (dwQEvent) { ERR("Post Msg; System Qeued Event Message!\n"); - InsertHeadList(&pti->PostedMessagesListHead, - &Message->ListEntry); + InsertHeadList(&pti->PostedMessagesListHead, &Message->ListEntry); } else if (!HardwareMessage) { - InsertTailList(&pti->PostedMessagesListHead, - &Message->ListEntry); + InsertTailList(&pti->PostedMessagesListHead, &Message->ListEntry); } else { - InsertTailList(&MessageQueue->HardwareMessagesListHead, - &Message->ListEntry); + InsertTailList(&MessageQueue->HardwareMessagesListHead, &Message->ListEntry); } if (Msg->message == WM_HOTKEY) MessageBits |= QS_HOTKEY; // Justin Case, just set it. @@ -1669,6 +1672,7 @@ { /* Remove and ignore the message */ *RemoveMessages = TRUE; + TRACE("Remove and ignore the message\n"); RETURN(FALSE); } } @@ -1784,6 +1788,10 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) { EVENTMSG Event; + USER_REFERENCE_ENTRY Ref; + PWND pWnd; + BOOL Ret = TRUE; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if (Msg->message == WM_KEYDOWN || Msg->message == WM_SYSKEYDOWN || Msg->message == WM_KEYUP || Msg->message == WM_SYSKEYUP) @@ -1802,6 +1810,9 @@ } } + pWnd = ValidateHwndNoErr(Msg->hwnd); + if (pWnd) UserRefObjectCo(pWnd, &Ref); + Event.message = Msg->message; Event.hwnd = Msg->hwnd; Event.time = Msg->time; @@ -1810,8 +1821,33 @@ if (HIWORD(Msg->lParam) & 0x0100) Event.paramH |= 0x8000; co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&Event); + if (*RemoveMessages) + { + if ((Msg->message == WM_KEYDOWN) && + (Msg->hwnd != IntGetDesktopWindow())) + { + /* Handle F1 key by sending out WM_HELP message */ + if (Msg->wParam == VK_F1) + { + UserPostMessage( Msg->hwnd, WM_KEYF1, 0, 0 ); + } + else if (Msg->wParam >= VK_BROWSER_BACK && + Msg->wParam <= VK_LAUNCH_APP2) + { + /* FIXME: Process keystate */ + co_IntSendMessage(Msg->hwnd, WM_APPCOMMAND, (WPARAM)Msg->hwnd, MAKELPARAM(0, (FAPPCOMMAND_KEY | (Msg->wParam - VK_BROWSER_BACK + 1)))); + } + } + else if (Msg->message == WM_KEYUP) + { + /* Handle VK_APPS key by posting a WM_CONTEXTMENU message */ + if (Msg->wParam == VK_APPS && pti->MessageQueue->MenuOwner == NULL) + UserPostMessage( Msg->hwnd, WM_CONTEXTMENU, (WPARAM)Msg->hwnd, -1 ); + } + } + if (co_HOOK_CallHooks( WH_KEYBOARD, - *RemoveMessages ? HC_ACTION : HC_NOREMOVE, + *RemoveMessages ? HC_ACTION : HC_NOREMOVE, LOWORD(Msg->wParam), Msg->lParam)) { @@ -1820,10 +1856,15 @@ HCBT_KEYSKIPPED, LOWORD(Msg->wParam), Msg->lParam ); - ERR("KeyboardMessage WH_CBT Call Hook return!\n"); - return FALSE; - } - return TRUE; + + ERR("KeyboardMessage WH_KEYBOARD Call Hook return!\n"); + + *RemoveMessages = TRUE; + + Ret = FALSE; + } + if (pWnd) UserDerefObjectCo(pWnd); + return Ret; } BOOL co_IntProcessHardwareMessage(MSG* Msg, BOOL* RemoveMessages, UINT first, UINT last) @@ -1866,41 +1907,43 @@ IN UINT QSflags, OUT MSG* pMsg) { - - BOOL AcceptMessage; - PUSER_MESSAGE CurrentMessage; - PLIST_ENTRY ListHead, CurrentEntry = NULL; - MSG msg; - BOOL Ret = FALSE; - PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; - - if (!filter_contains_hw_range( MsgFilterLow, MsgFilterHigh )) return FALSE; - - ListHead = &MessageQueue->HardwareMessagesListHead; - CurrentEntry = ListHead->Flink; - - if (IsListEmpty(CurrentEntry)) return FALSE; - - if (!MessageQueue->ptiSysLock) - { - MessageQueue->ptiSysLock = pti; - pti->pcti->CTI_flags |= CTI_THREADSYSLOCK; - } - - if (MessageQueue->ptiSysLock != pti) - { - ERR("MsqPeekHardwareMessage: Thread Q is locked to another pti!\n"); - return FALSE; - } - - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, - ListEntry); - do - { - if (IsListEmpty(CurrentEntry)) break; - if (!CurrentMessage) break; - CurrentEntry = CurrentMessage->ListEntry.Flink; - if (!CurrentEntry) break; //// Fix CORE-6734 reported crash. + BOOL AcceptMessage; + PUSER_MESSAGE CurrentMessage; + PLIST_ENTRY ListHead; + MSG msg; + ULONG_PTR idSave; + DWORD QS_Flags; + BOOL Ret = FALSE; + PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; + + if (!filter_contains_hw_range( MsgFilterLow, MsgFilterHigh )) return FALSE; + + ListHead = MessageQueue->HardwareMessagesListHead.Flink; + + if (IsListEmpty(ListHead)) return FALSE; + + if (!MessageQueue->ptiSysLock) + { + MessageQueue->ptiSysLock = pti; + pti->pcti->CTI_flags |= CTI_THREADSYSLOCK; + } + + if (MessageQueue->ptiSysLock != pti) + { + ERR("MsqPeekHardwareMessage: Thread Q is locked to another pti!\n"); + return FALSE; + } + + while (ListHead != &MessageQueue->HardwareMessagesListHead) + { + CurrentMessage = CONTAINING_RECORD(ListHead, USER_MESSAGE, ListEntry); + ListHead = ListHead->Flink; + + if (MessageQueue->idSysPeek == (ULONG_PTR)CurrentMessage) + { + TRACE("Skip this message due to it is in play!\n"); + continue; + } /* MSDN: 1: any window that belongs to the current thread, and any messages on the current thread's message queue whose hwnd value is NULL. @@ -1913,33 +1956,40 @@ ( CurrentMessage->Msg.message == WM_MOUSEMOVE ) ) && // Null window for mouse moves. ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) - { - msg = CurrentMessage->Msg; - - UpdateKeyStateFromMsg(MessageQueue, &msg); - AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); - - if (Remove) - { - RemoveEntryList(&CurrentMessage->ListEntry); - ClearMsgBitsMask(pti, CurrentMessage->QS_Flags); - MsqDestroyMessage(CurrentMessage); - } - - if (AcceptMessage) - { - *pMsg = msg; - Ret = TRUE; - break; - } - } - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - } - while(CurrentEntry != ListHead); - - MessageQueue->ptiSysLock = NULL; - pti->pcti->CTI_flags &= ~CTI_THREADSYSLOCK; - return Ret; + { + idSave = MessageQueue->idSysPeek; + MessageQueue->idSysPeek = (ULONG_PTR)CurrentMessage; + + msg = CurrentMessage->Msg; + QS_Flags = CurrentMessage->QS_Flags; + + UpdateKeyStateFromMsg(MessageQueue, &msg); + AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); + + if (Remove) + { + if (CurrentMessage->pti != NULL) + { + RemoveEntryList(&CurrentMessage->ListEntry); + MsqDestroyMessage(CurrentMessage); + } + ClearMsgBitsMask(pti, QS_Flags); + } + + MessageQueue->idSysPeek = idSave; + + if (AcceptMessage) + { + *pMsg = msg; + Ret = TRUE; + break; + } + } + } + + MessageQueue->ptiSysLock = NULL; + pti->pcti->CTI_flags &= ~CTI_THREADSYSLOCK; + return Ret; } BOOLEAN APIENTRY @@ -1951,23 +2001,19 @@ IN UINT QSflags, OUT PMSG Message) { - PLIST_ENTRY CurrentEntry; PUSER_MESSAGE CurrentMessage; PLIST_ENTRY ListHead; + DWORD QS_Flags; BOOL Ret = FALSE; - CurrentEntry = pti->PostedMessagesListHead.Flink; - ListHead = &pti->PostedMessagesListHead; - - if (IsListEmpty(CurrentEntry)) return FALSE; - - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, - ListEntry); - do - { - if (IsListEmpty(CurrentEntry)) break; - if (!CurrentMessage) break; - CurrentEntry = CurrentEntry->Flink; + ListHead = pti->PostedMessagesListHead.Flink; + + if (IsListEmpty(ListHead)) return FALSE; + + while(ListHead != &pti->PostedMessagesListHead) + { + CurrentMessage = CONTAINING_RECORD(ListHead, USER_MESSAGE, ListEntry); + ListHead = ListHead->Flink; /* MSDN: 1: any window that belongs to the current thread, and any messages on the current thread's message queue whose hwnd value is NULL. @@ -1981,20 +2027,21 @@ ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { *Message = CurrentMessage->Msg; + QS_Flags = CurrentMessage->QS_Flags; if (Remove) { - RemoveEntryList(&CurrentMessage->ListEntry); - ClearMsgBitsMask(pti, CurrentMessage->QS_Flags); - MsqDestroyMessage(CurrentMessage); + if (CurrentMessage->pti != NULL) + { + RemoveEntryList(&CurrentMessage->ListEntry); + MsqDestroyMessage(CurrentMessage); + } + ClearMsgBitsMask(pti, QS_Flags); } Ret = TRUE; break; } - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, - ListEntry); - } - while (CurrentEntry != ListHead); + } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Tue Dec 23 19:05:44 2014 @@ -46,6 +46,8 @@ struct _DESKTOP *Desktop; PTHREADINFO ptiSysLock; + ULONG_PTR idSysLock; + ULONG_PTR idSysPeek; PTHREADINFO ptiMouse; PTHREADINFO ptiKeyboard; @@ -257,7 +259,7 @@ UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam); -BOOL FASTCALL +BOOL APIENTRY co_IntGetPeekMessage( PMSG pMsg, HWND hWnd, UINT MsgFilterMin,

1 0

[akhaldi] 65814: [KDVBOX] Properly handle the ASM source file.
by akhaldi＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: akhaldi Date: Tue Dec 23 19:01:02 2014 New Revision: 65814 URL: http://svn.reactos.org/svn/reactos?rev=65814&view=rev Log: [KDVBOX] Properly handle the ASM source file. Modified: trunk/reactos/drivers/base/kdvm/CMakeLists.txt Modified: trunk/reactos/drivers/base/kdvm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/CMakeLis… ============================================================================== --- trunk/reactos/drivers/base/kdvm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdvm/CMakeLists.txt [iso-8859-1] Tue Dec 23 19:01:02 2014 @@ -1,11 +1,12 @@ spec2def(kdvbox.dll kdvm.spec) +add_asm_files(kdvbox_asm kdvbox_asm.S) add_library(kdvbox SHARED kdvm.c kdvbox.c - kdvbox_asm.S kdvm.rc + ${kdvbox_asm} ${CMAKE_CURRENT_BINARY_DIR}/kdvbox.def) set_module_type(kdvbox module IMAGEBASE 0x00010000)

1 0

[tkreuzer] 65813: [KDVBOX] Implement a virtualkd compatible kernel debugger transport DLL. I started this, because I didn't manage to get the original one working, but it turned out, the original o...
by tkreuzer＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: tkreuzer Date: Tue Dec 23 17:48:16 2014 New Revision: 65813 URL: http://svn.reactos.org/svn/reactos?rev=65813&view=rev Log: [KDVBOX] Implement a virtualkd compatible kernel debugger transport DLL. I started this, because I didn't manage to get the original one working, but it turned out, the original one works, you only need to use the correct virtualkd version. Anyway, it's there now. A virtualkd version that works with VBox 4.3.16+ can be found here: http://forum.sysprogs.com/viewtopic.php?f=4&t=3370 or here: http://public.avast.com/~hnanicek/VirtualKd.zip The folder is called kdvm, since I thought about adding support for VMWare as well, but here the original one probably works as well. Also fix my email address in some files. Added: trunk/reactos/drivers/base/kdvm/ (with props) trunk/reactos/drivers/base/kdvm/CMakeLists.txt (with props) trunk/reactos/drivers/base/kdvm/kdvbox.c (with props) trunk/reactos/drivers/base/kdvm/kdvbox_asm.S (with props) trunk/reactos/drivers/base/kdvm/kdvm.c (with props) trunk/reactos/drivers/base/kdvm/kdvm.h (with props) trunk/reactos/drivers/base/kdvm/kdvm.rc (with props) trunk/reactos/drivers/base/kdvm/kdvm.spec (with props) Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/base/CMakeLists.txt trunk/reactos/drivers/base/kdcom/kdcom.c trunk/reactos/drivers/base/kdcom/kddll.c trunk/reactos/drivers/base/kdcom/kddll.h trunk/reactos/drivers/base/kdcom/kdserial.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -477,7 +477,13 @@ L"ReactOS_Debug", L"\"ReactOS (Debug)\"", L"Windows2003", ArcPath, L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); - +#ifdef _WINKD_ + /* ReactOS_VBoxDebug */ + CreateFreeLoaderEntry(IniCache, IniSection, + L"ReactOS_VBoxDebug", L"\"ReactOS (VBoxDebug)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=VBOX /SOS"); +#endif #if DBG #ifndef _WINKD_ /* ReactOS_KdSerial */ Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -30,6 +30,7 @@ class2.sys=,,,,,,x,,,,,,4 isapnp.sys=,,,,,,,,,,,,4 kdcom.dll=,,,,,,,,,,,,2 +kdvbox.dll=,,,,,,,,,,,,2 disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 i8042prt.sys=,,,,,,,,,,,,4 Modified: trunk/reactos/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/CMakeLists.tx… ============================================================================== --- trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/CMakeLists.txt [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -8,6 +8,7 @@ add_subdirectory(kdgdb) else() add_subdirectory(kdcom) + add_subdirectory(kdvm) endif() else() add_subdirectory(kdrosdbg) Modified: trunk/reactos/drivers/base/kdcom/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.c [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/base/kddll/kdcom.c * PURPOSE: COM port functions for the kernel debugger. - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ #include "kddll.h" 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] Tue Dec 23 17:48:16 2014 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/base/kddll/kddll.c * PURPOSE: Base functions for the kernel debugger. - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ #include "kddll.h" Modified: trunk/reactos/drivers/base/kdcom/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kddll.h [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/base/kddll/kddll.h * PURPOSE: Base definitions for the kernel debugger. - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ #ifndef _KDDLL_H_ Modified: trunk/reactos/drivers/base/kdcom/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/kdserial.c [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/base/kddll/kdserial.c * PURPOSE: Serial communication functions for the kernel debugger. - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ #include "kddll.h" Propchange: trunk/reactos/drivers/base/kdvm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Dec 23 17:48:16 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/base/kdvm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/base/kdvm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/base/kdvm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/base/kdvm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/CMakeLis… ============================================================================== --- trunk/reactos/drivers/base/kdvm/CMakeLists.txt (added) +++ trunk/reactos/drivers/base/kdvm/CMakeLists.txt [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,15 @@ + +spec2def(kdvbox.dll kdvm.spec) + +add_library(kdvbox SHARED + kdvm.c + kdvbox.c + kdvbox_asm.S + kdvm.rc + ${CMAKE_CURRENT_BINARY_DIR}/kdvbox.def) + +set_module_type(kdvbox module IMAGEBASE 0x00010000) +set_subsystem(kdvbox native) +add_importlibs(kdvbox ntoskrnl hal) +add_dependencies(kdvbox psdk bugcodes) +add_cd_file(TARGET kdvbox DESTINATION reactos/system32 NO_CAB FOR all) Propchange: trunk/reactos/drivers/base/kdvm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/kdvm/kdvbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvbox.c… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvbox.c (added) +++ trunk/reactos/drivers/base/kdvm/kdvbox.c [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,60 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kdvm/kdvbox.c + * PURPOSE: VBOX data exchange function for kdvbox + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include "kdvm.h" + +typedef struct +{ + ULONG SendSize; + ULONG BufferSize; +} KDVBOX_SEND_HEADER, *PKDVBOX_SEND_HEADER; + +typedef struct +{ + ULONG ReceivedDataSize; +} KDVBOX_RECEIVE_HEADER, *PKDVBOX_RECEIVE_HEADER; + +VOID +NTAPI +KdVmPrepareBuffer(VOID) +{ + KdVmBufferPos = sizeof(KDVBOX_SEND_HEADER); +} + +VOID +NTAPI +KdVmKdVmExchangeData( + _Out_ PVOID* ReceiveData, + _Out_ PULONG ReceiveDataSize) +{ + PKDVBOX_SEND_HEADER SendHeader; + PKDVBOX_RECEIVE_HEADER ReceiveHeader; + + /* Setup the send-header */ + SendHeader = (PKDVBOX_SEND_HEADER)KdVmDataBuffer; + SendHeader->SendSize = KdVmBufferPos - sizeof(KDVBOX_SEND_HEADER); + SendHeader->BufferSize = KDVM_BUFFER_SIZE; + + //KdpDbgPrint("Sending buffer:\n"); + //KdVmDbgDumpBuffer(KdVmDataBuffer, KdVmBufferPos); + + /* Do the data exchange */ + KdVmExchange((ULONG_PTR)KdVmBufferPhysicalAddress.QuadPart, 0); + + /* Reset the buffer position */ + KdVmBufferPos = sizeof(KDVBOX_SEND_HEADER); + + /* Get the receive-header and return information about the received data */ + ReceiveHeader = (PKDVBOX_RECEIVE_HEADER)KdVmDataBuffer; + *ReceiveData = KdVmDataBuffer + sizeof(KDVBOX_RECEIVE_HEADER); + *ReceiveDataSize = ReceiveHeader->ReceivedDataSize; + + //KdpDbgPrint("got data:\n"); + //KdVmDbgDumpBuffer(KdVmDataBuffer, *ReceiveDataSize + sizeof(*ReceiveHeader)); + +} Propchange: trunk/reactos/drivers/base/kdvm/kdvbox.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/kdvm/kdvbox_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvbox_a… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvbox_asm.S (added) +++ trunk/reactos/drivers/base/kdvm/kdvbox_asm.S [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,24 @@ + +#include <asm.inc> + +.code + +#ifdef _M_IX86 +PUBLIC @KdVmExchange@8 +FUNC @KdVmExchange@8 + xchg eax, ecx + mov edx, HEX(5659) + out dx, eax + ret +ENDFUNC +#else +PUBLIC KdVmExchange +FUNC KdVmExchange + xchg rax, rcx + mov edx, HEX(5659) + out dx, rax + ret +ENDFUNC +#endif + +END Propchange: trunk/reactos/drivers/base/kdvm/kdvbox_asm.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/kdvm/kdvm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvm.c?r… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvm.c (added) +++ trunk/reactos/drivers/base/kdvm/kdvm.c [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,561 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kdvm/kdvm.c + * PURPOSE: VM independent function for kdvbox/kd + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include "kdvm.h" + +static CHAR KdVmCmdMagic[] = "~kdVMvA "; +static CHAR KdVmReplyMagic[] = "++kdVMvA "; +static const UCHAR KDVM_CMD_TestConnection = 't'; +static const UCHAR KDVM_CMD_ReceivePacket = 'r'; +static const UCHAR KDVM_CMD_SendPacket = 's'; +static const UCHAR KDVM_CMD_VersionReport = 'v'; + +UCHAR KdVmDataBuffer[KDVM_BUFFER_SIZE]; +PHYSICAL_ADDRESS KdVmBufferPhysicalAddress; +ULONG KdVmBufferPos; + +PFNDBGPRNT KdpDbgPrint; + + +/* PRIVATE FUNCTIONS **********************************************************/ + +static +VOID +KdVmDbgDumpRow( + _In_ PUCHAR Buffer, + _In_ ULONG Size) +{ + ULONG i; + for (i = 0;i < Size; i++) + { + KdpDbgPrint("%02x ", Buffer[i]); + } + KdpDbgPrint("\n"); +} + +VOID +NTAPI +KdVmDbgDumpBuffer( + _In_ PVOID Buffer, + _In_ ULONG Size) +{ + PUCHAR CurrentRow; + ULONG i; + + CurrentRow = Buffer; + for (i = 0; i < (Size / 16); i++) + { + KdVmDbgDumpRow(CurrentRow, 16); + CurrentRow += 16; + } + KdVmDbgDumpRow(CurrentRow, (Size % 16)); +} + +static +BOOLEAN +KdVmAddToBuffer( + _In_ PVOID Data, + _In_ ULONG DataSize) +{ + if (((KdVmBufferPos + DataSize) > KDVM_BUFFER_SIZE) || + ((KdVmBufferPos + DataSize) < KdVmBufferPos)) + { + KDDBGPRINT("KdVmAddToBuffer: Buffer overflow! Need %lu, remaining: %lu\n", + DataSize, KDVM_BUFFER_SIZE - KdVmBufferPos); + return FALSE; + } + + RtlCopyMemory(&KdVmDataBuffer[KdVmBufferPos], Data, DataSize); + KdVmBufferPos += DataSize; + return TRUE; +} + +static +BOOLEAN +KdVmAddCommandToBuffer( + _In_ UCHAR Command, + _In_ PVOID Buffer, + _In_ SIZE_T BufferSize) +{ + KDVM_CMD_HEADER Header; + + RtlCopyMemory(&Header.Magic, KdVmCmdMagic, sizeof(Header.Magic)); + Header.Command = Command; + + if (!KdVmAddToBuffer(&Header, sizeof(Header))) + return FALSE; + + if (!KdVmAddToBuffer(Buffer, BufferSize)) + return FALSE; + + return TRUE; +} + +static +PVOID +KdVmSendReceive( + _Out_ PULONG ReceiveDataSize) +{ + PVOID ReceiveData; + PKDVM_RECEIVE_HEADER ReceiveHeader; + + KdVmKdVmExchangeData(&ReceiveData, ReceiveDataSize); + ReceiveHeader = ReceiveData; + + if (*ReceiveDataSize < sizeof(*ReceiveHeader)) + { + KDDBGPRINT("KdVmSendReceive: received data too small: 0x%x\n", *ReceiveDataSize); + *ReceiveDataSize = 0; + return NULL; + } + + if (ReceiveHeader->Id != 0x2031 /* '01' */) + { + KDDBGPRINT("KdVmSendReceive: got invalid Id: 0x%x\n", ReceiveHeader->Id); + *ReceiveDataSize = 0; + return NULL; + } + + if (RtlEqualMemory(ReceiveHeader->Magic, KdVmReplyMagic, 9)) + { + KDDBGPRINT("KdVmSendReceive: got invalid Magic: '%*s'\n", + sizeof(KdVmReplyMagic), ReceiveHeader->Magic); + *ReceiveDataSize = 0; + return NULL; + } + + *ReceiveDataSize -= sizeof(*ReceiveHeader); + return (PVOID)(ReceiveHeader + 1); +} + +static +NTSTATUS +KdVmNegotiateProtocolVersions(VOID) +{ + ULONG Version = KDRPC_PROTOCOL_VERSION; + ULONG ReceivedSize; + PULONG ReceivedVersion; + KDDBGPRINT("KdVmNegotiateProtocolVersions()\n"); + + /* Prepare the buffer */ + KdVmPrepareBuffer(); + + if (!KdVmAddCommandToBuffer(KDVM_CMD_VersionReport, &Version, sizeof(Version))) + { + KDDBGPRINT("Failed to do VersionReport\n"); + return STATUS_CONNECTION_REFUSED; + } + + ReceivedVersion = KdVmSendReceive(&ReceivedSize); + if (ReceivedSize != sizeof(ULONG)) + { + KDDBGPRINT("Invalid size for VersionReport: %lx\n", ReceivedSize); + return STATUS_CONNECTION_REFUSED; + } + + if (*ReceivedVersion != KDRPC_PROTOCOL_VERSION) + { + KDDBGPRINT("Invalid Version: %lx\n", *ReceivedVersion); + return STATUS_CONNECTION_REFUSED; //STATUS_PROTOCOL_NOT_SUPPORTED; + } + + return STATUS_SUCCESS; +} + +static +BOOLEAN +TestConnectionOnChannel(VOID) +{ + UCHAR TestBuffer[KDRPC_TEST_BUFFER_SIZE]; + PUCHAR ReceivedBuffer; + ULONG i, ReceivedSize; + + /* Prepare the buffer */ + KdVmPrepareBuffer(); + + for (i = 0; i < sizeof(TestBuffer); i++) + TestBuffer[i] = (UCHAR)i; + + if (!KdVmAddCommandToBuffer(KDVM_CMD_TestConnection, TestBuffer, sizeof(TestBuffer))) + { + KDDBGPRINT("Failed to do TestConnection\n"); + return FALSE; + } + + ReceivedBuffer = KdVmSendReceive(&ReceivedSize); + if (ReceivedSize != sizeof(TestBuffer)) + { + KDDBGPRINT("Invalid size for TestConnection: %lx\n", ReceivedSize); + return FALSE; + } + + for (i = 0; i < sizeof(TestBuffer); i++) + { + if (ReceivedBuffer[i] != (UCHAR)(i ^ 0x55)) + { + KDDBGPRINT("Wrong test data @ %lx, expected %x, got %x\n", + i, (UCHAR)(i ^ 0x55), TestBuffer[i]); + return FALSE; + } + } + + KDDBGPRINT("TestConnectionOnChannel: success\n"); + return TRUE; +} + +static +BOOLEAN +KdVmTestConnectionWithHost(VOID) +{ + ULONG i, j; + KDDBGPRINT("KdVmTestConnectionWithHost()\n"); + + for (j = 0; j < 2; j++) + { + //VMWareRPC::OpenChannel + for (i = 0; i < CONNECTION_TEST_ROUNDS / 2; i++) + { + if (!TestConnectionOnChannel()) + { + return FALSE; + } + } + } + + return TRUE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdSave( + _In_ BOOLEAN SleepTransition) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdRestore( + _In_ BOOLEAN SleepTransition) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +/****************************************************************************** + * \name KdDebuggerInitialize0 + * \brief Phase 0 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status + */ +NTSTATUS +NTAPI +KdDebuggerInitialize0( + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCHAR CommandLine, PortString; + NTSTATUS Status; + + /* Check if we have a LoaderBlock */ + if (LoaderBlock != NULL) + { + /* HACK */ + KdpDbgPrint = LoaderBlock->u.I386.CommonDataArea; + KDDBGPRINT("KdDebuggerInitialize0\n"); + + /* Get the Command Line */ + CommandLine = LoaderBlock->LoadOptions; + + /* Upcase it */ + _strupr(CommandLine); + + /* Check if we got the /DEBUGPORT parameter */ + PortString = strstr(CommandLine, "DEBUGPORT"); + if (PortString) + { + /* Move past the actual string, to reach the port*/ + PortString += strlen("DEBUGPORT"); + + /* Now get past any spaces and skip the equal sign */ + while (*PortString == ' ') PortString++; + PortString++; + + /* Do we have a serial port? */ + if (strncmp(PortString, "VBOX", 3) != 0) + { + KDDBGPRINT("Invalid debugport: '%s'\n", CommandLine); + return STATUS_INVALID_PARAMETER; + } + } + } + + /* Get the physical address of the data buffer */ + KdVmBufferPhysicalAddress = MmGetPhysicalAddress(KdVmDataBuffer); + KDDBGPRINT("KdVmBufferPhysicalAddress = %llx\n", KdVmBufferPhysicalAddress.QuadPart); + + Status = KdVmNegotiateProtocolVersions(); + if (!NT_SUCCESS(Status)) + return Status; + + if (!KdVmTestConnectionWithHost()) + return STATUS_CONNECTION_REFUSED; + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * \name KdDebuggerInitialize1 + * \brief Phase 1 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status + */ +NTSTATUS +NTAPI +KdDebuggerInitialize1( + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + /* Nothing to do */ + KDDBGPRINT("KdDebuggerInitialize1()\n"); + return STATUS_SUCCESS; +} + +VOID +NTAPI +KdSendPacket( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData, + _Inout_ PKD_CONTEXT KdContext) +{ + KDVM_SEND_PKT_REQUEST SendPktRequest; + PKDVM_SEND_PKT_RESULT SendPktResult; + ULONG ReceivedSize; + KDDBGPRINT("KdSendPacket(0x%lx, ...)\n", PacketType); + + do + { + + RtlZeroMemory(&SendPktRequest, sizeof(SendPktRequest)); + + SendPktRequest.PacketType = PacketType; + SendPktRequest.Info.KdDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; + SendPktRequest.Info.KdDebuggerEnabledAvailable = 1; + SendPktRequest.Info.KdDebuggerEnabled = SharedUserData->KdDebuggerEnabled; + + if (MessageHeader != NULL) + { + SendPktRequest.MessageHeader.Length = MessageHeader->Length; + SendPktRequest.MessageHeader.MaximumLength = MessageHeader->MaximumLength; + SendPktRequest.HeaderSize = MessageHeader->Length; + } + + if (MessageData != NULL) + { + SendPktRequest.MessageData.Length = MessageData->Length; + SendPktRequest.MessageData.MaximumLength = MessageData->MaximumLength; + SendPktRequest.DataSize = MessageData->Length; + } + + if (KdContext != NULL) + { + RtlCopyMemory(&SendPktRequest.KdContext, + KdContext, + sizeof(SendPktRequest.KdContext)); + } + + + /* Prepare the buffer */ + KdVmPrepareBuffer(); + + if (!KdVmAddCommandToBuffer(KDVM_CMD_SendPacket, &SendPktRequest, sizeof(SendPktRequest))) + { + KDDBGPRINT("KdSendPacket: Failed to add SendPacket command\n"); + return; + } + + if (MessageHeader != NULL) + { + if (!KdVmAddToBuffer(MessageHeader->Buffer, MessageHeader->Length)) + { + KDDBGPRINT("KdSendPacket: Failed to add MessageHeader\n"); + return; + } + } + + if (MessageData != NULL) + { + if (!KdVmAddToBuffer(MessageData->Buffer, MessageData->Length)) + { + KDDBGPRINT("KdSendPacket: Failed to add MessageData\n"); + return; + } + } + + SendPktResult = KdVmSendReceive(&ReceivedSize); + if (ReceivedSize != sizeof(*SendPktResult)) + { + KDDBGPRINT("KdSendPacket: Invalid size for SendPktResult: %lx\n", ReceivedSize); + return; + } + + if (KdContext != NULL) + { + RtlCopyMemory(KdContext, + &SendPktResult->KdContext, + sizeof(SendPktResult->KdContext)); + } + + KD_DEBUGGER_NOT_PRESENT = SendPktResult->Info.KdDebuggerNotPresent; + if (SendPktResult->Info.KdDebuggerEnabledAvailable) + SharedUserData->KdDebuggerEnabled = SendPktResult->Info.KdDebuggerEnabled != 0; + + if (SendPktResult->Info.RetryKdSendPacket) + { + KDDBGPRINT("KdSendPacket: RetryKdSendPacket!\n"); + } + + } while (SendPktResult->Info.RetryKdSendPacket); + + KDDBGPRINT("KdSendPacket: Success!\n"); +} + + +KDP_STATUS +NTAPI +KdReceivePacket( + _In_ ULONG PacketType, + _Out_ PSTRING MessageHeader, + _Out_ PSTRING MessageData, + _Out_ PULONG DataLength, + _Inout_opt_ PKD_CONTEXT KdContext) +{ + KDVM_RECV_PKT_REQUEST RecvPktRequest; + PKDVM_RECV_PKT_RESULT RecvPktResult; + ULONG ReceivedSize, ExpectedSize; + PUCHAR Buffer; + KDDBGPRINT("KdReceivePacket(0x%lx, ...)\n", PacketType); + + /* Prepare the buffer */ + KdVmPrepareBuffer(); + + RtlZeroMemory(&RecvPktRequest, sizeof(RecvPktRequest)); + + RecvPktRequest.PacketType = PacketType; + RecvPktRequest.Info.KdDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; + RecvPktRequest.Info.KdDebuggerEnabledAvailable = 1; + RecvPktRequest.Info.KdDebuggerEnabled = SharedUserData->KdDebuggerEnabled; + + if (MessageHeader != NULL) + { + RecvPktRequest.MessageHeader.Length = MessageHeader->Length; + RecvPktRequest.MessageHeader.MaximumLength = MessageHeader->MaximumLength; + } + + if (MessageData != NULL) + { + RecvPktRequest.MessageData.Length = MessageData->Length; + RecvPktRequest.MessageData.MaximumLength = MessageData->MaximumLength; + } + + if (KdContext != NULL) + { + RtlCopyMemory(&RecvPktRequest.KdContext, + KdContext, + sizeof(RecvPktRequest.KdContext)); + } + + if (!KdVmAddCommandToBuffer(KDVM_CMD_ReceivePacket, &RecvPktRequest, sizeof(RecvPktRequest))) + { + KDDBGPRINT("KdReceivePacket: Failed to add SendPacket command\n"); + return KDP_PACKET_RESEND; + } + + RecvPktResult = KdVmSendReceive(&ReceivedSize); + if (ReceivedSize < sizeof(*RecvPktResult)) + { + KDDBGPRINT("KdReceivePacket: Invalid size for RecvPktResult: %lx\n", ReceivedSize); + return KDP_PACKET_RESEND; + } + + ExpectedSize = sizeof(*RecvPktResult) + + RecvPktResult->HeaderSize + + RecvPktResult->DataSize; + if (ReceivedSize != ExpectedSize) + { + KDDBGPRINT("KdReceivePacket: Invalid size for RecvPktResult: %lu, expected %lu\n", + ReceivedSize, ExpectedSize); + return KDP_PACKET_RESEND; + } + + if (KdContext != NULL) + { + RtlCopyMemory(KdContext, + &RecvPktResult->KdContext, + sizeof(RecvPktResult->KdContext)); + } + + Buffer = (PUCHAR)(RecvPktResult + 1); + if (MessageHeader != NULL) + { + MessageHeader->Length = RecvPktResult->MessageHeader.Length; + if ((MessageHeader->Buffer != NULL) && + (MessageHeader->MaximumLength >= RecvPktResult->HeaderSize)) + { + RtlCopyMemory(MessageHeader->Buffer, + Buffer, + RecvPktResult->HeaderSize); + } + else + { + KDDBGPRINT("MessageHeader not good\n"); + } + } + + Buffer += RecvPktResult->HeaderSize; + if (MessageData != NULL) + { + MessageData->Length = RecvPktResult->MessageData.Length; + if ((MessageData->Buffer != NULL) && + (MessageData->MaximumLength >= RecvPktResult->DataSize)) + { + RtlCopyMemory(MessageData->Buffer, + Buffer, + RecvPktResult->DataSize); + } + else + { + KDDBGPRINT("MessageData not good\n"); + } + } + + if (DataLength != NULL) + *DataLength = RecvPktResult->FullSize; + + KDDBGPRINT("KdReceivePacket: returning status %u\n", RecvPktResult->KdStatus); + return RecvPktResult->KdStatus; +} + Propchange: trunk/reactos/drivers/base/kdvm/kdvm.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/kdvm/kdvm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvm.h?r… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvm.h (added) +++ trunk/reactos/drivers/base/kdvm/kdvm.h [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,150 @@ +/* + * COPYRIGHT: GPL, see COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/base/kdvm/kdvm.h + * PURPOSE: Base definitions for the kernel debugger. + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#ifndef _KDDLL_H_ +#define _KDDLL_H_ + +#define NOEXTAPI +#include <ntifs.h> +#include <windbgkd.h> +#include <arc/arc.h> + +#undef RtlEqualMemory +#define RtlEqualMemory(a, b, c) (RtlCompareMemory(a, b, c) != c) + +//#define KDDEBUG /* uncomment to enable debugging this dll */ + +typedef ULONG (*PFNDBGPRNT)(const char *Format, ...); +extern PFNDBGPRNT KdpDbgPrint; + +#ifndef KDDEBUG +#define KDDBGPRINT(...) +#else +#define KDDBGPRINT KdpDbgPrint +#endif + +#define KDRPC_PROTOCOL_VERSION 0x101 +#define CONNECTION_TEST_ROUNDS 2 /*100*/ +#define KDVM_BUFFER_SIZE (131072 + 1024) +#define KDRPC_TEST_BUFFER_SIZE 512 + +extern UCHAR KdVmDataBuffer[KDVM_BUFFER_SIZE]; +extern PHYSICAL_ADDRESS KdVmBufferPhysicalAddress; +extern ULONG KdVmBufferPos; + +typedef enum +{ + KDP_PACKET_RECEIVED = 0, + KDP_PACKET_TIMEOUT = 1, + KDP_PACKET_RESEND = 2 +} KDP_STATUS; + +typedef struct _KDVM_MARSHAL_STRING +{ + USHORT Length; + USHORT MaximumLength; +} KDVM_MARSHAL_STRING; + +#pragma pack(push,1) +typedef struct +{ + CHAR Magic[8]; + UCHAR Command; +} KDVM_CMD_HEADER; + +typedef struct +{ + USHORT Id; + CHAR Magic[9]; +} KDVM_RECEIVE_HEADER, *PKDVM_RECEIVE_HEADER; + +typedef struct _KDVM_CONTEXT +{ + ULONG RetryCount; + BOOLEAN BreakInRequested; + UCHAR align; +} KDVM_CONTEXT, *PKDVM_CONTEXT; + +typedef struct +{ + struct + { + UCHAR KdDebuggerNotPresent : 1; + UCHAR RetryKdSendPacket : 1; + UCHAR KdDebuggerEnabledAvailable : 1; + }; + BOOLEAN KdDebuggerEnabled; + USHORT Unused; +} KDVM_SENDPACKET_INFO; + +typedef struct _KDVM_SEND_PKT_REQUEST +{ + KDVM_MARSHAL_STRING MessageHeader; + KDVM_MARSHAL_STRING MessageData; + KDVM_CONTEXT KdContext; + ULONG PacketType; + ULONG HeaderSize; + ULONG DataSize; + KDVM_SENDPACKET_INFO Info; +} KDVM_SEND_PKT_REQUEST, *PKDVM_SEND_PKT_REQUEST; + +typedef struct _KDVM_SEND_PKT_RESULT +{ + UCHAR CommandType; + KDVM_CONTEXT KdContext; + KDVM_SENDPACKET_INFO Info; +} KDVM_SEND_PKT_RESULT, *PKDVM_SEND_PKT_RESULT; + +typedef struct +{ + ULONG PacketType; + KDVM_SENDPACKET_INFO Info; + KDVM_MARSHAL_STRING MessageHeader; + KDVM_MARSHAL_STRING MessageData; + KDVM_CONTEXT KdContext; +} KDVM_RECV_PKT_REQUEST; + +typedef struct +{ + UCHAR CommandType; + KDVM_MARSHAL_STRING MessageHeader; + KDVM_MARSHAL_STRING MessageData; + KDVM_CONTEXT KdContext; + KDP_STATUS KdStatus; + ULONG FullSize; + ULONG HeaderSize; + ULONG DataSize; + KDVM_SENDPACKET_INFO Info; +} KDVM_RECV_PKT_RESULT, *PKDVM_RECV_PKT_RESULT; +#pragma pack(pop) + +VOID +NTAPI +KdVmDbgDumpBuffer( + _In_ PVOID Buffer, + _In_ ULONG Size); + +VOID +FASTCALL +KdVmExchange( + _In_ ULONG_PTR PhysicalAddress, + _In_ SIZE_T BufferSize); + +VOID +NTAPI +KdVmPrepareBuffer( + VOID); + +VOID +NTAPI +KdVmKdVmExchangeData( + _Out_ PVOID* ReceiveData, + _Out_ PULONG ReceiveDataSize); + + +#endif /* _KDDLL_H_ */ Propchange: trunk/reactos/drivers/base/kdvm/kdvm.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/kdvm/kdvm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvm.rc?… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvm.rc (added) +++ trunk/reactos/drivers/base/kdvm/kdvm.rc [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kernel Debugger COM Extension DLL" +#define REACTOS_STR_INTERNAL_NAME "kdcom" +#define REACTOS_STR_ORIGINAL_FILENAME "kdcom.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/base/kdvm/kdvm.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/kdvm/kdvm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdvm/kdvm.spe… ============================================================================== --- trunk/reactos/drivers/base/kdvm/kdvm.spec (added) +++ trunk/reactos/drivers/base/kdvm/kdvm.spec [iso-8859-1] Tue Dec 23 17:48:16 2014 @@ -0,0 +1,8 @@ +@ stdcall KdD0Transition() +@ stdcall KdD3Transition() +@ stdcall KdDebuggerInitialize0(ptr) +@ stdcall KdDebuggerInitialize1(ptr) +@ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdRestore(long) +@ stdcall KdSave(long) +@ stdcall KdSendPacket(long ptr ptr ptr) Propchange: trunk/reactos/drivers/base/kdvm/kdvm.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 65811: [USER32] Reenable some disabled tests, while disabling some other calls, namely: - code in ClientThreadStartup (that was moved in ClientThreadSetupHelper that is hackilly now call...
by hbelusca＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: hbelusca Date: Tue Dec 23 16:42:59 2014 New Revision: 65811 URL: http://svn.reactos.org/svn/reactos?rev=65811&view=rev Log: [USER32] Reenable some disabled tests, while disabling some other calls, namely: - code in ClientThreadStartup (that was moved in ClientThreadSetupHelper that is hackilly now called in Init() from DllMain), - code in User32CallClientThreadSetupFromKernel, - add two flag manual resets in Init() and the forced call to ClientThreadSetupHelper, - and moreover the whole CSR call in DllMain, that seems to sometimes cause some user32 internal global pointers to remain NULL where they should not (more specifically some "pdi" thing). Obviously all these problems need to be understood (why some things do not become initialized when they should, etc...). See r65799, revert r65810, and CORE-8949. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Tue Dec 23 16:42:59 2014 @@ -240,7 +240,7 @@ * Also this needs to be done only for the first thread (since the connection * is per-process). */ - // if (gfServerProcess && IsFirstThread) // Disabling this test is a HACK!! + if (gfServerProcess && IsFirstThread) { NTSTATUS Status; USERCONNECT UserCon; @@ -269,7 +269,7 @@ TRACE("Checkpoint (register PFN)\n"); if (!RegisterClientPFN()) { - TRACE("RegisterClientPFN failed\n"); + ERR("RegisterClientPFN failed\n"); return FALSE; } @@ -277,7 +277,7 @@ ClientInfo->CI_flags |= CI_INITTHREAD; /* Initialization that should be done once per process */ - // if (IsFirstThread) // Disabling this test is a HACK!! + if (IsFirstThread) { TRACE("Checkpoint (Allocating TLS)\n"); @@ -352,7 +352,9 @@ // continue as normal. // - // return ClientThreadSetupHelper(FALSE); // Disabling this call is a HACK!! + // FIXME: Disabling this call is a HACK!! See also User32CallClientThreadSetupFromKernel... + // return ClientThreadSetupHelper(FALSE); + UNIMPLEMENTED; return TRUE; } @@ -368,18 +370,26 @@ /* Initialize callback table in PEB data */ NtCurrentPeb()->KernelCallbackTable = apfnDispatch; NtCurrentPeb()->PostProcessInitRoutine = NULL; + + // This is a HACK!! // + gfServerProcess = FALSE; + gfFirstThread = TRUE; + //// End of HACK!! /// /* * Retrieve data from the connect info structure if the initializing * process is not CSRSS. In case it is, this will be done from inside * ClientThreadSetup. */ - // if (!gfServerProcess) // Disabling this test is a HACK!! + if (!gfServerProcess) { // FIXME: HACK!! We should fixup for the NtUserProcessConnect fixups // because it was made in the context of CSRSS process and not ours!! // So... as long as we don't fix that, we need to redo again a call // to NtUserProcessConnect... How perverse is that?! + // + // HACK(2): This call is necessary since we disabled + // the CSR call in DllMain... { RtlZeroMemory(UserCon, sizeof(*UserCon)); @@ -395,7 +405,7 @@ } // - // We continue as we should do... + // We continue as we should do normally... // /* Retrieve data */ @@ -406,6 +416,15 @@ gHandleEntries = SharedPtrToUser(gHandleTable->handles); } + // FIXME: Yet another hack... This call should normally not be done here, but + // instead in ClientThreadSetup, and in User32CallClientThreadSetupFromKernel as well. + ERR("HACK: Using Init-ClientThreadSetupHelper hack!!\n"); + if (!ClientThreadSetupHelper(FALSE)) + { + ERR("Init-ClientThreadSetupHelper hack failed!\n"); + return FALSE; + } + TRACE("<-- user32::Init()\n"); return NT_SUCCESS(Status); @@ -436,8 +455,11 @@ #define WIN_OBJ_DIR L"\\Windows" #define SESSION_DIR L"\\Sessions" + USERSRV_API_CONNECTINFO ConnectInfo; // USERCONNECT + +#if 0 // Disabling this code is a BIG HACK!! + NTSTATUS Status; - USERSRV_API_CONNECTINFO ConnectInfo; // USERCONNECT ULONG ConnectInfoSize = sizeof(ConnectInfo); WCHAR SessionDir[256]; @@ -487,6 +509,8 @@ TRACE("Checkpoint (CSR called)\n"); +#endif + User32Instance = hInstanceDll; /* Finish initialization */ @@ -516,7 +540,8 @@ User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength) { TRACE("User32CallClientThreadSetupFromKernel -->\n"); - ClientThreadSetupHelper(TRUE); + // FIXME: Disabling this call is a HACK!! See also ClientThreadSetup... + // ClientThreadSetupHelper(TRUE); TRACE("<-- User32CallClientThreadSetupFromKernel\n"); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); }

1 0

[hbelusca] 65810: [USER32]: Add yet another magic hack to temporarily reenable bots (ofc. mention in the code that this is a hack). See r65799 for more details, and CORE-8949.
by hbelusca＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: hbelusca Date: Tue Dec 23 14:31:28 2014 New Revision: 65810 URL: http://svn.reactos.org/svn/reactos?rev=65810&view=rev Log: [USER32]: Add yet another magic hack to temporarily reenable bots (ofc. mention in the code that this is a hack). See r65799 for more details, and CORE-8949. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Tue Dec 23 14:31:28 2014 @@ -277,7 +277,7 @@ ClientInfo->CI_flags |= CI_INITTHREAD; /* Initialization that should be done once per process */ - if (IsFirstThread) + // if (IsFirstThread) // Disabling this test is a HACK!! { TRACE("Checkpoint (Allocating TLS)\n");

1 0

[akhaldi] 65808: [BOOTDATA] Add some default settings for crash control to hivesys.inf. By Ricardo Hanke. CORE-8953
by akhaldi＠svn.reactos.org 23 Dec '14

23 Dec '14

Author: akhaldi Date: Tue Dec 23 11:01:17 2014 New Revision: 65808 URL: http://svn.reactos.org/svn/reactos?rev=65808&view=rev Log: [BOOTDATA] Add some default settings for crash control to hivesys.inf. By Ricardo Hanke. CORE-8953 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] Tue Dec 23 11:01:17 2014 @@ -362,6 +362,15 @@ ; Default computer name settings HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName","ComputerName",0x00000002,"COMPUTERNAME" + +; Crash Control +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","AutoReboot",0x00010003,0 +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","CrashDumpEnabled",0x00010003,3 +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","DumpFile",0x00020002,"%SystemRoot%\MEMORY.DMP" +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","LogEvent",0x00010003,0 +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","MinidumpDir",0x00020002,"%SystemRoot%\Minidump" +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","Overwrite",0x00010003,1 +HKLM,"SYSTEM\CurrentControlSet\Control\CrashControl","SendAlert",0x00010003,0 ; Device classes key HKLM,"SYSTEM\CurrentControlSet\Control\DeviceClasses",,0x00000012

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