Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64153: [KSECDD] - Fix a typo in KsecQueryFileInformation - Implement missing ioctls in KsecDeviceControl - Support METHOD_OUT_DIRECT for IRP_MJ_DEVICE_CONTROL - Add stubs for KsecEn/Decr...
by tkreuzer＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: tkreuzer Date: Sun Sep 14 19:40:15 2014 New Revision: 64153 URL: http://svn.reactos.org/svn/reactos?rev=64153&view=rev Log: [KSECDD] - Fix a typo in KsecQueryFileInformation - Implement missing ioctls in KsecDeviceControl - Support METHOD_OUT_DIRECT for IRP_MJ_DEVICE_CONTROL - Add stubs for KsecEn/DecryptMemory [ADVAPI32] - Use ksecdd to handle SystemFunction040 (RtlEncryptMemory) and SystemFunction041 (RtlDecryptMemory) (they still do nothing, but at least they do it in kenrnel mode now ;-)) Added: trunk/reactos/drivers/crypto/ksecdd/crypt.c (with props) Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/misc/dllmain.c trunk/reactos/dll/win32/advapi32/misc/sysfunc.c trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt trunk/reactos/drivers/crypto/ksecdd/dispatch.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.h trunk/reactos/include/reactos/drivers/ksecdd/ksecioctl.h 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] Sun Sep 14 19:40:15 2014 @@ -8,6 +8,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ksecdd ${REACTOS_SOURCE_DIR}/lib/cryptlib ${CMAKE_CURRENT_BINARY_DIR}) Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -14,6 +14,7 @@ extern BOOL RegInitialize(VOID); extern BOOL RegCleanup(VOID); extern VOID UnloadNtMarta(VOID); +extern VOID CloseKsecDdHandle(VOID); BOOL WINAPI @@ -33,6 +34,7 @@ CloseLogonLsaHandle(); RegCleanup(); UnloadNtMarta(); + CloseKsecDdHandle(); break; } Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -12,9 +12,15 @@ */ #include <advapi32.h> +#include <ksecioctl.h> #include <md4.h> #include <md5.h> #include <rc4.h> + +/* FIXME: this should be in some shared header */ +#define RTL_ENCRYPT_OPTION_SAME_PROCESS 0 +#define RTL_ENCRYPT_OPTION_CROSS_PROCESS 1 +#define RTL_ENCRYPT_OPTION_SAME_LOGON 2 static const unsigned char CRYPT_LMhash_Magic[8] = { 'K', 'G', 'S', '!', '@', '#', '$', '%' }; @@ -615,6 +621,93 @@ return TRUE; } +HANDLE KsecDeviceHandle; + +static +NTSTATUS +KsecOpenDevice() +{ + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KsecDD"); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE DeviceHandle; + NTSTATUS Status; + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0x18, + NULL, + NULL); + Status = NtOpenFile(&DeviceHandle, + 0x100001, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + if (InterlockedCompareExchangePointer(&KsecDeviceHandle, DeviceHandle, NULL) != NULL) + { + NtClose(DeviceHandle); + } + + return STATUS_SUCCESS; +} + +VOID +CloseKsecDdHandle(VOID) +{ + /* Check if we already opened a handle to ksecdd */ + if (KsecDeviceHandle != NULL) + { + /* Close it */ + CloseHandle(KsecDeviceHandle); + KsecDeviceHandle = NULL; + } +} + +static +NTSTATUS +KsecDeviceIoControl( + ULONG IoControlCode, + PVOID InputBuffer, + SIZE_T InputBufferLength, + PVOID OutputBuffer, + SIZE_T OutputBufferLength) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + /* Check if we already have a handle */ + if (KsecDeviceHandle == NULL) + { + /* Try to open the device */ + Status = KsecOpenDevice(); + if (!NT_SUCCESS(Status)) + { + //ERR("Failed to open handle to KsecDd driver!\n"); + return Status; + } + } + + /* Call the driver */ + Status = NtDeviceIoControlFile(KsecDeviceHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + IoControlCode, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength); + + return Status; +} + /* These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory, in crypt32.dll. @@ -642,10 +735,36 @@ * If flags are specified when encrypting, the same flag value must be given * when decrypting the memory. */ -NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) -{ +NTSTATUS +WINAPI +SystemFunction040( + _Inout_ PVOID Memory, + _In_ ULONG MemoryLength, + _In_ ULONG OptionFlags) +{ + ULONG IoControlCode; + //FIXME("(%p, %x, %x): stub [RtlEncryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; + + if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_PROCESS) + { + IoControlCode = IOCTL_KSEC_ENCRYPT_SAME_PROCESS; + } + else if (OptionFlags == RTL_ENCRYPT_OPTION_CROSS_PROCESS) + { + IoControlCode = IOCTL_KSEC_ENCRYPT_CROSS_PROCESS; + } + else if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) + { + IoControlCode = IOCTL_KSEC_ENCRYPT_SAME_LOGON; + } + else + { + return STATUS_INVALID_PARAMETER; + } + + return KsecDeviceIoControl(IoControlCode, Memory, MemoryLength, Memory, MemoryLength); } /****************************************************************************** @@ -670,10 +789,36 @@ * If flags are specified when encrypting, the same flag value must be given * when decrypting the memory. */ -NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) -{ +NTSTATUS +WINAPI +SystemFunction041( + _Inout_ PVOID Memory, + _In_ ULONG MemoryLength, + _In_ ULONG OptionFlags) +{ + ULONG IoControlCode; + //FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; + + if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_PROCESS) + { + IoControlCode = IOCTL_KSEC_DECRYPT_SAME_PROCESS; + } + else if (OptionFlags == RTL_ENCRYPT_OPTION_CROSS_PROCESS) + { + IoControlCode = IOCTL_KSEC_DECRYPT_CROSS_PROCESS; + } + else if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) + { + IoControlCode = IOCTL_KSEC_DECRYPT_SAME_LOGON; + } + else + { + return STATUS_INVALID_PARAMETER; + } + + return KsecDeviceIoControl(IoControlCode, Memory, MemoryLength, Memory, MemoryLength); } /* EOF */ Modified: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/CMak… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -8,6 +8,7 @@ list(APPEND SOURCE ksecdd.c dispatch.c + crypt.c random.c stubs.c ksecdd.rc Added: trunk/reactos/drivers/crypto/ksecdd/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/cryp… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/crypt.c (added) +++ trunk/reactos/drivers/crypto/ksecdd/crypt.c [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS Drivers + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: Kernel Security Support Provider Interface Driver + * + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include "ksecdd.h" + +NTSTATUS +NTAPI +KsecEncryptMemory ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KsecDecryptMemory ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags) +{ + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/crypto/ksecdd/crypt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/crypto/ksecdd/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/disp… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/dispatch.c [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -33,7 +33,7 @@ } /* Validate buffer size */ - if (*BufferLength >= sizeof(FILE_STANDARD_INFORMATION)) + if (*BufferLength < sizeof(FILE_STANDARD_INFORMATION)) { *BufferLength = sizeof(FILE_STANDARD_INFORMATION); return STATUS_INFO_LENGTH_MISMATCH; @@ -92,7 +92,28 @@ { NTSTATUS Status; - Status = STATUS_SUCCESS; + if ((IoControlCode == IOCTL_KSEC_RANDOM_FILL_BUFFER) || + (IoControlCode == IOCTL_KSEC_ENCRYPT_SAME_PROCESS) || + (IoControlCode == IOCTL_KSEC_DECRYPT_SAME_PROCESS) || + (IoControlCode == IOCTL_KSEC_ENCRYPT_CROSS_PROCESS) || + (IoControlCode == IOCTL_KSEC_DECRYPT_CROSS_PROCESS) || + (IoControlCode == IOCTL_KSEC_ENCRYPT_SAME_LOGON) || + (IoControlCode == IOCTL_KSEC_DECRYPT_SAME_LOGON)) + { + /* Make sure we have a valid output buffer */ + if ((Buffer == NULL) || (OutputLength == NULL)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if the input is smaller than the output */ + if (InputLength < *OutputLength) + { + /* We might have uninitialized memory, zero it out */ + RtlSecureZeroMemory((PUCHAR)Buffer + InputLength, + *OutputLength - InputLength); + } + } /* Check ioctl code */ switch (IoControlCode) @@ -105,6 +126,48 @@ case IOCTL_KSEC_RANDOM_FILL_BUFFER: Status = KsecGenRandom(Buffer, *OutputLength); + break; + + case IOCTL_KSEC_ENCRYPT_SAME_PROCESS: + + Status = KsecEncryptMemory(Buffer, + *OutputLength, + RTL_ENCRYPT_OPTION_SAME_PROCESS); + break; + + case IOCTL_KSEC_DECRYPT_SAME_PROCESS: + + Status = KsecDecryptMemory(Buffer, + *OutputLength, + RTL_ENCRYPT_OPTION_SAME_PROCESS); + break; + + case IOCTL_KSEC_ENCRYPT_CROSS_PROCESS: + + Status = KsecEncryptMemory(Buffer, + *OutputLength, + RTL_ENCRYPT_OPTION_CROSS_PROCESS); + break; + + case IOCTL_KSEC_DECRYPT_CROSS_PROCESS: + + Status = KsecDecryptMemory(Buffer, + *OutputLength, + RTL_ENCRYPT_OPTION_CROSS_PROCESS); + break; + + case IOCTL_KSEC_ENCRYPT_SAME_LOGON: + + Status = KsecEncryptMemory(Buffer, + *OutputLength, + RTL_ENCRYPT_OPTION_SAME_LOGON); + break; + + case IOCTL_KSEC_DECRYPT_SAME_LOGON: + + Status = KsecDecryptMemory(Buffer, + *OutputLength, + RTL_ENCRYPT_OPTION_SAME_LOGON); break; default: @@ -188,10 +251,30 @@ case IRP_MJ_DEVICE_CONTROL: /* Extract the parameters */ - Buffer = Irp->AssociatedIrp.SystemBuffer; InputLength = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; OutputLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; IoControlCode = IoStackLocation->Parameters.DeviceIoControl.IoControlCode; + + /* Check for METHOD_OUT_DIRECT method */ + if ((METHOD_FROM_CTL_CODE(IoControlCode) == METHOD_OUT_DIRECT) && + (OutputLength != 0)) + { + /* Use the provided MDL */ + OutputLength = Irp->MdlAddress->ByteCount; + Buffer = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, + NormalPagePriority); + if (Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + Information = 0; + break; + } + } + else + { + /* Otherwise this is METHOD_BUFFERED, use the SystemBuffer */ + Buffer = Irp->AssociatedIrp.SystemBuffer; + } /* Call the internal function */ Status = KsecDeviceControl(IoControlCode, @@ -205,6 +288,7 @@ DPRINT1("Unhandled major function %lu!\n", IoStackLocation->MajorFunction); ASSERT(FALSE); + return STATUS_INVALID_DEVICE_REQUEST; } /* Return the information */ Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.h [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -9,6 +9,26 @@ #define _NO_KSECDD_IMPORT_ #include <ntifs.h> #include <ndk/extypes.h> +#include <ndk/rtlfuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/obfuncs.h> +#include <ntstrsafe.h> + +#define STATUS_KSEC_INTERNAL_ERROR ((NTSTATUS)0x80090304) + +/* FIXME: this should be in some shared header */ +#define RTL_ENCRYPT_OPTION_SAME_PROCESS 0 +#define RTL_ENCRYPT_OPTION_CROSS_PROCESS 1 +#define RTL_ENCRYPT_OPTION_SAME_LOGON 2 + +typedef struct _KSEC_CONNECTION_INFO +{ + ULONG Unknown0; + NTSTATUS Status; + ULONG_PTR Information; + CHAR ConnectionString[128]; + ULONG Flags; +} KSEC_CONNECTION_INFO; #if defined(_M_IX86) || defined(_M_AMD64) typedef struct _KSEC_MACHINE_SPECIFIC_COUNTERS @@ -41,6 +61,9 @@ SYSTEM_PROCESS_INFORMATION SystemProcessInformation; } KSEC_ENTROPY_DATA, *PKSEC_ENTROPY_DATA; +extern PEPROCESS KsecLsaProcess;; +extern HANDLE KsecLsaProcessHandle; + NTSTATUS NTAPI KsecDdDispatch( @@ -54,3 +77,37 @@ PVOID Buffer, SIZE_T Length); +NTSTATUS +NTAPI +KsecEncryptMemory ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags); + +NTSTATUS +NTAPI +KsecDecryptMemory ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags); + +NTSTATUS +NTAPI +KsecInitLsaMemory(VOID); + +/// +PVOID +NTAPI +PsGetProcessSecurityPort( + PEPROCESS Process); + +NTSTATUS +NTAPI +PsSetProcessSecurityPort( + PEPROCESS Process, + PVOID SecurityPort); + +HANDLE +NTAPI +PsGetCurrentThreadProcessId(VOID); + Modified: trunk/reactos/include/reactos/drivers/ksecdd/ksecioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/ks… ============================================================================== --- trunk/reactos/include/reactos/drivers/ksecdd/ksecioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/ksecdd/ksecioctl.h [iso-8859-1] Sun Sep 14 19:40:15 2014 @@ -15,11 +15,11 @@ CTL_CODE(FILE_DEVICE_KSEC, 0x02, METHOD_BUFFERED, FILE_ANY_ACCESS) // 3: 0x39000E - called from SystemFunction040 aka RtlEncryptMemory with OptionFlags == 0 -#define IOCTL_KSEC_ENCRYPT_PROCESS \ +#define IOCTL_KSEC_ENCRYPT_SAME_PROCESS \ CTL_CODE(FILE_DEVICE_KSEC, 0x03, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) // 4: 0x390012 - called from SystemFunction041 aka RtlDecryptMemory with OptionFlags == 0 -#define IOCTL_KSEC_DECRYPT_PROCESS \ +#define IOCTL_KSEC_DECRYPT_SAME_PROCESS \ CTL_CODE(FILE_DEVICE_KSEC, 0x04, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) // 5: 0x390016 - called from SystemFunction040 aka RtlEncryptMemory with OptionFlags == 1

1 0

[tkreuzer] 64152: [NTOSKRNL] Implement a fake NtLockProductActivationKeys
by tkreuzer＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: tkreuzer Date: Sun Sep 14 16:05:00 2014 New Revision: 64152 URL: http://svn.reactos.org/svn/reactos?rev=64152&view=rev Log: [NTOSKRNL] Implement a fake NtLockProductActivationKeys Modified: branches/kernel-fun/reactos/ntoskrnl/config/ntapi.c Modified: branches/kernel-fun/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/branches/kernel-fun/reactos/ntoskrnl/con… ============================================================================== --- branches/kernel-fun/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ branches/kernel-fun/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun Sep 14 16:05:00 2014 @@ -15,6 +15,7 @@ BOOLEAN CmBootAcceptFirstTime = TRUE; BOOLEAN CmFirstTime = TRUE; +extern ULONG InitSafeBootMode; /* FUNCTIONS *****************************************************************/ @@ -893,7 +894,7 @@ /* Enough of the system has booted by now */ Ki386PerfEnd(); - + /* Validate flag */ if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; @@ -962,13 +963,52 @@ return STATUS_NOT_IMPLEMENTED; } +// FIXME: different for different windows versions! +#define PRODUCT_ACTIVATION_VERSION 7749 + NTSTATUS NTAPI NtLockProductActivationKeys(IN PULONG pPrivateVer, IN PULONG pSafeMode) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + + PreviousMode = ExGetPreviousMode(); + _SEH2_TRY + { + /* Check if the caller asked for the version */ + if (pPrivateVer != NULL) + { + /* For user mode, probe it */ + if (PreviousMode != KernelMode) + { + ProbeForRead(pPrivateVer, sizeof(ULONG), sizeof(ULONG)); + } + + /* Return the expected version */ + *pPrivateVer = PRODUCT_ACTIVATION_VERSION; + } + + /* Check if the caller asked for safe mode mode state */ + if (pSafeMode != NULL) + { + /* For user mode, probe it */ + if (PreviousMode != KernelMode) + { + ProbeForRead(pSafeMode, sizeof(ULONG), sizeof(ULONG)); + } + + /* Return the safe boot mode state */ + *pSafeMode = InitSafeBootMode; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return STATUS_SUCCESS; } NTSTATUS

1 0

[akhaldi] 64151: [XDK][DDK] * Handle the rest of cases about the order of pragma and symbol declaration.
by akhaldi＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: akhaldi Date: Sun Sep 14 15:49:35 2014 New Revision: 64151 URL: http://svn.reactos.org/svn/reactos?rev=64151&view=rev Log: [XDK][DDK] * Handle the rest of cases about the order of pragma and symbol declaration. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/fsrtlfuncs.h trunk/reactos/include/xdk/haltypes.h trunk/reactos/include/xdk/kdfuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/mmtypes.h trunk/reactos/include/xdk/ntifs.template.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=64… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -1670,8 +1670,8 @@ extern HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) extern PHAL_DISPATCH HalDispatchTable; -__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) #define HALDISPATCH HalDispatchTable #endif Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=64… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -8396,8 +8396,8 @@ extern const UCHAR * const FsRtlLegalAnsiCharacterArray; #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; -__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) #define LEGAL_ANSI_CHARACTER_ARRAY (*FsRtlLegalAnsiCharacterArray) #endif @@ -10993,8 +10993,8 @@ extern PUSHORT NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) extern PUSHORT *NlsOemLeadByteInfo; -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) #define NLS_OEM_LEAD_BYTE_INFO (*NlsOemLeadByteInfo) #endif Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6415… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -1661,8 +1661,8 @@ #elif (NTDDI_VERSION >= NTDDI_WINXP) extern NTSYSAPI CCHAR KeNumberProcessors; #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) extern PCCHAR KeNumberProcessors; -__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) #endif @@ -1815,8 +1815,8 @@ } MM_SYSTEMSIZE; #ifndef _NTSYSTEM_ +__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) extern PBOOLEAN Mm64BitPhysicalAddress; -__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) #endif extern NTKERNELAPI PVOID MmBadPointer; Modified: trunk/reactos/include/xdk/fsrtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/fsrtlfuncs.h?r… ============================================================================== --- trunk/reactos/include/xdk/fsrtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/fsrtlfuncs.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -1584,8 +1584,8 @@ extern const UCHAR * const FsRtlLegalAnsiCharacterArray; #define LEGAL_ANSI_CHARACTER_ARRAY FsRtlLegalAnsiCharacterArray #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) extern const UCHAR * const *FsRtlLegalAnsiCharacterArray; -__CREATE_NTOS_DATA_IMPORT_ALIAS(FsRtlLegalAnsiCharacterArray) #define LEGAL_ANSI_CHARACTER_ARRAY (*FsRtlLegalAnsiCharacterArray) #endif Modified: trunk/reactos/include/xdk/haltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/haltypes.h?rev… ============================================================================== --- trunk/reactos/include/xdk/haltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/haltypes.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -273,8 +273,8 @@ extern HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) extern PHAL_DISPATCH HalDispatchTable; -__CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) #define HALDISPATCH HalDispatchTable #endif Modified: trunk/reactos/include/xdk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kdfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kdfuncs.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -125,11 +125,11 @@ extern BOOLEAN KdDebuggerNotPresent; #define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerEnabled) extern BOOLEAN *KdDebuggerEnabled; -__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerEnabled) #define KD_DEBUGGER_ENABLED (*KdDebuggerEnabled) +__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerNotPresent) extern BOOLEAN *KdDebuggerNotPresent; -__CREATE_NTOS_DATA_IMPORT_ALIAS(KdDebuggerNotPresent) #define KD_DEBUGGER_NOT_PRESENT (*KdDebuggerNotPresent) #endif Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -986,8 +986,8 @@ #elif (NTDDI_VERSION >= NTDDI_WINXP) extern NTSYSAPI CCHAR KeNumberProcessors; #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) extern PCCHAR KeNumberProcessors; -__CREATE_NTOS_DATA_IMPORT_ALIAS(KeNumberProcessors) #endif $endif (_WDMDDK_) Modified: trunk/reactos/include/xdk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/mmtypes.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -148,8 +148,8 @@ } MM_SYSTEMSIZE; #ifndef _NTSYSTEM_ +__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) extern PBOOLEAN Mm64BitPhysicalAddress; -__CREATE_NTOS_DATA_IMPORT_ALIAS(Mm64BitPhysicalAddress) #endif extern NTKERNELAPI PVOID MmBadPointer; Modified: trunk/reactos/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ntifs.template… ============================================================================== --- trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ntifs.template.h [iso-8859-1] Sun Sep 14 15:49:35 2014 @@ -1128,8 +1128,8 @@ extern PUSHORT NlsOemLeadByteInfo; #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) extern PUSHORT *NlsOemLeadByteInfo; -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsOemLeadByteInfo) #define NLS_OEM_LEAD_BYTE_INFO (*NlsOemLeadByteInfo) #endif

1 0

[akhaldi] 64150: [XDK][DDK] * Addendum to r64148.
by akhaldi＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: akhaldi Date: Sun Sep 14 15:40:37 2014 New Revision: 64150 URL: http://svn.reactos.org/svn/reactos?rev=64150&view=rev Log: [XDK][DDK] * Addendum to r64148. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/obtypes.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6415… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Sep 14 15:40:37 2014 @@ -7859,6 +7859,17 @@ extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern POBJECT_TYPE NTSYSAPI PsProcessType; #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(CmKeyObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(IoFileObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(ExEventObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(ExSemaphoreObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionManagerObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmResourceManagerObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmEnlistmentObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(PsProcessType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(PsThreadType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(SeTokenObjectType) extern POBJECT_TYPE *CmKeyObjectType; extern POBJECT_TYPE *IoFileObjectType; extern POBJECT_TYPE *ExEventObjectType; @@ -7870,17 +7881,6 @@ extern POBJECT_TYPE *PsProcessType; extern POBJECT_TYPE *PsThreadType; extern POBJECT_TYPE *SeTokenObjectType; -__CREATE_NTOS_DATA_IMPORT_ALIAS(CmKeyObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(IoFileObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(ExEventObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(ExSemaphoreObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionManagerObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmResourceManagerObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmEnlistmentObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(PsProcessType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(PsThreadType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(SeTokenObjectType) #endif Modified: trunk/reactos/include/xdk/obtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/obtypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/obtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/obtypes.h [iso-8859-1] Sun Sep 14 15:40:37 2014 @@ -134,6 +134,17 @@ extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern POBJECT_TYPE NTSYSAPI PsProcessType; #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(CmKeyObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(IoFileObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(ExEventObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(ExSemaphoreObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionManagerObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmResourceManagerObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmEnlistmentObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionObjectType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(PsProcessType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(PsThreadType) +__CREATE_NTOS_DATA_IMPORT_ALIAS(SeTokenObjectType) extern POBJECT_TYPE *CmKeyObjectType; extern POBJECT_TYPE *IoFileObjectType; extern POBJECT_TYPE *ExEventObjectType; @@ -145,17 +156,6 @@ extern POBJECT_TYPE *PsProcessType; extern POBJECT_TYPE *PsThreadType; extern POBJECT_TYPE *SeTokenObjectType; -__CREATE_NTOS_DATA_IMPORT_ALIAS(CmKeyObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(IoFileObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(ExEventObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(ExSemaphoreObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionManagerObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmResourceManagerObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmEnlistmentObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(TmTransactionObjectType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(PsProcessType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(PsThreadType) -__CREATE_NTOS_DATA_IMPORT_ALIAS(SeTokenObjectType) #endif $endif (_WDMDDK_)

1 0

[akhaldi] 64149: [MSI] * Implement a correct CUSTOMPROC_wrapper wrapper for MSVC.
by akhaldi＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: akhaldi Date: Sun Sep 14 15:31:58 2014 New Revision: 64149 URL: http://svn.reactos.org/svn/reactos?rev=64149&view=rev Log: [MSI] * Implement a correct CUSTOMPROC_wrapper wrapper for MSVC. Modified: trunk/reactos/dll/win32/msi/msvchelper.h Modified: trunk/reactos/dll/win32/msi/msvchelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msvchelper.h… ============================================================================== --- trunk/reactos/dll/win32/msi/msvchelper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msvchelper.h [iso-8859-1] Sun Sep 14 15:31:58 2014 @@ -4,10 +4,22 @@ typedef unsigned int (__stdcall *__MSVC__MsiCustomActionEntryPoint)(unsigned int); -__inline unsigned int CUSTOMPROC_wrapper(__MSVC__MsiCustomActionEntryPoint proc, unsigned int handle) +static +__declspec(naked) +unsigned int +__cdecl +CUSTOMPROC_wrapper(__MSVC__MsiCustomActionEntryPoint proc, unsigned int handle) { -#pragma message("warning: CUSTOMPROC_wrapper might not be correct") - return proc(handle); + __asm + { + push ebp + mov ebp, esp + push dword ptr [ebp + 12] + mov eax, dword ptr [ebp + 8] + call eax + leave + ret + } } #endif

1 0

[akhaldi] 64148: [XDK][DDK] * Work around what looks like a bug in GCC's handling of #pragma redefine_extname. Its behavior regarding additional underscore prefixes depends on the order of pragma a...
by akhaldi＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: akhaldi Date: Sun Sep 14 15:19:20 2014 New Revision: 64148 URL: http://svn.reactos.org/svn/reactos?rev=64148&view=rev Log: [XDK][DDK] * Work around what looks like a bug in GCC's handling of #pragma redefine_extname. Its behavior regarding additional underscore prefixes depends on the order of pragma and symbol declaration with GCC, while it's consistent with Clang. Brought to you by Thomas Faber, reviewed by Timo Kreuzer. CORE-8516 Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/rtltypes.h trunk/reactos/include/xdk/wdm.template.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6414… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Sep 14 15:19:20 2014 @@ -139,7 +139,7 @@ #ifdef _M_IX86 #define __SYMBOL(_Name) "_"#_Name #define __IMPORTSYMBOL(_Name) "__imp__"#_Name -#define __IMPORTNAME(_Name) _imp__##_Name +#define __IMPORTNAME(_Name) __imp__##_Name #else #define __SYMBOL(_Name) #_Name #define __IMPORTSYMBOL(_Name) "__imp_"#_Name @@ -586,11 +586,11 @@ extern BOOLEAN NlsMbOemCodePageTag; #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbCodePageTag) extern BOOLEAN *NlsMbCodePageTag; -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbCodePageTag) #define NLS_MB_CODE_PAGE_TAG (*NlsMbCodePageTag) +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbOemCodePageTag) extern BOOLEAN *NlsMbOemCodePageTag; -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbOemCodePageTag) #define NLS_MB_OEM_CODE_PAGE_TAG (*NlsMbOemCodePageTag) #endif Modified: trunk/reactos/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtltypes.h [iso-8859-1] Sun Sep 14 15:19:20 2014 @@ -203,11 +203,11 @@ extern BOOLEAN NlsMbOemCodePageTag; #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #else +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbCodePageTag) extern BOOLEAN *NlsMbCodePageTag; -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbCodePageTag) #define NLS_MB_CODE_PAGE_TAG (*NlsMbCodePageTag) +__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbOemCodePageTag) extern BOOLEAN *NlsMbOemCodePageTag; -__CREATE_NTOS_DATA_IMPORT_ALIAS(NlsMbOemCodePageTag) #define NLS_MB_OEM_CODE_PAGE_TAG (*NlsMbOemCodePageTag) #endif Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Sun Sep 14 15:19:20 2014 @@ -139,7 +139,7 @@ #ifdef _M_IX86 #define __SYMBOL(_Name) "_"#_Name #define __IMPORTSYMBOL(_Name) "__imp__"#_Name -#define __IMPORTNAME(_Name) _imp__##_Name +#define __IMPORTNAME(_Name) __imp__##_Name #else #define __SYMBOL(_Name) #_Name #define __IMPORTSYMBOL(_Name) "__imp_"#_Name

1 0

[hbelusca] 64147: [NTVDM]: Code formatting and add a warning about the usage of callbacks.
by hbelusca＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: hbelusca Date: Sun Sep 14 14:59:20 2014 New Revision: 64147 URL: http://svn.reactos.org/svn/reactos?rev=64147&view=rev Log: [NTVDM]: Code formatting and add a warning about the usage of callbacks. Modified: trunk/reactos/subsystems/ntvdm/callback.c trunk/reactos/subsystems/ntvdm/hardware/mouse.c Modified: trunk/reactos/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/callback.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] Sun Sep 14 14:59:20 2014 @@ -7,6 +7,14 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ +/******************************************************************************\ +| WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! +| +| Callbacks support supposes implicitely that the callbacks are used +| in the SAME thread as the CPU thread, otherwise messing in parallel +| with the CPU registers is 100% prone to bugs!! +\******************************************************************************/ + /* INCLUDES *******************************************************************/ #define NDEBUG Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] Sun Sep 14 14:59:20 2014 @@ -121,7 +121,7 @@ VOID MouseUpdatePosition(PCOORD NewPosition) { /* Update the counters */ - HorzCounter += ((NewPosition->X - Position.X) * WidthMm * Resolution) / WidthPixels; + HorzCounter += ((NewPosition->X - Position.X) * WidthMm * Resolution) / WidthPixels; VertCounter += ((NewPosition->Y - Position.Y) * HeightMm * Resolution) / HeightPixels; /* Update the position */

1 0

[jgardou] 64146: [KDGDB] - It can happen that GDB issues something else than qsThreadInfo after qfThreadInfo - Properly clean up the callbacks after handling a custom Send/ManipulateState loop
by jgardou＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: jgardou Date: Sun Sep 14 14:28:05 2014 New Revision: 64146 URL: http://svn.reactos.org/svn/reactos?rev=64146&view=rev Log: [KDGDB] - It can happen that GDB issues something else than qsThreadInfo after qfThreadInfo - Properly clean up the callbacks after handling a custom Send/ManipulateState loop Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Sun Sep 14 14:28:05 2014 @@ -14,6 +14,9 @@ static HANDLE gdb_dbg_process; HANDLE gdb_dbg_thread; CONTEXT CurrentContext; +/* Keep track of where we are for qfThreadInfo/qsThreadInfo */ +static LIST_ENTRY* CurrentProcessEntry; +static LIST_ENTRY* CurrentThreadEntry; /* PRIVATE FUNCTIONS **********************************************************/ static @@ -116,7 +119,11 @@ /* q* packets */ static void -handle_gdb_query(_Inout_ PKD_CONTEXT KdContext) +handle_gdb_query( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) { if (strncmp(gdb_input, "qSupported:", 11) == 0) { @@ -147,103 +154,98 @@ return; } - if (strncmp(gdb_input, "qfThreadInfo", 12) == 0) + if ((strncmp(gdb_input, "qfThreadInfo", 12) == 0) + || (strncmp(gdb_input, "qsThreadInfo", 12) == 0)) { LIST_ENTRY* ProcessListHead = (LIST_ENTRY*)KdDebuggerDataBlock->PsActiveProcessHead.Pointer; - LIST_ENTRY* ProcessEntry; + BOOLEAN FirstThread = TRUE; PEPROCESS Process; - - KDDBGPRINT("ProcessListHead: %p.\n", ProcessListHead); + PETHREAD Thread; + char gdb_out[1024]; + char* ptr; + BOOLEAN Resuming = strncmp(gdb_input, "qsThreadInfo", 12) == 0; /* Maybe this was not initialized yet */ if (!ProcessListHead->Flink) { char gdb_out[64]; + + if (Resuming) + { + /* there is only one thread to tell about */ + send_gdb_packet("l"); + return; + } /* Just tell GDB about the current thread */ sprintf(gdb_out, "mp%p.%p", PsGetCurrentProcessId(), PsGetCurrentThreadId()); send_gdb_packet(gdb_out); + /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ gdb_receive_packet(KdContext); - if (strncmp(gdb_input, "qsThreadInfo", 12) != 0) - { - // KdAssert - KDDBGPRINT("Received %s instead of qsThreadInfo!\n", gdb_input); - while(1); - } + gdb_interpret_input(State, MessageData, MessageLength, KdContext); + return; + } + + if (Resuming) + { + if (CurrentThreadEntry == NULL) + CurrentProcessEntry = CurrentProcessEntry->Flink; + } + else + CurrentProcessEntry = ProcessListHead->Flink; + + if (CurrentProcessEntry == ProcessListHead) + { + /* We're done */ send_gdb_packet("l"); return; } - /* List all processes */ - for (ProcessEntry = ProcessListHead->Flink; - ProcessEntry != ProcessListHead; - ProcessEntry = ProcessEntry->Flink) - { - BOOLEAN FirstThread = TRUE; - LIST_ENTRY* ThreadEntry; - PETHREAD Thread; - static char gdb_out[1024]; - char* ptr; - - ptr = gdb_out; - Process = CONTAINING_RECORD(ProcessEntry, EPROCESS, ActiveProcessLinks); - - KDDBGPRINT("gdb_out %p.\n", gdb_out); - - *ptr++ = 'm'; - /* List threads from this process */ - for (ThreadEntry = Process->ThreadListHead.Flink; - ThreadEntry != &Process->ThreadListHead; - ThreadEntry = ThreadEntry->Flink) + Process = CONTAINING_RECORD(CurrentProcessEntry, EPROCESS, ActiveProcessLinks); + + if (Resuming && CurrentThreadEntry != NULL) + CurrentThreadEntry = CurrentThreadEntry->Flink; + else + CurrentThreadEntry = Process->ThreadListHead.Flink; + + ptr = gdb_out; + + *ptr++ = 'm'; + /* List threads from this process */ + for ( ; + CurrentThreadEntry != &Process->ThreadListHead; + CurrentThreadEntry = CurrentThreadEntry->Flink) + { + Thread = CONTAINING_RECORD(CurrentThreadEntry, ETHREAD, ThreadListEntry); + + /* See if we should add a comma */ + if (FirstThread) { - Thread = CONTAINING_RECORD(ThreadEntry, ETHREAD, ThreadListEntry); - - KDDBGPRINT("ptr %p.\n", ptr); - - /* See if we should add a comma */ - if (FirstThread) - { - FirstThread = FALSE; - } - else - { - *ptr++ = ','; - } - - ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), - "p%p.%p", PsGetProcessId(Process), PsGetThreadId(Thread)); - if (ptr > (gdb_out + 1024)) - { - /* send what we got */ - KDDBGPRINT("Sending %s.\n", gdb_out); - send_gdb_packet(gdb_out); - gdb_receive_packet(KdContext); - if (strncmp(gdb_input, "qsThreadInfo", 12) != 0) - { - // KdAssert - KDDBGPRINT("Received %s instead of qsThreadInfo!\n", gdb_input); - while(1); - } - /* Start anew */ - ptr = gdb_out; - *ptr++ = 'm'; - FirstThread = TRUE; - } + FirstThread = FALSE; } - - /* send the list for this process */ - KDDBGPRINT("Sending %s.\n", gdb_out); - send_gdb_packet(gdb_out); - gdb_receive_packet(KdContext); - if (strncmp(gdb_input, "qsThreadInfo", 12) != 0) + else { - // KdAssert - KDDBGPRINT("Received %s instead of qsThreadInfo!\n", gdb_input); - while(1); + *ptr++ = ','; } - } - - /* We're done. Send end-of-list packet */ - send_gdb_packet("l"); + + ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), + "p%p.%p", PsGetProcessId(Process), PsGetThreadId(Thread)); + if (ptr > (gdb_out + 1024)) + { + /* send what we got */ + send_gdb_packet(gdb_out); + /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ + gdb_receive_packet(KdContext); + gdb_interpret_input(State, MessageData, MessageLength, KdContext); + return; + } + } + + /* send the list for this process */ + send_gdb_packet(gdb_out); + CurrentThreadEntry = NULL; + /* GDB can ask anything at this point, it isn't necessarily a qsThreadInfo packet */ + gdb_receive_packet(KdContext); + gdb_interpret_input(State, MessageData, MessageLength, KdContext); return; } @@ -349,6 +351,7 @@ /* Just copy it */ RtlCopyMemory(&CurrentContext, Context, sizeof(*Context)); + KdpSendPacketHandler = NULL; } static @@ -390,6 +393,8 @@ /* Should we bugcheck ? */ while (1); } + + KdpSendPacketHandler = NULL; } static @@ -537,7 +542,7 @@ case 'm': return handle_gdb_read_mem(State, MessageData, MessageLength); case 'q': - handle_gdb_query(KdContext); + handle_gdb_query(State, MessageData, MessageLength, KdContext); break; case 'T': handle_gdb_thread_alive();

1 0

[jgardou] 64145: [KDGDB] - Improve the 'm' (read memory) gdb request
by jgardou＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: jgardou Date: Sun Sep 14 14:27:58 2014 New Revision: 64145 URL: http://svn.reactos.org/svn/reactos?rev=64145&view=rev Log: [KDGDB] - Improve the 'm' (read memory) gdb request Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/gdb_send.c trunk/reactos/drivers/base/kdgdb/kdgdb.h trunk/reactos/drivers/base/kdgdb/kdpacket.c Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Sun Sep 14 14:27:58 2014 @@ -276,6 +276,35 @@ #endif static +void +ReadMemorySendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + + if (PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + { + // KdAssert + KDDBGPRINT("Wrong packet type (%lu) received after DbgKdReadVirtualMemoryApi request.\n", PacketType); + while (1); + } + + if (State->ApiNumber != DbgKdReadVirtualMemoryApi) + { + KDDBGPRINT("Wrong API number (%lu) after DbgKdReadVirtualMemoryApi request.\n", State->ApiNumber); + } + + /* Check status */ + if (!NT_SUCCESS(State->ReturnStatus)) + send_gdb_ntstatus(State->ReturnStatus); + else + send_gdb_memory(MessageData->Buffer, MessageData->Length); + KdpSendPacketHandler = NULL; +} + +static KDSTATUS handle_gdb_read_mem( _Out_ DBGKD_MANIPULATE_STATE64* State, @@ -292,6 +321,10 @@ State->u.ReadMemory.TargetBaseAddress = hex_to_address(&gdb_input[1]); State->u.ReadMemory.TransferCount = hex_to_address(strstr(&gdb_input[1], ",") + 1); + + /* KD will reply with KdSendPacket. Catch it */ + KdpSendPacketHandler = ReadMemorySendHandler; + return KdPacketReceived; } Modified: trunk/reactos/drivers/base/kdgdb/gdb_send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_sen… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] Sun Sep 14 14:27:58 2014 @@ -185,3 +185,15 @@ ptr += sprintf(ptr, "core:%x;", CurrentStateChange.Processor); send_gdb_packet(gdb_out); } + +void +send_gdb_ntstatus( + _In_ NTSTATUS Status) +{ + /* Just build a EXX packet and send it */ + char gdb_out[4]; + gdb_out[0] = 'E'; + exception_code_to_gdb(Status, &gdb_out[1]); + gdb_out[3] = '\0'; + send_gdb_packet(gdb_out); +} Modified: trunk/reactos/drivers/base/kdgdb/kdgdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdgdb.h… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] Sun Sep 14 14:27:58 2014 @@ -52,6 +52,7 @@ void send_gdb_memory(_In_ VOID* Buffer, size_t Length); void gdb_send_debug_io(_In_ PSTRING String); void gdb_send_exception(void); +void send_gdb_ntstatus(_In_ NTSTATUS Status); /* kdcom.c */ KDSTATUS NTAPI KdpPollBreakIn(VOID); Modified: trunk/reactos/drivers/base/kdgdb/kdpacket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdpacke… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdpacket.c [iso-8859-1] Sun Sep 14 14:27:58 2014 @@ -100,10 +100,6 @@ gdb_send_registers((CONTEXT*)MessageData->Buffer); return; #endif - case DbgKdReadVirtualMemoryApi: - /* Answer to 'm' GDB request */ - send_gdb_memory(MessageData->Buffer, State->u.ReadMemory.ActualBytesRead); - break; case DbgKdGetVersionApi: { LIST_ENTRY* DebuggerDataList;

1 0

[jgardou] 64144: [KDGDB] - Add support for the qfThreadInfo GDB request
by jgardou＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: jgardou Date: Sun Sep 14 14:27:44 2014 New Revision: 64144 URL: http://svn.reactos.org/svn/reactos?rev=64144&view=rev Log: [KDGDB] - Add support for the qfThreadInfo GDB request Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/gdb_send.c trunk/reactos/drivers/base/kdgdb/kdcom.c trunk/reactos/drivers/base/kdgdb/kdgdb.h Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_inp… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_input.c [iso-8859-1] Sun Sep 14 14:27:44 2014 @@ -6,6 +6,8 @@ */ #include "kdgdb.h" + +#include <pstypes.h> /* LOCALS *********************************************************************/ static HANDLE gdb_run_thread; @@ -114,7 +116,7 @@ /* q* packets */ static void -handle_gdb_query(void) +handle_gdb_query(_Inout_ PKD_CONTEXT KdContext) { if (strncmp(gdb_input, "qSupported:", 11) == 0) { @@ -145,10 +147,103 @@ return; } - if (strncmp(gdb_input, "qTStatus", 8) == 0) - { - /* We don't support tracepoints. */ - send_gdb_packet("T0"); + if (strncmp(gdb_input, "qfThreadInfo", 12) == 0) + { + LIST_ENTRY* ProcessListHead = (LIST_ENTRY*)KdDebuggerDataBlock->PsActiveProcessHead.Pointer; + LIST_ENTRY* ProcessEntry; + PEPROCESS Process; + + KDDBGPRINT("ProcessListHead: %p.\n", ProcessListHead); + + /* Maybe this was not initialized yet */ + if (!ProcessListHead->Flink) + { + char gdb_out[64]; + /* Just tell GDB about the current thread */ + sprintf(gdb_out, "mp%p.%p", PsGetCurrentProcessId(), PsGetCurrentThreadId()); + send_gdb_packet(gdb_out); + gdb_receive_packet(KdContext); + if (strncmp(gdb_input, "qsThreadInfo", 12) != 0) + { + // KdAssert + KDDBGPRINT("Received %s instead of qsThreadInfo!\n", gdb_input); + while(1); + } + send_gdb_packet("l"); + return; + } + + /* List all processes */ + for (ProcessEntry = ProcessListHead->Flink; + ProcessEntry != ProcessListHead; + ProcessEntry = ProcessEntry->Flink) + { + BOOLEAN FirstThread = TRUE; + LIST_ENTRY* ThreadEntry; + PETHREAD Thread; + static char gdb_out[1024]; + char* ptr; + + ptr = gdb_out; + Process = CONTAINING_RECORD(ProcessEntry, EPROCESS, ActiveProcessLinks); + + KDDBGPRINT("gdb_out %p.\n", gdb_out); + + *ptr++ = 'm'; + /* List threads from this process */ + for (ThreadEntry = Process->ThreadListHead.Flink; + ThreadEntry != &Process->ThreadListHead; + ThreadEntry = ThreadEntry->Flink) + { + Thread = CONTAINING_RECORD(ThreadEntry, ETHREAD, ThreadListEntry); + + KDDBGPRINT("ptr %p.\n", ptr); + + /* See if we should add a comma */ + if (FirstThread) + { + FirstThread = FALSE; + } + else + { + *ptr++ = ','; + } + + ptr += _snprintf(ptr, 1024 - (ptr - gdb_out), + "p%p.%p", PsGetProcessId(Process), PsGetThreadId(Thread)); + if (ptr > (gdb_out + 1024)) + { + /* send what we got */ + KDDBGPRINT("Sending %s.\n", gdb_out); + send_gdb_packet(gdb_out); + gdb_receive_packet(KdContext); + if (strncmp(gdb_input, "qsThreadInfo", 12) != 0) + { + // KdAssert + KDDBGPRINT("Received %s instead of qsThreadInfo!\n", gdb_input); + while(1); + } + /* Start anew */ + ptr = gdb_out; + *ptr++ = 'm'; + FirstThread = TRUE; + } + } + + /* send the list for this process */ + KDDBGPRINT("Sending %s.\n", gdb_out); + send_gdb_packet(gdb_out); + gdb_receive_packet(KdContext); + if (strncmp(gdb_input, "qsThreadInfo", 12) != 0) + { + // KdAssert + KDDBGPRINT("Received %s instead of qsThreadInfo!\n", gdb_input); + while(1); + } + } + + /* We're done. Send end-of-list packet */ + send_gdb_packet("l"); return; } @@ -409,7 +504,7 @@ case 'm': return handle_gdb_read_mem(State, MessageData, MessageLength); case 'q': - handle_gdb_query(); + handle_gdb_query(KdContext); break; case 'T': handle_gdb_thread_alive(); Modified: trunk/reactos/drivers/base/kdgdb/gdb_send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/gdb_sen… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/gdb_send.c [iso-8859-1] Sun Sep 14 14:27:44 2014 @@ -185,36 +185,3 @@ ptr += sprintf(ptr, "core:%x;", CurrentStateChange.Processor); send_gdb_packet(gdb_out); } - -#ifdef KDDEBUG -ULONG KdpDbgPrint(const char* Format, ...) -{ - va_list ap; - CHAR Buffer[512]; - struct _STRING Str; - int Length; - - va_start(ap, Format); - Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); - va_end(ap); - - /* Check if we went past the buffer */ - if (Length == -1) - { - /* Terminate it if we went over-board */ - Buffer[sizeof(Buffer) - 1] = '\n'; - - /* Put maximum */ - Length = sizeof(Buffer); - } - - Str.Buffer = Buffer; - Str.Length = Length; - Str.MaximumLength = sizeof(Buffer); - - gdb_send_debug_io(&Str); - - return 0; -} -#endif - Modified: trunk/reactos/drivers/base/kdgdb/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdcom.c [iso-8859-1] Sun Sep 14 14:27:44 2014 @@ -34,8 +34,11 @@ /* GLOBALS ********************************************************************/ +CPPORT KdComPort; +ULONG KdComPortIrq = 0; // Not used at the moment. +#ifdef KDDEBUG CPPORT KdDebugComPort; -ULONG KdDebugComPortIrq = 0; // Not used at the moment. +#endif /* FUNCTIONS ******************************************************************/ @@ -77,7 +80,7 @@ { NTSTATUS Status; - Status = CpInitialize(&KdDebugComPort, + Status = CpInitialize(&KdComPort, UlongToPtr(BaseArray[ComPortNumber]), ComPortBaudRate); if (!NT_SUCCESS(Status)) @@ -86,7 +89,7 @@ } else { - KdComPortInUse = KdDebugComPort.Address; + KdComPortInUse = KdComPort.Address; return STATUS_SUCCESS; } } @@ -107,10 +110,9 @@ PCHAR CommandLine, PortString, BaudString, IrqString; ULONG Value; - /* Check if e have a LoaderBlock */ + /* Check if we have a LoaderBlock */ if (LoaderBlock) { - /* Get the Command Line */ CommandLine = LoaderBlock->LoadOptions; @@ -182,10 +184,15 @@ { /* Read and set it */ Value = atol(IrqString + 1); - if (Value) KdDebugComPortIrq = Value; + if (Value) KdComPortIrq = Value; } } } + +#ifdef KDDEBUG + /* Use DEBUGPORT=COM1 if you want to debug KDGDB, as we use COM2 for debugging it */ + CpInitialize(&KdDebugComPort, UlongToPtr(BaseArray[2]), DEFAULT_BAUD_RATE); +#endif /* Initialize the port */ return KdpPortInitialize(ComPortNumber, ComPortBaudRate); @@ -210,7 +217,7 @@ KdpSendByte(_In_ UCHAR Byte) { /* Send the byte */ - CpPutByte(&KdDebugComPort, Byte); + CpPutByte(&KdComPort, Byte); } KDSTATUS @@ -218,7 +225,7 @@ KdpPollByte(OUT PUCHAR OutByte) { /* Poll the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, FALSE, FALSE) == CP_GET_SUCCESS) + if (CpGetByte(&KdComPort, OutByte, FALSE, FALSE) == CP_GET_SUCCESS) { return KdPacketReceived; } @@ -233,7 +240,7 @@ KdpReceiveByte(_Out_ PUCHAR OutByte) { /* Get the byte */ - if (CpGetByte(&KdDebugComPort, OutByte, TRUE, FALSE) == CP_GET_SUCCESS) + if (CpGetByte(&KdComPort, OutByte, TRUE, FALSE) == CP_GET_SUCCESS) { return KdPacketReceived; } @@ -266,4 +273,34 @@ return KdPacketTimedOut; } +#ifdef KDDEBUG +ULONG KdpDbgPrint(const char* Format, ...) +{ + va_list ap; + static CHAR Buffer[512]; + char* ptr; + int Length; + + va_start(ap, Format); + Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); + va_end(ap); + + /* Check if we went past the buffer */ + if (Length == -1) + { + /* Terminate it if we went over-board */ + Buffer[sizeof(Buffer) - 1] = '\n'; + + /* Put maximum */ + Length = sizeof(Buffer); + } + + ptr = Buffer; + while (Length--) + CpPutByte(&KdDebugComPort, *ptr++); + + return 0; +} +#endif + /* EOF */ Modified: trunk/reactos/drivers/base/kdgdb/kdgdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/kdgdb.h… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/kdgdb.h [iso-8859-1] Sun Sep 14 14:27:44 2014 @@ -16,7 +16,7 @@ #include <windbgkd.h> #include <kddll.h> -// #define KDDEBUG /* uncomment to enable debugging this dll */ +#define KDDEBUG /* uncomment to enable debugging this dll */ #ifndef KDDEBUG #define KDDBGPRINT(...)

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