Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 64163: [KSECDD] - Implement Encrypt / DecryptMemory in KSecDD (it uses AES for 16 byte aligned sizes, and 3DES for 8 byte aligned sizes) - Install KSecDD - Actually use KSecDD for Encryp...
by tkreuzer＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: tkreuzer Date: Mon Sep 15 21:05:38 2014 New Revision: 64163 URL: http://svn.reactos.org/svn/reactos?rev=64163&view=rev Log: [KSECDD] - Implement Encrypt / DecryptMemory in KSecDD (it uses AES for 16 byte aligned sizes, and 3DES for 8 byte aligned sizes) - Install KSecDD - Actually use KSecDD for Encryption from advapi32 Added: trunk/reactos/lib/cryptlib/aes.c - copied unchanged from r64143, trunk/reactos/dll/win32/rsaenh/aes.c trunk/reactos/lib/cryptlib/des.c - copied unchanged from r64143, trunk/reactos/dll/win32/rsaenh/des.c trunk/reactos/lib/cryptlib/tomcrypt.h - copied unchanged from r64143, trunk/reactos/dll/win32/rsaenh/tomcrypt.h Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/advapi32/misc/sysfunc.c trunk/reactos/drivers/crypto/ksecdd/crypt.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.c trunk/reactos/drivers/crypto/ksecdd/ksecdd.h trunk/reactos/drivers/crypto/ksecdd/random.c trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/lib/cryptlib/CMakeLists.txt 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] Mon Sep 15 21:05:38 2014 @@ -1477,6 +1477,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" + +; Kernel Security Support Provider Interface Driver +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\ksecdd.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001 ; MPU-401 MIDI driver HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base" 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] Mon Sep 15 21:05:38 2014 @@ -12,15 +12,11 @@ */ #include <advapi32.h> +#include <ntsecapi.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', '!', '@', '#', '$', '%' }; @@ -635,11 +631,11 @@ InitializeObjectAttributes(&ObjectAttributes, &DeviceName, - 0x18, + OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenFile(&DeviceHandle, - 0x100001, + FILE_READ_DATA | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, @@ -744,9 +740,6 @@ { 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; @@ -798,9 +791,6 @@ { 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; Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/crypt.c [iso-8859-1] Mon Sep 15 21:05:38 2014 @@ -10,6 +10,258 @@ #include "ksecdd.h" +MD5_CTX KsecLoadTimeStartMd5s[2]; +DES3_KEY KsecGlobalDes3Key; +AES_KEY KsecGlobalAesKey; + +typedef struct _KSEC_PROCESS_DATA +{ + PEPROCESS Process; + HANDLE ProcessId; + LONGLONG CreateTime; + ULONG_PTR DirectoryTableBase; +} KSEC_PROCESS_DATA, *PKSEC_PROCESS_DATA; + +typedef struct _KSEC_LOGON_DATA +{ + LUID LogonId; +} KSEC_LOGON_DATA, *PKSEC_LOGON_DATA; + +VOID +NTAPI +KsecInitializeEncryptionSupport ( + VOID) +{ + KSEC_ENTROPY_DATA EntropyData; + MD5_CTX Md5Context; + UCHAR KeyDataBuffer[32]; + + KsecGatherEntropyData(&EntropyData); + MD5Init(&Md5Context); + MD5Update(&Md5Context, (PVOID)&EntropyData, sizeof(EntropyData)); + KsecLoadTimeStartMd5s[0] = Md5Context; + MD5Final(&Md5Context); + RtlCopyMemory(KeyDataBuffer, &Md5Context.digest, 16); + + KsecGatherEntropyData(&EntropyData); + Md5Context = KsecLoadTimeStartMd5s[0]; + MD5Update(&Md5Context, (PVOID)&EntropyData, sizeof(EntropyData)); + KsecLoadTimeStartMd5s[1] = Md5Context; + MD5Final(&Md5Context); + RtlCopyMemory(&KeyDataBuffer[16], &Md5Context.digest, 16); + + /* Create the global keys */ + aes_setup(KeyDataBuffer, 32, 0, &KsecGlobalAesKey); + des3_setup(KeyDataBuffer, 24, 0, &KsecGlobalDes3Key); + + /* Erase the temp data */ + RtlSecureZeroMemory(KeyDataBuffer, sizeof(KeyDataBuffer)); + RtlSecureZeroMemory(&Md5Context, sizeof(Md5Context)); +} + +static +VOID +KsecGetKeyData ( + _Out_ UCHAR KeyData[32], + _In_ ULONG OptionFlags) +{ + MD5_CTX Md5Contexts[2]; + KSEC_PROCESS_DATA ProcessData; + KSEC_LOGON_DATA LogonData; + PEPROCESS CurrentProcess; + PACCESS_TOKEN Token; + + /* We need to generate the key, start with our load MD5s */ + Md5Contexts[0] = KsecLoadTimeStartMd5s[0]; + Md5Contexts[1] = KsecLoadTimeStartMd5s[1]; + + /* Get the current process */ + CurrentProcess = PsGetCurrentProcess(); + + if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_PROCESS) + { + ProcessData.Process = CurrentProcess; + ProcessData.ProcessId = CurrentProcess->UniqueProcessId; + ProcessData.CreateTime = PsGetProcessCreateTimeQuadPart(CurrentProcess); + ProcessData.DirectoryTableBase = CurrentProcess->Pcb.DirectoryTableBase[0]; + MD5Update(&Md5Contexts[0], (PVOID)&ProcessData, sizeof(ProcessData)); + MD5Update(&Md5Contexts[1], (PVOID)&ProcessData, sizeof(ProcessData)); + } + else // if (OptionFlags == RTL_ENCRYPT_OPTION_SAME_LOGON) + { + Token = PsReferencePrimaryToken(CurrentProcess); + SeQueryAuthenticationIdToken(Token, &LogonData.LogonId); + PsDereferencePrimaryToken(Token); + MD5Update(&Md5Contexts[0], (PVOID)&LogonData, sizeof(LogonData)); + MD5Update(&Md5Contexts[1], (PVOID)&LogonData, sizeof(LogonData)); + } + + /* Finalize the MD5s */ + MD5Final(&Md5Contexts[0]); + MD5Final(&Md5Contexts[1]); + + /* Copy the md5 data */ + RtlCopyMemory(KeyData, &Md5Contexts[0].digest, 16); + RtlCopyMemory((PUCHAR)KeyData + 16, &Md5Contexts[1].digest, 16); + + /* Erase the temp data */ + RtlSecureZeroMemory(&Md5Contexts, sizeof(Md5Contexts)); +} + +static +VOID +KsecGetDes3Key ( + _Out_ PDES3_KEY Des3Key, + _In_ ULONG OptionFlags) +{ + UCHAR KeyDataBuffer[32]; + + /* Check if the caller allows cross process encryption */ + if (OptionFlags == RTL_ENCRYPT_OPTION_CROSS_PROCESS) + { + /* Return our global cached DES3 key */ + *Des3Key = KsecGlobalDes3Key; + } + else + { + /* Setup the key */ + KsecGetKeyData(KeyDataBuffer, OptionFlags); + des3_setup(KeyDataBuffer, 24, 0, Des3Key); + + /* Erase the temp data */ + RtlSecureZeroMemory(KeyDataBuffer, sizeof(KeyDataBuffer)); + } +} + +static +VOID +KsecGetAesKey ( + _Out_ PAES_KEY AesKey, + _In_ ULONG OptionFlags) +{ + UCHAR KeyDataBuffer[32]; + + /* Check if the caller allows cross process encryption */ + if (OptionFlags == RTL_ENCRYPT_OPTION_CROSS_PROCESS) + { + /* Return our global cached AES key */ + *AesKey = KsecGlobalAesKey; + } + else + { + /* Setup the key */ + KsecGetKeyData(KeyDataBuffer, OptionFlags); + aes_setup(KeyDataBuffer, 32, 0, AesKey); + + /* Erase the temp data */ + RtlSecureZeroMemory(KeyDataBuffer, sizeof(KeyDataBuffer)); + } +} + +static +VOID +KsecEncryptMemoryDes3 ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags) +{ + UCHAR EncryptedBlockData[8]; + DES3_KEY Des3Key; + + /* Get they triple DES key */ + KsecGetDes3Key(&Des3Key, OptionFlags); + + /* Do the triple DES encryption */ + while (Length >= sizeof(EncryptedBlockData)) + { + des3_ecb_encrypt(Buffer, EncryptedBlockData, &Des3Key); + RtlCopyMemory(Buffer, EncryptedBlockData, sizeof(EncryptedBlockData)); + Buffer = (PUCHAR)Buffer + sizeof(EncryptedBlockData); + Length -= sizeof(EncryptedBlockData); + } + + /* Erase the key data */ + RtlSecureZeroMemory(&Des3Key, sizeof(Des3Key)); +} + +static +VOID +KsecDecryptMemoryDes3 ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags) +{ + UCHAR BlockData[8]; + DES3_KEY Des3Key; + + /* Get they triple DES key */ + KsecGetDes3Key(&Des3Key, OptionFlags); + + /* Do the triple DES decryption */ + while (Length >= sizeof(BlockData)) + { + des3_ecb_decrypt(Buffer, BlockData, &Des3Key); + RtlCopyMemory(Buffer, BlockData, sizeof(BlockData)); + Buffer = (PUCHAR)Buffer + sizeof(BlockData); + Length -= sizeof(BlockData); + } + + /* Erase the key data */ + RtlSecureZeroMemory(&Des3Key, sizeof(Des3Key)); +} + +static +VOID +KsecEncryptMemoryAes ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags) +{ + UCHAR EncryptedBlockData[16]; + AES_KEY AesKey; + + /* Get they AES key */ + KsecGetAesKey(&AesKey, OptionFlags); + + /* Do the AES encryption */ + while (Length >= sizeof(EncryptedBlockData)) + { + aes_ecb_encrypt(Buffer, EncryptedBlockData, &AesKey); + RtlCopyMemory(Buffer, EncryptedBlockData, sizeof(EncryptedBlockData)); + Buffer = (PUCHAR)Buffer + sizeof(EncryptedBlockData); + Length -= sizeof(EncryptedBlockData); + } + + /* Erase the key data */ + RtlSecureZeroMemory(&AesKey, sizeof(AesKey)); +} + +static +VOID +KsecDecryptMemoryAes ( + _Inout_ PVOID Buffer, + _In_ ULONG Length, + _In_ ULONG OptionFlags) +{ + UCHAR BlockData[16]; + AES_KEY AesKey; + + /* Get they AES key */ + KsecGetAesKey(&AesKey, OptionFlags); + + /* Do the AES decryption */ + while (Length >= sizeof(BlockData)) + { + aes_ecb_decrypt(Buffer, BlockData, &AesKey); + RtlCopyMemory(Buffer, BlockData, sizeof(BlockData)); + Buffer = (PUCHAR)Buffer + sizeof(BlockData); + Length -= sizeof(BlockData); + } + + /* Erase the key data */ + RtlSecureZeroMemory(&AesKey, sizeof(AesKey)); +} + NTSTATUS NTAPI KsecEncryptMemory ( @@ -17,6 +269,31 @@ _In_ ULONG Length, _In_ ULONG OptionFlags) { + /* Validate parameter */ + if (OptionFlags > RTL_ENCRYPT_OPTION_SAME_LOGON) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if the length is not 16 bytes aligned */ + if (Length & 15) + { + /* Is it at least 8 bytes aligned? */ + if (Length & 7) + { + /* No, we can't deal with it! */ + return STATUS_INVALID_PARAMETER; + } + + /* Use triple DES encryption */ + KsecEncryptMemoryDes3(Buffer, Length, OptionFlags); + } + else + { + /* Use AES encryption */ + KsecEncryptMemoryAes(Buffer, Length, OptionFlags); + } + return STATUS_SUCCESS; } @@ -27,5 +304,30 @@ _In_ ULONG Length, _In_ ULONG OptionFlags) { + /* Validate parameter */ + if (OptionFlags > RTL_ENCRYPT_OPTION_SAME_LOGON) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if the length is not 16 bytes aligned */ + if (Length & 15) + { + /* Is it at least 8 bytes aligned? */ + if (Length & 7) + { + /* No, we can't deal with it! */ + return STATUS_INVALID_PARAMETER; + } + + /* Use triple DES encryption */ + KsecDecryptMemoryDes3(Buffer, Length, OptionFlags); + } + else + { + /* Use AES encryption */ + KsecDecryptMemoryAes(Buffer, Length, OptionFlags); + } + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/crypto/ksecdd/ksecdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/ksec… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/ksecdd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/ksecdd.c [iso-8859-1] Mon Sep 15 21:05:38 2014 @@ -52,5 +52,8 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = KsecDdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = KsecDdDispatch; + /* Initialize */ + KsecInitializeEncryptionSupport(); + return STATUS_SUCCESS; } 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] Mon Sep 15 21:05:38 2014 @@ -8,11 +8,15 @@ #define _NO_KSECDD_IMPORT_ #include <ntifs.h> -#include <ndk/extypes.h> -#include <ndk/rtlfuncs.h> -#include <ndk/lpcfuncs.h> -#include <ndk/obfuncs.h> +#include <ndk/exfuncs.h> +#include <pseh/pseh2.h> #include <ntstrsafe.h> + +#include <md4.h> +#include <md5.h> +#include <tomcrypt.h> +typedef aes_key AES_KEY, *PAES_KEY; +typedef des3_key DES3_KEY, *PDES3_KEY; #define STATUS_KSEC_INTERNAL_ERROR ((NTSTATUS)0x80090304) @@ -70,12 +74,21 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS +NTAPI +KsecGatherEntropyData( + PKSEC_ENTROPY_DATA EntropyData); NTSTATUS NTAPI KsecGenRandom( PVOID Buffer, SIZE_T Length); + +VOID +NTAPI +KsecInitializeEncryptionSupport ( + VOID); NTSTATUS NTAPI @@ -91,23 +104,3 @@ _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/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/rand… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/random.c [iso-8859-1] Mon Sep 15 21:05:38 2014 @@ -9,10 +9,6 @@ /* INCLUDES *******************************************************************/ #include "ksecdd.h" -#include <ndk/exfuncs.h> -#include <ndk/kefuncs.h> -#include <pseh/pseh2.h> -#include <md4.h> #define NDEBUG #include <debug.h> @@ -69,8 +65,8 @@ } /* Read the CPU event counter MSRs */ - MachineSpecificCounters->Ctr0 = __readmsr(0x12); - MachineSpecificCounters->Ctr1 = __readmsr(0x13); + //MachineSpecificCounters->Ctr0 = __readmsr(0x12); + //MachineSpecificCounters->Ctr1 = __readmsr(0x13); /* Check if this is an MMX capable CPU */ if (ExIsProcessorFeaturePresent(PF_MMX_INSTRUCTIONS_AVAILABLE)) Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Mon Sep 15 21:05:38 2014 @@ -666,8 +666,17 @@ } TRUSTED_DOMAIN_FULL_INFORMATION, *PTRUSTED_DOMAIN_FULL_INFORMATION; #define RtlGenRandom SystemFunction036 +#define RtlEncryptMemory SystemFunction040 +#define RtlDecryptMemory SystemFunction041 BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); +NTSTATUS WINAPI RtlEncryptMemory(PVOID Memory, ULONG MemorySize, ULONG OptionFlags); +NTSTATUS WINAPI RtlDecryptMemory(PVOID Memory, ULONG MemorySize, ULONG OptionFlags); + +#define RTL_ENCRYPT_MEMORY_SIZE 8 +#define RTL_ENCRYPT_OPTION_SAME_PROCESS 0x00 +#define RTL_ENCRYPT_OPTION_CROSS_PROCESS 0x01 +#define RTL_ENCRYPT_OPTION_SAME_LOGON 0x02 NTSTATUS NTAPI LsaAddAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING,ULONG); NTSTATUS NTAPI LsaAddPrivilegesToAccount(LSA_HANDLE, PPRIVILEGE_SET); Modified: trunk/reactos/lib/cryptlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cryptlib/CMakeLists.tx… ============================================================================== --- trunk/reactos/lib/cryptlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cryptlib/CMakeLists.txt [iso-8859-1] Mon Sep 15 21:05:38 2014 @@ -1,5 +1,7 @@ add_library(cryptlib + aes.c + des.c md4.c md5.c mvAesAlg.c

1 0

[tkreuzer] 64162: [ADVAPI32_APITEST] - Add tests for RtlEncrypt/DecryptMemory
by tkreuzer＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: tkreuzer Date: Mon Sep 15 21:04:03 2014 New Revision: 64162 URL: http://svn.reactos.org/svn/reactos?rev=64162&view=rev Log: [ADVAPI32_APITEST] - Add tests for RtlEncrypt/DecryptMemory Added: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c (with props) Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/advapi32/testlist.c Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Mon Sep 15 21:04:03 2014 @@ -3,6 +3,7 @@ CreateService.c LockDatabase.c QueryServiceConfig2.c + RtlEncryptMemory.c SaferIdentifyLevel.c testlist.c) Added: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/RtlEncr… ============================================================================== --- trunk/rostests/apitests/advapi32/RtlEncryptMemory.c (added) +++ trunk/rostests/apitests/advapi32/RtlEncryptMemory.c [iso-8859-1] Mon Sep 15 21:04:03 2014 @@ -0,0 +1,38 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlEncrypt/DecryptMemory + * PROGRAMMER: Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> +#include <winsafer.h> +#include <Ntsecapi.h> + +START_TEST(RtlEncryptMemory) +{ + static const CHAR const TestData[32] = "This is some test Message!!!"; + CHAR Buffer[32]; + NTSTATUS Status; + + /* Size must be aligned to 8 bytes */ + Status = RtlEncryptMemory(Buffer, 7, RTL_ENCRYPT_OPTION_SAME_PROCESS); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER); + + /* Buffer must not be aligned to 8 bytes */ + Status = RtlEncryptMemory(&Buffer[1], 8, RTL_ENCRYPT_OPTION_SAME_PROCESS); + ok_ntstatus(Status, STATUS_SUCCESS); + + RtlCopyMemory(Buffer, TestData, sizeof(Buffer)); + Status = RtlEncryptMemory(Buffer, sizeof(Buffer), RTL_ENCRYPT_OPTION_SAME_PROCESS); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 0); + Status = RtlDecryptMemory(Buffer, sizeof(Buffer), RTL_ENCRYPT_OPTION_SAME_PROCESS); + ok_ntstatus(Status, STATUS_SUCCESS); + ok_int(RtlEqualMemory(Buffer, TestData, sizeof(Buffer)), 1); + +} Propchange: trunk/rostests/apitests/advapi32/RtlEncryptMemory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Mon Sep 15 21:04:03 2014 @@ -6,6 +6,7 @@ extern void func_CreateService(void); extern void func_LockDatabase(void); extern void func_QueryServiceConfig2(void); +extern void func_RtlEncryptMemory(void); extern void func_SaferIdentifyLevel(void); const struct test winetest_testlist[] = @@ -13,6 +14,7 @@ { "CreateService", func_CreateService }, { "LockDatabase" , func_LockDatabase }, { "QueryServiceConfig2", func_QueryServiceConfig2 }, + { "RtlEncryptMemory", func_RtlEncryptMemory }, { "SaferIdentifyLevel", func_SaferIdentifyLevel }, { 0, 0 }

1 0

[dreimer] 64161: [RAPPS] Update Database for Kiel. Add Foxit Reader to Database.
by dreimer＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: dreimer Date: Mon Sep 15 20:10:09 2014 New Revision: 64161 URL: http://svn.reactos.org/svn/reactos?rev=64161&view=rev Log: [RAPPS] Update Database for Kiel. Add Foxit Reader to Database. Added: trunk/reactos/base/applications/rapps/rapps/foxit.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mcwin32.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mirc.txt trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt trunk/reactos/base/applications/rapps/rapps/npp.txt trunk/reactos/base/applications/rapps/rapps/openoffice.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/peazip.txt trunk/reactos/base/applications/rapps/rapps/pspad.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = Orwell Dev-C++ MinGW32 -Version = 5.7.0 +Version = 5.7.1 Licence = GPLv2 Description = A maintained version of Dev-C++. It contains MinGW32 compiler. Size = 60.2 MB Category = 7 URLSite = http://orwelldevcpp.blogspot.com/ -URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… +URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = Orwell Dev-C++ TDM GCC x64 -Version = 5.7.0 +Version = 5.7.1 Licence = GPLv2 Description = A maintained version of Dev-C++. It contains 64 bit TDM-GCC compiler. Size = 44.7 MB Category = 7 URLSite = http://orwelldevcpp.blogspot.com/ -URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… +URLDownload = http://download.sourceforge.net/project/orwelldevcpp/Setup%20Releases/Dev-C… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -2,95 +2,95 @@ ; Turkish translation by Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) [Section] -Name = Mozilla Firefox 31 -Version = 31.0 +Name = Mozilla Firefox 32 +Version = 32.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 30.75 MB Category = 5 URLSite = http://www.mozilla.org/en-US/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/en-US/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/en-US/… CDPath = none [Section.0405] Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. Size = 30.6 MB URLSite = http://www.mozilla.org/cs/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/cs/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/cs/Fir… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 30.56 MB URLSite = http://www.mozilla.org/de/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/de/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/de/Fir… [Section.040a] Description = El mÃ¡s popular y uno de los mejores navegadores web gratuitos que hay. Size = 30.5 MB URLSite = http://www.mozilla.org/es-ES/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/es-ES/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/es-ES/… [Section.040c] Description = Le navigateur web gratuit le plus populaire et l'un des meilleurs. Size = 30,85 Mo URLSite = http://www.mozilla.org/fr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/fr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/fr/Fir… [Section.0410] Description = Il piÃ¹ popolare e uno dei migliori web browser gratuiti. Size = 30.49 MB URLSite = http://www.mozilla.org/it/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/it/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/it/Fir… [Section.0413] Description = De meest populaire en een van de beste gratis Web browsers. Size = 31.2 MB URLSite = http://www.mozilla.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/nl/Fir… [Section.0414] Description = Mest populÃ¦re og best ogsÃ¥ gratis nettleserene der ute. Size = 30.55 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nb-NO/Fi… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/nb-NO/… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 31.42 MB URLSite = http://www.mozilla.org/pl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/pl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/pl/Fir… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune navigatoare web gratuite existente. Size = 31,0 Mo URLSite = http://www.mozilla.org/ro/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/ro/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/ro/Fir… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 30.94 MB URLSite = http://www.mozilla.org/ru/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/ru/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/ru/Fir… [Section.041b] Description = NajpopulÃ¡rnejÅ¡Ã a jeden z najlepÅ¡Ãch slobodnÃ½ webovÃ½ch prehliadaÄov. Size = 31.23 MB URLSite = http://www.mozilla.org/sk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/sk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/sk/Fir… [Section.041f] Description = ÃzgÃ¼r UmÃ»mÃ® AÄ tarayÄ±cÄ±larÄ± arasÄ±nda en tutulanÄ± ve en iyilerinden biri. Size = 30,58 MB URLSite = http://www.mozilla.org/tr/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/tr/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/tr/Fir… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð±ÐµÐ·Ð¿Ð»Ð°ÑÐ½Ð¸Ñ Ð²ÐµÐ±-Ð±ÑÐ°ÑÐ·ÐµÑÑÐ². Size = 30.97 MB URLSite = http://www.mozilla.org/uk/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/uk/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/uk/Fir… [Section.0813] Description = De meest populaire en een van de beste gratis Web browsers. Size = 31.2 MB URLSite = http://www.mozilla.org/nl/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nl/Firef… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/32.0.1/win32/nl/Fir… Added: trunk/reactos/base/applications/rapps/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/foxit.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/foxit.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -0,0 +1,16 @@ +[Section] +Name = Foxit Reader +Version = 6.2.3.815 +Licence = Freeware +Description = The best PDF reader next to Adobe Reader itself. +Size = 36.0 MB +Category = 6 +URLSite = http://www.foxitsoftware.com/Secure_PDF_Reader/ +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/6.x/6.2/enu/Fox… +CDPath = none + +[Section.0407] +Version = 6.1.5.0624 +Description = Neben Adobe Reader der beste PDF Reader. +Size = 44.2 MB +URLDownload = http://cdn01.foxitsoftware.com/pub/foxit/reader/desktop/win/6.x/6.1/L10N/Fo… Propchange: trunk/reactos/base/applications/rapps/rapps/foxit.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = FreeBASIC -Version = 0.90.1 +Version = 1.00.0 Licence = GPL/LGPL Description = Open Source BASIC Compiler. The BASIC syntax is compatible to QBASIC. -Size = 7.4 MB +Size = 9.0 MB Category = 7 URLSite = http://www.freebasic.net/ -URLDownload = http://download.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASI… +URLDownload = http://download.sourceforge.net/project/fbc/Binaries%20-%20Windows/FreeBASI… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/libreoffice.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = LibreOffice -Version = 4.2.5 +Version = 4.3.1 Licence = LGPL Description = A powerful and open source office suite. It has been forked from OpenOffice. -Size = 209.36 MB +Size = 214.52 MB Category = 6 URLSite = http://www.documentfoundation.org/ -URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.2.5/win/x86/Lib… +URLDownload = http://download.documentfoundation.org/libreoffice/stable/4.3.1/win/x86/Lib… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mcwin32.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mcwin32.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,18 +3,18 @@ [Section] Name = Midnight Commander for Windows -Version = Build 183 (4.8.11) +Version = Build 185 (4.8.12) Licence = GPLv3 Description = 32-bit Windows port of GNU Midnight Commander. Size = 2.35 MB Category = 12 URLSite = http://sourceforge.net/projects/mcwin32/ -URLDownload = http://download.sourceforge.net/project/mcwin32/mcwin32-build183-setup.exe +URLDownload = http://download.sourceforge.net/project/mcwin32/mcwin32-build185-setup.exe CDPath = none [Section.0410] Name = Midnight Commander per Windows -Version = Revisione 183 (4.8.11) +Version = Revisione 185 (4.8.12) Licence = GPL versione 3 Description = Un porting Windows 32bit di Midnight Commander. @@ -25,13 +25,13 @@ [Section.0418] Name = Midnight Commander pentru Windows -Version = Versiunea 183 (4.8.11) +Version = Versiunea 185 (4.8.12) Description = GNU Midnight Commander pentru Windows pe 32-biÈi. Size = 2,35 Mo [Section.041f] Name = Midnight Commander (Windows iÃ§in) -Version = YapÄ± 183 (4.8.11) +Version = YapÄ± 185 (4.8.12) Licence = GPL 3. sÃ¼rÃ¼m Description = GNU Midnight Commander'Ä±n 32 bitlik Windows uyarlamasÄ±dÄ±r. Size = 2,35 MB Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = Miranda IM -Version = 0.10.23 +Version = 0.10.24 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 3.8 MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://files.miranda-im.org/stable/0.10.23.0/miranda-im-v0.10.23-unicode.exe +URLDownload = http://files.miranda-im.org/stable/0.10.24.0/miranda-im-v0.10.24-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirc.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = mIRC 7 -Version = 7.34 +Version = 7.36 Licence = Shareware Description = The most popular client for the Internet Relay Chat (IRC). -Size = 1.89 MB +Size = 2.17 MB Category = 5 URLSite = http://www.mirc.com/ -URLDownload = http://download.mirc.com/9/mirc734.exe +URLDownload = http://download.mirc.com/10/mirc736.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Le client le plus populaire pour l'Internet Relay Chat (IRC). -Size = 1,89 Mo +Size = 2,17 Mo [Section.0410] Description = Il famoso client per Internet Relay Chat (IRC). @@ -34,12 +34,12 @@ [Section.0418] Licence = Versiune de evaluare Description = Cel mai popular client de IRC (Internet Relay Chat). -Size = 1,89 Mo +Size = 2,17 Mo [Section.041f] Licence = PaylaÅÄ±mlÄ± Description = UmÃ»mÃ® AÄ EÅ ZamanlÄ± SÃ¶yleÅi (IRC) iÃ§in en Ã§ok tutulan istemci. -Size = 1,89 MB +Size = 2,17 MB [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÐºÐ»ÑÑÐ½Ñ IRC (Internet Relay Chat). Modified: trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -1,12 +1,12 @@ [Section] Name = NirLauncher -Version = 1.18.69 +Version = 1.18.76 Licence = Freeware Description = A package of more than 180 utilities for Windows. Size = 19.8 MB Category = 12 URLSite = http://launcher.nirsoft.net/ -URLDownload = http://download.nirsoft.net/nirsoft_package_1.18.69.zip +URLDownload = http://download.nirsoft.net/nirsoft_package_1.18.76.zip CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/npp.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = Notepad++ -Version = 6.6.8 +Version = 6.6.9 Licence = GPL Description = A text editor. -Size = 7.55 MB +Size = 7.58 MB Category = 6 URLSite = http://notepad-plus-plus.org/ -URLDownload = http://download.tuxfamily.org/notepadplus/6.6.8/npp.6.6.8.Installer.exe +URLDownload = http://download.tuxfamily.org/notepadplus/6.6.9/npp.6.6.9.Installer.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Un Ã©diteur de texte. -Size = 7,55 Mo +Size = 7,58 Mo URLSite = http://notepad-plus-plus.org/fr/ [Section.0410] @@ -34,7 +34,7 @@ [Section.0418] Description = Un editor de text. -Size = 7,55 Mo +Size = 7,58 Mo [Section.0419] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. @@ -44,7 +44,7 @@ [Section.041f] Description = Bir metin dÃ¼zenleyicisi. -Size = 7,55 MB +Size = 7,58 MB [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Modified: trunk/reactos/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,69 +3,68 @@ [Section] Name = OpenOffice 4.1 -Version = 4.1.0 +Version = 4.1.1 Licence = LGPL Description = The open source office suite. -Size = 136.79 MB +Size = 140.9 MB Category = 6 URLSite = http://www.openoffice.org/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… CDPath = none [Section.0407] Description = DIE Open Source Office Suite. -Size = 154.88 MB +Size = 164.9 MB URLSite = http://www.openoffice.org/de/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.040a] Description = La suite de ofimÃ¡tica de cÃ³digo abierto. -Size = 126.29 MB +Size = 130.4 MB URLSite = http://www.openoffice.org/es/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.040c] Description = LA suite bureautique open source. -Size = 127,22 Mo +Size = 132,5 Mo URLSite = http://www.openoffice.org/fr/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.0410] Description = La suite di office Open Source. -Size = 132.39 MB +Size = 136.3 MB URLSite = http://www.openoffice.org/it/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.0413] Description = Open-bron Office Pakket. -Size = 132.11 MB +Size = 138.9 MB URLSite = http://www.openoffice.org/nl/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.0415] Description = Otwarty pakiet biurowy. -Size = 127.47 MB +Size = 131.6 MB URLSite = http://www.openoffice.org/pl/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.0418] Description = Suita de aplicaÈii de biroticÄ cu surse deschise. -Size = 136,79 Mo +Size = 140,9 Mo URLSite = http://www.openoffice.org/ro/ [Section.041f] Description = Bir aÃ§Ä±k kaynak ofis paketi. -Size = 124,36 MB +Size = 128,3 MB URLSite = http://www.openoffice.org/tr/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð¾ÑÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÐºÐµÑ. -Size = 136.79 MB URLSite = http://www.openoffice.org/ua/ [Section.0813] Description = Open-bron Office Pakket. -Size = 132.11 MB +Size = 138.9 MB URLSite = http://www.openoffice.org/nl/ -URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.0/binaries… +URLDownload = http://download.sourceforge.net/project/openofficeorg.mirror/4.1.1/binaries… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = OpenTTD -Version = 1.4.1 +Version = 1.4.2 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 7.0 MB Category = 4 URLSite = http://www.openttd.org/ -URLDownload = http://binaries.openttd.org/releases/1.4.1/openttd-1.4.1-windows-win32.exe +URLDownload = http://binaries.openttd.org/releases/1.4.2/openttd-1.4.2-windows-win32.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/peazip.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/peazip.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = PeaZip -Version = 5.4.0 +Version = 5.4.1 Licence = LGPL v3, OpenCandy EULA Description = PeaZip is a free, cross-platform, open source file and archive manager. It supports over 150 archive formats. Size = 5.8 MB Category = 12 URLSite = http://peazip.sourceforge.net/ -URLDownload = http://download.sourceforge.net/project/peazip/5.4.0/peazip-5.4.0.WINDOWS.e… +URLDownload = http://download.sourceforge.net/project/peazip/5.4.1/peazip-5.4.1.WINDOWS.e… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/pspad.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/pspad.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -4,13 +4,13 @@ [Section] Name = PSPad -Version = 4.5.7 +Version = 4.5.8 Licence = Freeware Description = A text editor. Size = 4.46 MB Category = 6 URLSite = http://www.pspad.com -URLDownload = http://31.31.78.126/pspad/pspad457inst_en.exe +URLDownload = http://www.fosshub.com/download/pspad458instim_en.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/qmmp.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -4,13 +4,13 @@ [Section] Name = Qmmp (Qt-based Multimedia Player) -Version = 0.8.0 +Version = 0.8.1 Licence = GPL Description = Qmmp is an audio-player, written with the help of the Qt library. The user interface is similar to WinAMP or XMMS. Alternative user interfaces also are available. -Size = 12.49 MB +Size = 12.51 MB Category = 1 URLSite = http://qmmp.ylsoftware.com/ -URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.8.0-win32.exe +URLDownload = http://qmmp.ylsoftware.com/files/windows/qmmp-0.8.1-win32.exe CDPath = none [Section.0407] @@ -25,7 +25,7 @@ [Section.0418] Name = Qmmp (Lector Multimedia bazat pe Qt) Description = Qmmp este un lector audio, ce utilizeazÄ biblioteca QT. InterfaÈa de utilizare e asemÄnÄtoare cu cea din WinAMP sau XMMS. De asemenea sunt disponibile interfeÈe de utilizare alternative. -Size = 12,49 Mo +Size = 12,51 Mo [Section.0419] Description = ÐÑÐ´Ð¸Ð¾Ð¿Ð»ÐµÐµÑ Qmmp (Qt-based Multimedia Player). @@ -33,4 +33,4 @@ [Section.041f] Name = Qmmp (Qt TabanlÄ± Ãoklu Ortam OynatÄ±cÄ±sÄ±) Description = Qmmp, Qt kitaplÄ±ÄÄ±nÄ±n yardÄ±mÄ±yla yazÄ±lmÄ±Å bir ses oynatÄ±cÄ±sÄ±dÄ±r. KullanÄ±cÄ± arayÃ¼zÃ¼ WinAMP'a ve XMMS'ye benzer. BaÅka kullanÄ±cÄ± arayÃ¼zleri de vardÄ±r. -Size = 12,49 MB +Size = 12,51 MB Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = SciTE -Version = 3.4.4 +Version = 3.5.0 Licence = Freeware Description = SciTE is a SCIntilla based text editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. -Size = 736 kB +Size = 742 kB Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.4.4/Sc344.exe +URLDownload = http://download.sourceforge.net/project/scintilla/SciTE/3.5.0/Sc350.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = SciTE est un Ã©diteur de texte basÃ© sur SCIntilla. Originelement rÃ©alisÃ© pour montrer Scintilla, il a Ã©voluÃ© pour devenir un Ã©diteur gÃ©nÃ©ralement utile avec des options pour compiler et lancer des programmes. -Size = 736 ko +Size = 742 ko [Section.0410] Description = SciTE Ã¨ un editor di testo basato su scintilla. Originariamente costruito per dimostrare Scintilla, Ã¨ cresciuto fino a essere un editor generalmente utile con strutture per la creazione e l'esecuzione di programmi. @@ -34,12 +34,12 @@ [Section.0418] Licence = GratuitÄ Description = SciTE este un editor de text bazat pe SCIntilla. Construit iniÈial pentru a demonstra Scintilla, a crescut ulterior Ã®ntr-un editor de uz general cu funcÈionalitÄÈi de compilare Èi execuÈie a programelor. -Size = 736 ko +Size = 742 ko [Section.041f] Licence = Ãcretsiz Description = SciTE, bir Scintilla tabanlÄ± metin dÃ¼zenleyicisidir. Ä°lk baÅta Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±ldÄ±; izlenceleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle, umÃ»miyetle kullanÄ±ÅlÄ± bir dÃ¼zenleyici olmak iÃ§in geliÅti. -Size = 736 KB +Size = 742 KB [Section.0422] Description = Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ SCIntilla. ÐÑÐ² Ð·ÑÐ±ÑÐ°Ð½Ð¸Ð¹ ÑÐº Ð¿ÑÐµÐ·ÐµÐ½ÑÐ°ÑÑÑ Scintilla, Ð°Ð»Ðµ Ð²Ð¸ÑÑÑ Ð´Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¾ÑÐ° Ð·Ð°Ð³Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð· Ð·Ð°ÑÐ¾Ð±Ð°Ð¼Ð¸ Ð·Ð±Ð¸ÑÐ°Ð½Ð½Ñ ÑÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,60 +3,60 @@ [Section] Name = Mozilla SeaMonkey -Version = 2.26 +Version = 2.29 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. -Size = 23.90 MB +Size = 30.17 MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/en-US/… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/en-US/… CDPath = none [Section.0407] Description = Mozilla Suite lebt. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 23.80 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/de/Sea… +Size = 30.05 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/de/Sea… [Section.040a] Description = La suite de Mozilla estÃ¡ viva. Es el primero y Ãºnico navegador web, gestor de correo, lector de noticias, Chat y editor HTML que necesitarÃ¡s. -Size = 23.79 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/es-ES/… +Size = 30.03 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/es-ES/… [Section.040c] Description = La suite Mozilla est en vie. Ceci est le seul et l'unique package navigateur, client mail, client chat et composer dont vous aurez besoin. -Size = 24,06 Mo -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/fr/Sea… +Size = 30,30 Mo +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/fr/Sea… [Section.0410] Description = Mozilla Suite Ã¨ vivo. Questo Ã¨ l'unico pachetto che include Browser, Mail, Chat, e Composer di cui avrete mai bisogno... -Size = 23.71 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/it/Sea… +Size = 29.97 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/it/Sea… [Section.0413] Description = Mozilla Suite bundelt alle applicaties voor het Web: Browser, Mail, Chat, Composer. -Size = 24.40 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/nl/Sea… +Size = 30.65 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/nl/Sea… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. -Size = 24.72 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/pl/Sea… +Size = 30.96 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/pl/Sea… [Section.0418] Description = Suita Mozilla. Acest pachet Ã®ncorporeazÄ navigator, poÈtÄ electronicÄ, client IRC Èi editor HTML, acoperind astfel o arie largÄ de necesitÄÈi. -Size = 24,7 Mo +Size = 30,17 Mo [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 24.27 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/ru/Sea… +Size = 30.52 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/ru/Sea… [Section.041f] Description = Mozilla BohÃ§asÄ± saÄ. Bu, hiÃ§ gereksinim duymayacaÄÄ±nÄ±z, yalnÄ±zca TarayÄ±cÄ±, Posta, SÃ¶yleÅi ve Yazar bohÃ§asÄ±dÄ±r. -Size = 23,83 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/tr/Sea… +Size = 30,02 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/tr/Sea… [Section.0422] Description = ÐÑÐ¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Mozilla Suite. ÐÐºÐ»ÑÑÐ°Ñ Ð² ÑÐµÐ±Ðµ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ ÐºÐ»ÑÑÐ½Ñ, IRC-ÐºÐ»ÑÑÐ½Ñ ÑÐ° HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Size = 24.27 MB -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.26/win32/ru/Sea… +Size = 30.52 MB +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/2.29/win32/ru/Sea… Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = SMPlayer -Version = 14.3.0 +Version = 14.9.0 Licence = GPL Description = Graphical Frontend for MPlayer. Size = 20.7 MB Category = 2 URLSite = http://smplayer.sourceforge.net/en/ -URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/14.3.0/smplayer-1… +URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/14.9.0/smplayer-1… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,77 +3,77 @@ [Section] Name = Mozilla Thunderbird 31 -Version = 31.0 +Version = 31.1.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 25.25 MB Category = 5 URLSite = https://www.mozilla.org/en-US/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/en-U… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/en… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 25.09 MB URLSite = https://www.mozilla.org/de/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/de/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/de… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 25.04 MB URLSite = https://www.mozilla.org/es-ES/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/es-E… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/es… [Section.040c] Description = Le plus populaire et l'un des meilleurs clients mail gratuits disponible. Size = 25,39 Mo URLSite = https://www.mozilla.org/fr/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/fr/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/fr… [Section.0410] Description = Il piÃ¹ popolare e il migliore Client mail gratuito. Size = 25.04 MB URLSite = https://www.mozilla.org/it/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/it/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/it… [Section.0413] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 25.73 MB URLSite = https://www.mozilla.org/nl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/nl/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/nl… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 25.95 MB URLSite = https://www.mozilla.org/pl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/pl/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/pl… [Section.0418] Description = Cel mai popular Èi unul dintre cele mai bune clientele gratuite de poÈtÄ electronicÄ. Size = 25,61 Mo URLSite = https://www.mozilla.org/ro/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/ro/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/ro… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 25.5 MB URLSite = https://www.mozilla.org/ru/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/ru/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/ru… [Section.041f] Description = ÃzgÃ¼r posta istemcileri arasÄ±nda en tutulanÄ± ve en iyilerinden biri. Size = 25,12 MB URLSite = https://www.mozilla.org/tr/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/tr/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/tr… [Section.0422] Description = ÐÐ°Ð¹Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑÐ¸Ð¹ ÑÐ° Ð¾Ð´Ð¸Ð½ Ð· ÐºÑÐ°ÑÐ¸Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ñ ÐºÐ»ÑÑÐ½ÑÑÐ². Size = 25.54 MB URLSite = https://www.mozilla.org/uk/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/uk/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/uk… [Section.0813] Description = De meest populaire en een van de beste gratis e-mail-programma's. Size = 25.73 MB URLSite = https://www.mozilla.org/nl/thunderbird/ -URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.0/win32/nl/T… +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/31.1.1/win32/nl… Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = TuxPaint -Version = 0.9.21c +Version = 0.9.22 Licence = GPL Description = An open source bitmap graphics editor geared towards young children. -Size = 10.42 MB +Size = 13.5 MB Category = 3 URLSite = http://tuxpaint.org/ -URLDownload = http://download.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21c/tuxpaint-… +URLDownload = http://download.sourceforge.net/project/tuxpaint/tuxpaint/0.9.22/tuxpaint-0… CDPath = none [Section.0405] @@ -23,7 +23,7 @@ [Section.040c] Description = Un Ã©diteur graphic bitmap open source orientÃ© pour les jeunes enfants. -Size = 10,42 Mo +Size = 13,5 Mo [Section.0410] Description = Un editore grafico per bitmap open source creato per i bambini. @@ -36,11 +36,11 @@ [Section.0418] Description = Un editor grafic bitmap, adresat copiilor. -Size = 10,42 Mo +Size = 13,5 Mo [Section.041f] Description = KÃ¼Ã§Ã¼k Ã§ocuklar iÃ§in yapÄ±lmÄ±Å bir aÃ§Ä±k kaynak bit eÅlem Ã§izge dÃ¼zenleyicisi. -Size = 10,42 MB +Size = 13,5 MB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ Ð³ÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð»Ñ Ð¼Ð°Ð»Ð¸Ñ Ð´ÑÑÐµÐ¹. Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ultravnc.txt [iso-8859-1] Mon Sep 15 20:10:09 2014 @@ -3,13 +3,13 @@ [Section] Name = UltraVNC -Version = 1.1.9.0 +Version = 1.2.0.1 Licence = GPL Description = Open source VNC client/server. -Size = 3.27 MB +Size = 3.29 MB Category = 5 URLSite = http://www.uvnc.com/ -URLDownload = http://support1.uvnc.com/download/1190/UltraVNC_1_1_9_X86_Setup.exe +URLDownload = http://support1.uvnc.com/download/1201/UltraVNC_1_2_01_X86_Setup.exe CDPath = none [Section.0407] @@ -20,7 +20,7 @@ [Section.040c] Description = Client/serveur VNC open source. -Size = 3,27 Mo +Size = 3,29 Mo [Section.0410] Description = Client/server VNC open source. @@ -33,11 +33,11 @@ [Section.0418] Description = Client/server VNC (cu surse deschise). -Size = 3,27 Mo +Size = 3,29 Mo [Section.041f] Description = AÃ§Ä±k kaynak VNC istemcisi ve sunucusu. -Size = 3,27 MB +Size = 3,29 MB [Section.0422] Description = ÐÑÐ´ÐºÑÐ¸ÑÐ¸Ð¹ VNC ÐºÐ»ÑÑÐ½Ñ/ÑÐµÑÐ²ÐµÑ.

1 0

[ekohl] 64160: [BOOTDATA] Set MaxSize and Retention for event logs.
by ekohl＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: ekohl Date: Mon Sep 15 12:25:45 2014 New Revision: 64160 URL: http://svn.reactos.org/svn/reactos?rev=64160&view=rev Log: [BOOTDATA] Set MaxSize and Retention for event logs. 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] Mon Sep 15 12:25:45 2014 @@ -1438,10 +1438,18 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application","File",0x00020000,"%SystemRoot%\system32\config\AppEvent.Evt" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application","MaxSize",0x00010003,524288 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application","Retention",0x00010003,604800 + HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","File",0x00020000,"%SystemRoot%\system32\config\SecEvent.Evt" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","MaxSize",0x00010003,524288 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","Retention",0x00010003,604800 + HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System",,0x00000010 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","File",0x00020000,"%SystemRoot%\system32\config\SysEvent.Evt" +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","MaxSize",0x00010003,524288 +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","Retention",0x00010003,604800 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","TypesSupported",0x00010001,0x00000007 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll"

1 0

[ekohl] 64159: [EVENTLOG] - Read MaxSize and Retention from the Registry when a new log file is created. - Use ntdll file functions instead of their kernel32 counterparts.
by ekohl＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: ekohl Date: Mon Sep 15 12:16:46 2014 New Revision: 64159 URL: http://svn.reactos.org/svn/reactos?rev=64159&view=rev Log: [EVENTLOG] - Read MaxSize and Retention from the Registry when a new log file is created. - Use ntdll file functions instead of their kernel32 counterparts. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Mon Sep 15 12:16:46 2014 @@ -106,7 +106,7 @@ UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; - default : + default: DPRINT1(" Control %lu received\n", dwControl); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -275,6 +275,7 @@ LONG Result; PLOGFILE pLogf = NULL; UNICODE_STRING FileName; + ULONG ulMaxSize, ulRetention; NTSTATUS Status; DPRINT("LoadLogFile: %S\n", LogName); @@ -333,7 +334,27 @@ DPRINT("%S -> %S\n", Buf, Expanded); - Status = LogfCreate(&pLogf, LogName, &FileName, TRUE, FALSE); + ValueLen = sizeof(ULONG); + Result = RegQueryValueEx(hKey, + L"MaxSize", + NULL, + &Type, + (LPBYTE)&ulMaxSize, + &ValueLen); + if (Result != ERROR_SUCCESS) + ulMaxSize = 512 * 1024; /* 512 kBytes */ + + ValueLen = sizeof(ULONG); + Result = RegQueryValueEx(hKey, + L"Retention", + NULL, + &Type, + (LPBYTE)&ulRetention, + &ValueLen); + if (Result != ERROR_SUCCESS) + ulRetention = 0; + + Status = LogfCreate(&pLogf, LogName, &FileName, ulMaxSize, ulRetention, TRUE, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create %S! (Status %08lx)\n", Expanded, Status); Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Mon Sep 15 12:16:46 2014 @@ -156,6 +156,8 @@ LogfCreate(PLOGFILE *Logfile, WCHAR * LogName, PUNICODE_STRING FileName, + ULONG ulMaxSize, + ULONG ulRetention, BOOL Permanent, BOOL Backup); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Sep 15 12:16:46 2014 @@ -24,62 +24,78 @@ /* FUNCTIONS ****************************************************************/ static NTSTATUS -LogfInitializeNew(PLOGFILE LogFile) -{ - DWORD dwWritten; +LogfInitializeNew(PLOGFILE LogFile, + ULONG ulMaxSize, + ULONG ulRetention) +{ + IO_STATUS_BLOCK IoStatusBlock; EVENTLOGEOF EofRec; + NTSTATUS Status; ZeroMemory(&LogFile->Header, sizeof(EVENTLOGHEADER)); SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); SetEndOfFile(LogFile->hFile); LogFile->Header.HeaderSize = sizeof(EVENTLOGHEADER); - LogFile->Header.EndHeaderSize = sizeof(EVENTLOGHEADER); + LogFile->Header.Signature = LOGFILE_SIGNATURE; + LogFile->Header.MajorVersion = MAJORVER; + LogFile->Header.MinorVersion = MINORVER; LogFile->Header.StartOffset = sizeof(EVENTLOGHEADER); LogFile->Header.EndOffset = sizeof(EVENTLOGHEADER); - LogFile->Header.MajorVersion = MAJORVER; - LogFile->Header.MinorVersion = MINORVER; LogFile->Header.CurrentRecordNumber = 1; LogFile->Header.OldestRecordNumber = 1; - /* FIXME: Read MaxSize from registry for this LogFile. - But for now limit EventLog size to just under 5K. */ - LogFile->Header.MaxSize = 5000; - LogFile->Header.Signature = LOGFILE_SIGNATURE; - if (!WriteFile(LogFile->hFile, - &LogFile->Header, - sizeof(EVENTLOGHEADER), - &dwWritten, - NULL)) - { - DPRINT1("WriteFile failed:%d!\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - + LogFile->Header.MaxSize = ulMaxSize; + LogFile->Header.Flags = 0; + LogFile->Header.Retention = ulRetention; + LogFile->Header.EndHeaderSize = sizeof(EVENTLOGHEADER); + + Status = NtWriteFile(LogFile->hFile, + NULL, + NULL, + NULL, + &IoStatusBlock, + &LogFile->Header, + sizeof(EVENTLOGHEADER), + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile failed (Status 0x%08lx)\n", Status); + return Status; + } + + EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF); EofRec.Ones = 0x11111111; EofRec.Twos = 0x22222222; EofRec.Threes = 0x33333333; EofRec.Fours = 0x44444444; - EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF); - EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF); + EofRec.BeginRecord = LogFile->Header.StartOffset; + EofRec.EndRecord = LogFile->Header.EndOffset; EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber; EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber; - EofRec.BeginRecord = LogFile->Header.StartOffset; - EofRec.EndRecord = LogFile->Header.EndOffset; - - if (!WriteFile(LogFile->hFile, - &EofRec, - sizeof(EVENTLOGEOF), - &dwWritten, - NULL)) - { - DPRINT1("WriteFile failed:%d!\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - - if (!FlushFileBuffers(LogFile->hFile)) - { - DPRINT1("FlushFileBuffers failed:%d!\n", GetLastError()); - return STATUS_UNSUCCESSFUL; + EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF); + + Status = NtWriteFile(LogFile->hFile, + NULL, + NULL, + NULL, + &IoStatusBlock, + &EofRec, + sizeof(EVENTLOGEOF), + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile failed (Status 0x%08lx)\n", Status); + return Status; + } + + Status = NtFlushBuffersFile(LogFile->hFile, + &IoStatusBlock); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtFlushBuffersFile failed (Status 0x%08lx)\n", Status); + return Status; } return STATUS_SUCCESS; @@ -87,7 +103,8 @@ static NTSTATUS -LogfInitializeExisting(PLOGFILE LogFile, BOOL Backup) +LogfInitializeExisting(PLOGFILE LogFile, + BOOL Backup) { DWORD dwRead; DWORD dwRecordsNumber = 0; @@ -265,10 +282,6 @@ if (LogFile->Header.CurrentRecordNumber == 0) LogFile->Header.CurrentRecordNumber = 1; - /* FIXME: Read MaxSize from registry for this LogFile. - But for now limit EventLog size to just under 5K. */ - LogFile->Header.MaxSize = 5000; - if (!Backup) { if (SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) == @@ -301,8 +314,10 @@ NTSTATUS LogfCreate(PLOGFILE *LogFile, - WCHAR * LogName, + WCHAR *LogName, PUNICODE_STRING FileName, + ULONG ulMaxSize, + ULONG ulRetention, BOOL Permanent, BOOL Backup) { @@ -355,7 +370,7 @@ goto fail; } - if(LogName) + if (LogName) StringCchCopy(pLogFile->LogName,lstrlenW(LogName) + 1, LogName); pLogFile->FileName = @@ -387,7 +402,7 @@ pLogFile->Permanent = Permanent; if (bCreateNew) - Status = LogfInitializeNew(pLogFile); + Status = LogfInitializeNew(pLogFile, ulMaxSize, ulRetention); else Status = LogfInitializeExisting(pLogFile, Backup); @@ -1117,7 +1132,9 @@ } } - Status = LogfInitializeNew(LogFile); + Status = LogfInitializeNew(LogFile, + LogFile->Header.MaxSize, + LogFile->Header.Retention); if (!NT_SUCCESS(Status)) { DPRINT1("LogfInitializeNew failed (Status: 0x%08lx)\n", Status); @@ -1145,7 +1162,7 @@ DWORD dwOffset, dwRead, dwRecSize; - DPRINT("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); + DPRINT1("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); /* Lock the log file shared */ RtlAcquireResourceShared(&LogFile->Lock, TRUE); @@ -1182,7 +1199,7 @@ Header.EndOffset = sizeof(EVENTLOGHEADER); Header.CurrentRecordNumber = 1; Header.OldestRecordNumber = 1; - Header.MaxSize = 0; + Header.MaxSize = LogFile->Header.MaxSize; Header.Flags = ELF_LOGFILE_HEADER_DIRTY; Header.Retention = LogFile->Header.Retention; Header.EndHeaderSize = sizeof(EVENTLOGHEADER); Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Mon Sep 15 12:16:46 2014 @@ -162,6 +162,8 @@ Status = LogfCreate(&lpLogHandle->LogFile, NULL, FileName, + 0, + 0, FALSE, TRUE); if (!NT_SUCCESS(Status))

1 0

[tfaber] 64158: [HAL] - Don't use svn:eol-style = native for PCI ids but then have the code expect CRLF. Should fix all devices being "Unknown device" on Unix builds.
by tfaber＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: tfaber Date: Mon Sep 15 10:58:53 2014 New Revision: 64158 URL: http://svn.reactos.org/svn/reactos?rev=64158&view=rev Log: [HAL] - Don't use svn:eol-style = native for PCI ids but then have the code expect CRLF. Should fix all devices being "Unknown device" on Unix builds. Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids (contents, props changed) trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_… Modified: trunk/reactos/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pci_…

1 0

[hbelusca] 64157: [PSDK]: Fix some structure definitions.
by hbelusca＠svn.reactos.org 15 Sep '14

15 Sep '14

Author: hbelusca Date: Mon Sep 15 00:07:46 2014 New Revision: 64157 URL: http://svn.reactos.org/svn/reactos?rev=64157&view=rev Log: [PSDK]: Fix some structure definitions. Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Mon Sep 15 00:07:46 2014 @@ -228,7 +228,7 @@ WORD wVirtualScanCode; union { WCHAR UnicodeChar; - CHAR AsciiChar; + CHAR AsciiChar; } uChar; DWORD dwControlKeyState; } @@ -236,18 +236,26 @@ /* gcc's alignment is not what win32 expects */ PACKED #endif -KEY_EVENT_RECORD; +KEY_EVENT_RECORD, *PKEY_EVENT_RECORD; typedef struct _MOUSE_EVENT_RECORD { COORD dwMousePosition; DWORD dwButtonState; DWORD dwControlKeyState; DWORD dwEventFlags; -} MOUSE_EVENT_RECORD; - -typedef struct _WINDOW_BUFFER_SIZE_RECORD { COORD dwSize; } WINDOW_BUFFER_SIZE_RECORD; -typedef struct _MENU_EVENT_RECORD { UINT dwCommandId; } MENU_EVENT_RECORD,*PMENU_EVENT_RECORD; -typedef struct _FOCUS_EVENT_RECORD { BOOL bSetFocus; } FOCUS_EVENT_RECORD; +} MOUSE_EVENT_RECORD, *PMOUSE_EVENT_RECORD; + +typedef struct _WINDOW_BUFFER_SIZE_RECORD { + COORD dwSize; +} WINDOW_BUFFER_SIZE_RECORD, *PWINDOW_BUFFER_SIZE_RECORD; + +typedef struct _MENU_EVENT_RECORD { + UINT dwCommandId; +} MENU_EVENT_RECORD, *PMENU_EVENT_RECORD; + +typedef struct _FOCUS_EVENT_RECORD { + BOOL bSetFocus; +} FOCUS_EVENT_RECORD, *PFOCUS_EVENT_RECORD; typedef struct _INPUT_RECORD { WORD EventType; @@ -258,7 +266,7 @@ MENU_EVENT_RECORD MenuEvent; FOCUS_EVENT_RECORD FocusEvent; } Event; -} INPUT_RECORD,*PINPUT_RECORD; +} INPUT_RECORD, *PINPUT_RECORD; #if (_WIN32_WINNT >= 0x0600) typedef struct _CONSOLE_HISTORY_INFO {

1 0

[jgardou] 64156: [KDGDB] - Fix an embarassing works-for-me but uncommited cast. - Add support for reading registers and memory from foreign threads. Highly experimental and nearly untested, use at ...
by jgardou＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: jgardou Date: Sun Sep 14 22:50:10 2014 New Revision: 64156 URL: http://svn.reactos.org/svn/reactos?rev=64156&view=rev Log: [KDGDB] - Fix an embarassing works-for-me but uncommited cast. - Add support for reading registers and memory from foreign threads. Highly experimental and nearly untested, use at your own risk. Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/i386_sup.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 22:50:10 2014 @@ -11,6 +11,8 @@ /* LOCALS *********************************************************************/ static HANDLE gdb_run_thread; +/* We might have to attach to a process to read its memory */ +static PEPROCESS AttachedProcess = NULL; /* Keep track of where we are for qfThreadInfo/qsThreadInfo */ static LIST_ENTRY* CurrentProcessEntry; static LIST_ENTRY* CurrentThreadEntry; @@ -316,6 +318,13 @@ send_gdb_memory(MessageData->Buffer, MessageData->Length); KdpSendPacketHandler = NULL; KdpManipulateStateHandler = NULL; + + /* Detach if we have to */ + if (AttachedProcess != NULL) + { + KeDetachProcess(); + AttachedProcess = NULL; + } } static @@ -323,7 +332,8 @@ handle_gdb_read_mem( _Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength) + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) { State->ApiNumber = DbgKdReadVirtualMemoryApi; State->ReturnStatus = STATUS_SUCCESS; /* ? */ @@ -332,6 +342,19 @@ if (MessageData) MessageData->Length = 0; *MessageLength = 0; + + /* Attach to the debug process to read its memory */ + if (gdb_dbg_process != PsGetCurrentProcessId()) + { + NTSTATUS Status = PsLookupProcessByProcessId(gdb_dbg_process, &AttachedProcess); + if (!NT_SUCCESS(Status)) + { + KDDBGPRINT("The current GDB debug thread is invalid!"); + send_gdb_packet("E03"); + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + } + KeAttachProcess(&AttachedProcess->Pcb); + } State->u.ReadMemory.TargetBaseAddress = hex_to_address(&gdb_input[1]); State->u.ReadMemory.TransferCount = hex_to_address(strstr(&gdb_input[1], ",") + 1); @@ -416,7 +439,7 @@ handle_gdb_set_thread(); break; case 'm': - return handle_gdb_read_mem(State, MessageData, MessageLength); + return handle_gdb_read_mem(State, MessageData, MessageLength, KdContext); case 'p': return gdb_send_register(State, MessageData, MessageLength, KdContext); case 'q': Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/i386_su… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] Sun Sep 14 22:50:10 2014 @@ -6,6 +6,8 @@ */ #include "kdgdb.h" + +#include <pstypes.h> enum reg_name { @@ -79,6 +81,44 @@ return 0; } +static +void* +thread_to_reg(PETHREAD Thread, enum reg_name reg_name, unsigned short* size) +{ + PKTRAP_FRAME TrapFrame = Thread->Tcb.TrapFrame; + + /* See if the thread was actually scheduled */ + if (TrapFrame == NULL) + { + return NULL; + } + + *size = 4; + switch (reg_name) + { + case EAX: return &TrapFrame->Eax; + case ECX: return &TrapFrame->Ecx; + case EDX: return &TrapFrame->Edx; + case EBX: return &TrapFrame->Ebx; + case ESP: return (TrapFrame->PreviousPreviousMode == KernelMode) ? + &TrapFrame->TempEsp : &TrapFrame->HardwareEsp; + case EBP: return &TrapFrame->Ebp; + case ESI: return &TrapFrame->Esi; + case EDI: return &TrapFrame->Edi; + case EIP: return &TrapFrame->Eip; + case EFLAGS: return &TrapFrame->EFlags; + case CS: return &TrapFrame->SegCs; + case SS: return &TrapFrame->HardwareSegSs; + case DS: return &TrapFrame->SegDs; + case ES: return &TrapFrame->SegEs; + case FS: return &TrapFrame->SegFs; + case GS: return &TrapFrame->SegGs; + default: + KDDBGPRINT("Unhandled regname: %d.\n", reg_name); + } + return NULL; +} + KDSTATUS gdb_send_registers( _Out_ DBGKD_MANIPULATE_STATE64* State, @@ -86,15 +126,62 @@ _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext) { - ULONG32 Registers[16]; + CHAR Registers[16*8 + 1]; + UCHAR* RegisterPtr; unsigned i; unsigned short size; - - for(i=0; i < 16; i++) - { - Registers[i] = *(ULONG32*)ctx_to_reg(&CurrentContext, i, &size); - } - send_gdb_memory(Registers, sizeof(Registers)); + CHAR* ptr = Registers; + + if (gdb_dbg_thread == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) + { + for(i=0; i < 16; i++) + { + RegisterPtr = ctx_to_reg(&CurrentContext, i, &size); + *ptr++ = hex_chars[RegisterPtr[0] >> 4]; + *ptr++ = hex_chars[RegisterPtr[0] & 0xF]; + *ptr++ = hex_chars[RegisterPtr[1] >> 4]; + *ptr++ = hex_chars[RegisterPtr[1] & 0xF]; + *ptr++ = hex_chars[RegisterPtr[2] >> 4]; + *ptr++ = hex_chars[RegisterPtr[2] & 0xF]; + *ptr++ = hex_chars[RegisterPtr[3] >> 4]; + *ptr++ = hex_chars[RegisterPtr[3] & 0xF]; + } + } + else + { + PETHREAD DbgThread; + NTSTATUS Status; + + Status = PsLookupThreadByThreadId(gdb_dbg_thread, &DbgThread); + if (!NT_SUCCESS(Status)) + { + /* Thread is dead */ + send_gdb_packet("E03"); + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + } + + for(i=0; i < 16; i++) + { + RegisterPtr = thread_to_reg(DbgThread, i, &size); + if (RegisterPtr) + { + *ptr++ = hex_chars[RegisterPtr[0] >> 4]; + *ptr++ = hex_chars[RegisterPtr[0] & 0xF]; + *ptr++ = hex_chars[RegisterPtr[1] >> 4]; + *ptr++ = hex_chars[RegisterPtr[1] & 0xF]; + *ptr++ = hex_chars[RegisterPtr[2] >> 4]; + *ptr++ = hex_chars[RegisterPtr[2] & 0xF]; + *ptr++ = hex_chars[RegisterPtr[3] >> 4]; + *ptr++ = hex_chars[RegisterPtr[3] & 0xF]; + } + else + { + ptr += sprintf(ptr, "xxxxxxxx"); + } + } + } + *ptr = '\0'; + send_gdb_packet(Registers); return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } @@ -112,7 +199,27 @@ /* Get the GDB register name (gdb_input = "pXX") */ reg_name = (hex_value(gdb_input[1]) << 4) | hex_value(gdb_input[2]); - ptr = ctx_to_reg(&CurrentContext, reg_name, &size); + if (gdb_dbg_thread == PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)) + { + /* We can get it from the context of the current exception */ + ptr = ctx_to_reg(&CurrentContext, reg_name, &size); + } + else + { + PETHREAD DbgThread; + NTSTATUS Status; + + Status = PsLookupThreadByThreadId(gdb_dbg_thread, &DbgThread); + if (!NT_SUCCESS(Status)) + { + /* Thread is dead */ + send_gdb_packet("E03"); + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); + } + + ptr = thread_to_reg(DbgThread, reg_name, &size); + } + if (!ptr) { /* Undefined. Let's assume 32 bit register */ @@ -122,5 +229,6 @@ { send_gdb_memory(ptr, size); } + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } 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 22:50:10 2014 @@ -67,6 +67,7 @@ void gdb_send_debug_io(_In_ PSTRING String); void gdb_send_exception(void); void send_gdb_ntstatus(_In_ NTSTATUS Status); +extern const char hex_chars[]; /* 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 22:50:10 2014 @@ -14,6 +14,7 @@ _In_ ULONG PacketType, _In_ PSTRING MessageHeader, _In_ PSTRING MessageData); +static BOOLEAN CanSendData = FALSE; /* GLOBALS ********************************************************************/ DBGKD_GET_VERSION64 KdVersion; @@ -141,11 +142,13 @@ /* Save current state for later GDB queries */ CurrentStateChange = *StateChange; /* Unless GDB tells us otherwise, those are what we should have */ - gdb_dbg_thread = PsGetThreadId((PETHREAD)StateChange->Thread); - gdb_dbg_process = PsGetThreadProcessId((PETHREAD)StateChange->Thread); + gdb_dbg_thread = PsGetThreadId((PETHREAD)(ULONG_PTR)StateChange->Thread); + gdb_dbg_process = PsGetThreadProcessId((PETHREAD)(ULONG_PTR)StateChange->Thread); gdb_send_exception(); /* Next receive call will ask for the context */ KdpManipulateStateHandler = GetContextManipulateHandler; + /* We can now send data, since after this we will be connected to GDB */ + CanSendData = TRUE; break; default: /* FIXME */ @@ -159,6 +162,9 @@ _In_ DBGKD_DEBUG_IO* DebugIO, _In_ PSTRING String) { + if (!CanSendData) + return; + switch (DebugIO->ApiNumber) { case DbgKdPrintStringApi:

1 0

[jgardou] 64155: [DDK] - Addendum to r64151 Complain on IRC, then complain on ros-dev, then steal fixes from your peers, then do as if nothing happened.
by jgardou＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: jgardou Date: Sun Sep 14 22:41:27 2014 New Revision: 64155 URL: http://svn.reactos.org/svn/reactos?rev=64155&view=rev Log: [DDK] - Addendum to r64151 Complain on IRC, then complain on ros-dev, then steal fixes from your peers, then do as if nothing happened. Modified: trunk/reactos/include/ddk/wdm.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 22:41:27 2014 @@ -15794,11 +15794,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

1 0

[jgardou] 64154: [KDGDB] - Always pass down the result of gdb_receive_packet up to KD, so that it knows when a breakin packet was received. (CTRL-C) now works! - Generalize the use of the Send <-> ...
by jgardou＠svn.reactos.org 14 Sep '14

14 Sep '14

Author: jgardou Date: Sun Sep 14 20:45:30 2014 New Revision: 64154 URL: http://svn.reactos.org/svn/reactos?rev=64154&view=rev Log: [KDGDB] - Always pass down the result of gdb_receive_packet up to KD, so that it knows when a breakin packet was received. (CTRL-C) now works! - Generalize the use of the Send <-> ManipulateState callbacks for a better code reading. - Get the exception context as soon as it is thrown (instead of playing with the PRCB) - Improve the way we attach to GDB: on the first KD call, we set KdContext->ControlCPending so that KD throws an exception. That way we can first initialize our KD stuff, and then quietly attach to GDB - Implement the 'p' (get one register) GDB request. GDB is now much more reliable. Modified: trunk/reactos/drivers/base/kdgdb/gdb_input.c trunk/reactos/drivers/base/kdgdb/gdb_send.c trunk/reactos/drivers/base/kdgdb/i386_sup.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 20:45:30 2014 @@ -11,12 +11,13 @@ /* LOCALS *********************************************************************/ static HANDLE gdb_run_thread; -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; + +/* GLOBALS ********************************************************************/ +HANDLE gdb_dbg_process; +HANDLE gdb_dbg_thread; /* PRIVATE FUNCTIONS **********************************************************/ static @@ -68,6 +69,7 @@ send_gdb_packet("OK"); break; case 'g': + KDDBGPRINT("Setting debug thread: %s.\n", gdb_input); if (strncmp(&gdb_input[2], "p-1", 3) == 0) { gdb_dbg_process = (HANDLE)-1; @@ -90,6 +92,20 @@ } } +KDSTATUS +gdb_receive_and_interpret_packet( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + KDSTATUS Status = gdb_receive_packet(KdContext); + + if (Status != KdPacketReceived) + return Status; + return gdb_interpret_input(State, MessageData, MessageLength, KdContext); +} + static void handle_gdb_thread_alive(void) @@ -118,7 +134,7 @@ /* q* packets */ static -void +KDSTATUS handle_gdb_query( _Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, @@ -128,20 +144,20 @@ if (strncmp(gdb_input, "qSupported:", 11) == 0) { send_gdb_packet("PacketSize=4096;multiprocess+;"); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } if (strncmp(gdb_input, "qAttached", 9) == 0) { - /* Say yes: the remote server didn't create the process, ReactOS did! */ + /* Say no: We didn't attach, we create the process! */ send_gdb_packet("0"); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } if (strncmp(gdb_input, "qRcmd,", 6) == 0) { send_gdb_packet("OK"); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } if (strcmp(gdb_input, "qC") == 0) @@ -151,7 +167,7 @@ PsGetThreadProcessId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread), PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)); send_gdb_packet(gdb_out); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } if ((strncmp(gdb_input, "qfThreadInfo", 12) == 0) @@ -174,15 +190,13 @@ { /* there is only one thread to tell about */ send_gdb_packet("l"); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } /* 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); - gdb_interpret_input(State, MessageData, MessageLength, KdContext); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } if (Resuming) @@ -197,7 +211,7 @@ { /* We're done */ send_gdb_packet("l"); - return; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } Process = CONTAINING_RECORD(CurrentProcessEntry, EPROCESS, ActiveProcessLinks); @@ -234,9 +248,7 @@ /* 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; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } } @@ -244,13 +256,12 @@ 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; + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } KDDBGPRINT("KDGDB: Unknown query: %s\n", gdb_input); send_gdb_packet(""); + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } #if 0 @@ -304,6 +315,7 @@ else send_gdb_memory(MessageData->Buffer, MessageData->Length); KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = NULL; } static @@ -331,150 +343,6 @@ } static -VOID -GetCurrentContextSendHandler( - _In_ ULONG PacketType, - _In_ PSTRING MessageHeader, - _In_ PSTRING MessageData -) -{ - DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; - const CONTEXT* Context = (const CONTEXT*)MessageData->Buffer; - - if ((PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) - || (State->ApiNumber != DbgKdGetContextApi) - || (MessageData->Length < sizeof(*Context))) - { - /* Should we bugcheck ? */ - while (1); - } - - /* Just copy it */ - RtlCopyMemory(&CurrentContext, Context, sizeof(*Context)); - KdpSendPacketHandler = NULL; -} - -static -VOID -GetCurrentContext( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext, - _In_opt_ KDP_MANIPULATESTATE_HANDLER ManipulateStateHandler -) -{ - State->ApiNumber = DbgKdGetContextApi; - State->Processor = CurrentStateChange.Processor; - State->ReturnStatus = STATUS_SUCCESS; - State->ProcessorLevel = CurrentStateChange.ProcessorLevel; - MessageData->Length = 0; - - /* Update the send <-> receive loop handler */ - KdpSendPacketHandler = GetCurrentContextSendHandler; - KdpManipulateStateHandler = ManipulateStateHandler; -} - -static -VOID -SetContextSendHandler( - _In_ ULONG PacketType, - _In_ PSTRING MessageHeader, - _In_ PSTRING MessageData -) -{ - DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; - - /* We just confirm that all went well */ - if ((PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) - || (State->ApiNumber != DbgKdSetContextApi) - || (State->ReturnStatus != STATUS_SUCCESS)) - { - /* Should we bugcheck ? */ - while (1); - } - - KdpSendPacketHandler = NULL; -} - -static -KDSTATUS -SetContext( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext, - _In_opt_ KDP_MANIPULATESTATE_HANDLER ManipulateStateHandler -) -{ - State->ApiNumber = DbgKdSetContextApi; - State->Processor = CurrentStateChange.Processor; - State->ReturnStatus = STATUS_SUCCESS; - State->ProcessorLevel = CurrentStateChange.ProcessorLevel; - MessageData->Length = sizeof(CurrentContext); - - if (MessageData->MaximumLength < sizeof(CurrentContext)) - { - while (1); - } - - RtlCopyMemory(MessageData->Buffer, &CurrentContext, sizeof(CurrentContext)); - - /* Update the send <-> receive loop handlers */ - KdpSendPacketHandler = SetContextSendHandler; - KdpManipulateStateHandler = ManipulateStateHandler; - - return KdPacketReceived; -} - -static -KDSTATUS -SendContinue( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext -) -{ - /* Let's go on */ - State->ApiNumber = DbgKdContinueApi; - State->ReturnStatus = STATUS_SUCCESS; /* ? */ - State->Processor = CurrentStateChange.Processor; - State->ProcessorLevel = CurrentStateChange.ProcessorLevel; - if (MessageData) - MessageData->Length = 0; - *MessageLength = 0; - State->u.Continue.ContinueStatus = STATUS_SUCCESS; - - /* We definitely are at the end of the send <-> receive loop, if any */ - KdpSendPacketHandler = NULL; - KdpManipulateStateHandler = NULL; - - /* Tell GDB we are fine */ - send_gdb_packet("OK"); - return KdPacketReceived; -} - -static -KDSTATUS -UpdateProgramCounterSendContinue( - _Out_ DBGKD_MANIPULATE_STATE64* State, - _Out_ PSTRING MessageData, - _Out_ PULONG MessageLength, - _Inout_ PKD_CONTEXT KdContext) -{ - ULONG_PTR ProgramCounter; - - /* So we must get past the breakpoint instruction */ - ProgramCounter = KdpGetContextPc(&CurrentContext); - KdpSetContextPc(&CurrentContext, ProgramCounter + KD_BREAKPOINT_SIZE); - - /* Set the context and continue */ - SetContext(State, MessageData, MessageLength, KdContext, SendContinue); - return KdPacketReceived; -} - -static KDSTATUS handle_gdb_v( _Out_ DBGKD_MANIPULATE_STATE64* State, @@ -499,6 +367,9 @@ { DBGKM_EXCEPTION64* Exception = NULL; + /* Tell GDB everything is fine, we will handle it */ + send_gdb_packet("OK"); + if (CurrentStateChange.NewState == DbgKdExceptionStateChange) Exception = &CurrentStateChange.u.Exception; @@ -506,15 +377,22 @@ if (Exception && (Exception->ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) && (Exception->ExceptionRecord.ExceptionInformation[0] == 0)) { - /* So we get the context, update it and send it back */ - GetCurrentContext(State, MessageData, MessageLength, KdContext, UpdateProgramCounterSendContinue); + ULONG_PTR ProgramCounter; + + /* So we must get past the breakpoint instruction */ + ProgramCounter = KdpGetContextPc(&CurrentContext); + KdpSetContextPc(&CurrentContext, ProgramCounter + KD_BREAKPOINT_SIZE); + + SetContextManipulateHandler(State, MessageData, MessageLength, KdContext); + KdpManipulateStateHandler = ContinueManipulateStateHandler; return KdPacketReceived; } - return SendContinue(State, MessageData, MessageLength, KdContext); - } - } - + return ContinueManipulateStateHandler(State, MessageData, MessageLength, KdContext); + } + } + + KDDBGPRINT("Unhandled 'v' packet: %s\n", gdb_input); return KdPacketReceived; } @@ -526,7 +404,6 @@ _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext) { - KDSTATUS Status; switch (gdb_input[0]) { case '?': @@ -534,16 +411,16 @@ gdb_send_exception(); break; case 'g': - gdb_send_registers(); - break; + return gdb_send_registers(State, MessageData, MessageLength, KdContext); case 'H': handle_gdb_set_thread(); break; case 'm': return handle_gdb_read_mem(State, MessageData, MessageLength); + case 'p': + return gdb_send_register(State, MessageData, MessageLength, KdContext); case 'q': - handle_gdb_query(State, MessageData, MessageLength, KdContext); - break; + return handle_gdb_query(State, MessageData, MessageLength, KdContext); case 'T': handle_gdb_thread_alive(); break; @@ -552,12 +429,8 @@ default: /* We don't know how to handle this request. Maybe this is something for KD */ State->ReturnStatus = STATUS_NOT_SUPPORTED; + KDDBGPRINT("Unsupported GDB command: %s.\n", gdb_input); return KdPacketReceived; } - /* Get the answer from GDB */ - Status = gdb_receive_packet(KdContext); - if (Status != KdPacketReceived) - return Status; - /* Try interpreting this new packet */ - return gdb_interpret_input(State, MessageData, MessageLength, KdContext); -} + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); +} 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 20:45:30 2014 @@ -168,17 +168,12 @@ { char gdb_out[1024]; char* ptr = gdb_out; - DBGKM_EXCEPTION64* Exception = NULL; - - if (CurrentStateChange.NewState == DbgKdExceptionStateChange) - Exception = &CurrentStateChange.u.Exception; + DBGKM_EXCEPTION64* Exception = &CurrentStateChange.u.Exception; /* Report to GDB */ *ptr++ = 'T'; - if (Exception) - ptr = exception_code_to_gdb(Exception->ExceptionRecord.ExceptionCode, ptr); - else - ptr += sprintf(ptr, "05"); + + ptr = exception_code_to_gdb(Exception->ExceptionRecord.ExceptionCode, ptr); ptr += sprintf(ptr, "thread:p%p.%p;", PsGetThreadProcessId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread), PsGetThreadId((PETHREAD)(ULONG_PTR)CurrentStateChange.Thread)); Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/i386_su… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] Sun Sep 14 20:45:30 2014 @@ -79,21 +79,48 @@ return 0; } -void -gdb_send_registers(void) +KDSTATUS +gdb_send_registers( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) { - CONTEXT* ctx; - PKPRCB* ProcessorBlockLists; ULONG32 Registers[16]; unsigned i; unsigned short size; - ProcessorBlockLists = (PKPRCB*)KdDebuggerDataBlock->KiProcessorBlock.Pointer; - ctx = (CONTEXT*)((char*)ProcessorBlockLists[CurrentStateChange.Processor] + KdDebuggerDataBlock->OffsetPrcbProcStateContext); - for(i=0; i < 16; i++) { - Registers[i] = *(ULONG32*)ctx_to_reg(ctx, i, &size); + Registers[i] = *(ULONG32*)ctx_to_reg(&CurrentContext, i, &size); } send_gdb_memory(Registers, sizeof(Registers)); + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); } + +KDSTATUS +gdb_send_register( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + enum reg_name reg_name; + void *ptr; + unsigned short size; + + /* Get the GDB register name (gdb_input = "pXX") */ + reg_name = (hex_value(gdb_input[1]) << 4) | hex_value(gdb_input[2]); + + ptr = ctx_to_reg(&CurrentContext, reg_name, &size); + if (!ptr) + { + /* Undefined. Let's assume 32 bit register */ + send_gdb_packet("xxxxxxxx"); + } + else + { + send_gdb_memory(ptr, size); + } + return gdb_receive_and_interpret_packet(State, MessageData, MessageLength, KdContext); +} 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 20:45:30 2014 @@ -25,6 +25,18 @@ #define KDDBGPRINT KdpDbgPrint #endif +FORCEINLINE +VOID +InitManipulateFromStateChange( + _In_ ULONG ApiNumber, + _In_ const DBGKD_ANY_WAIT_STATE_CHANGE* StateChange, + _Out_ DBGKD_MANIPULATE_STATE64* Manipulate) +{ + Manipulate->ApiNumber = ApiNumber; + Manipulate->Processor = StateChange->Processor; + Manipulate->ProcessorLevel = StateChange->ProcessorLevel; +} + /* Callbacks to simulate a KdReceive <-> KdSend loop without GDB being aware of it */ typedef VOID (*KDP_SEND_HANDLER)( _In_ ULONG PacketType, @@ -40,7 +52,9 @@ /* gdb_input.c */ extern HANDLE gdb_dbg_thread; -KDSTATUS gdb_interpret_input(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); +extern HANDLE gdb_dbg_process; +extern KDSTATUS gdb_interpret_input(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); +extern KDSTATUS gdb_receive_and_interpret_packet(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); /* gdb_receive.c */ extern CHAR gdb_input[]; @@ -61,14 +75,18 @@ /* kdpacket.c */ extern DBGKD_ANY_WAIT_STATE_CHANGE CurrentStateChange; +extern CONTEXT CurrentContext; extern DBGKD_GET_VERSION64 KdVersion; extern KDDEBUGGER_DATA64* KdDebuggerDataBlock; extern KDP_SEND_HANDLER KdpSendPacketHandler; extern KDP_MANIPULATESTATE_HANDLER KdpManipulateStateHandler; - +/* Commone ManipulateState handlers */ +extern KDSTATUS ContinueManipulateStateHandler(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); +extern KDSTATUS SetContextManipulateHandler(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); /* arch_sup.c */ -void gdb_send_registers(void); +extern KDSTATUS gdb_send_register(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); +extern KDSTATUS gdb_send_registers(_Out_ DBGKD_MANIPULATE_STATE64* State, _Out_ PSTRING MessageData, _Out_ PULONG MessageLength, _Inout_ PKD_CONTEXT KdContext); /* Architecture specific defines. See ntoskrnl/include/internal/arch/ke.h */ #ifdef _M_IX86 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 20:45:30 2014 @@ -7,61 +7,145 @@ #include "kdgdb.h" +/* LOCALS *********************************************************************/ +static +VOID +FirstSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData); + /* GLOBALS ********************************************************************/ - -DBGKD_ANY_WAIT_STATE_CHANGE CurrentStateChange; DBGKD_GET_VERSION64 KdVersion; KDDEBUGGER_DATA64* KdDebuggerDataBlock; +BOOLEAN InException = FALSE; /* Callbacks used to communicate with KD aside from GDB */ -KDP_SEND_HANDLER KdpSendPacketHandler = NULL; +KDP_SEND_HANDLER KdpSendPacketHandler = FirstSendHandler; KDP_MANIPULATESTATE_HANDLER KdpManipulateStateHandler = NULL; - -/* LOCALS *********************************************************************/ -static BOOLEAN FakeNextManipulatePacket = FALSE; -static DBGKD_MANIPULATE_STATE64 FakeManipulateState = {0}; +/* Data describing the current exception */ +DBGKD_ANY_WAIT_STATE_CHANGE CurrentStateChange; +CONTEXT CurrentContext; /* PRIVATE FUNCTIONS **********************************************************/ + +static +VOID +GetContextSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData +) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + const CONTEXT* Context = (const CONTEXT*)MessageData->Buffer; + + if ((PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + || (State->ApiNumber != DbgKdGetContextApi) + || (MessageData->Length < sizeof(*Context))) + { + /* Should we bugcheck ? */ + KDDBGPRINT("ERROR: Received wrong packet from KD.\n"); + while (1); + } + + /* Just copy it */ + RtlCopyMemory(&CurrentContext, Context, sizeof(*Context)); + KdpSendPacketHandler = NULL; +} + +static +KDSTATUS +GetContextManipulateHandler( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext +) +{ + State->ApiNumber = DbgKdGetContextApi; + State->Processor = CurrentStateChange.Processor; + State->ReturnStatus = STATUS_SUCCESS; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + MessageData->Length = 0; + + /* Update the send <-> receive loop handler */ + KdpSendPacketHandler = GetContextSendHandler; + KdpManipulateStateHandler = NULL; + + return KdPacketReceived; +} + +static +VOID +SetContextSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData +) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + + /* We just confirm that all went well */ + if ((PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + || (State->ApiNumber != DbgKdSetContextApi) + || (State->ReturnStatus != STATUS_SUCCESS)) + { + /* Should we bugcheck ? */ + while (1); + } + + KdpSendPacketHandler = NULL; +} + +KDSTATUS +SetContextManipulateHandler( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext +) +{ + State->ApiNumber = DbgKdSetContextApi; + State->Processor = CurrentStateChange.Processor; + State->ReturnStatus = STATUS_SUCCESS; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + MessageData->Length = sizeof(CurrentContext); + + if (MessageData->MaximumLength < sizeof(CurrentContext)) + { + while (1); + } + + RtlCopyMemory(MessageData->Buffer, &CurrentContext, sizeof(CurrentContext)); + + /* Update the send <-> receive loop handlers */ + KdpSendPacketHandler = SetContextSendHandler; + KdpManipulateStateHandler = NULL; + + return KdPacketReceived; +} + static void send_kd_state_change(DBGKD_ANY_WAIT_STATE_CHANGE* StateChange) { - static BOOLEAN first = TRUE; - - /* Save current state for later GDB queries */ - CurrentStateChange = *StateChange; - - if (first) - { - /* - * This is the first packet we receive. - * We take this as an opportunity to connect with GDB and to - * get the KD version block - */ - FakeNextManipulatePacket = TRUE; - FakeManipulateState.ApiNumber = DbgKdGetVersionApi; - FakeManipulateState.Processor = StateChange->Processor; - FakeManipulateState.ProcessorLevel = StateChange->ProcessorLevel; - FakeManipulateState.ReturnStatus = STATUS_SUCCESS; - - first = FALSE; - return; - } - switch (StateChange->NewState) { case DbgKdLoadSymbolsStateChange: { /* We don't care about symbols loading */ - FakeNextManipulatePacket = TRUE; - FakeManipulateState.ApiNumber = DbgKdContinueApi; - FakeManipulateState.Processor = StateChange->Processor; - FakeManipulateState.ProcessorLevel = StateChange->ProcessorLevel; - FakeManipulateState.ReturnStatus = STATUS_SUCCESS; - FakeManipulateState.u.Continue.ContinueStatus = STATUS_SUCCESS; + KdpManipulateStateHandler = ContinueManipulateStateHandler; break; } case DbgKdExceptionStateChange: + /* Save current state for later GDB queries */ + CurrentStateChange = *StateChange; + /* Unless GDB tells us otherwise, those are what we should have */ + gdb_dbg_thread = PsGetThreadId((PETHREAD)StateChange->Thread); + gdb_dbg_process = PsGetThreadProcessId((PETHREAD)StateChange->Thread); gdb_send_exception(); + /* Next receive call will ask for the context */ + KdpManipulateStateHandler = GetContextManipulateHandler; break; default: /* FIXME */ @@ -100,19 +184,117 @@ gdb_send_registers((CONTEXT*)MessageData->Buffer); return; #endif - case DbgKdGetVersionApi: - { - LIST_ENTRY* DebuggerDataList; - /* Simply get a copy */ - RtlCopyMemory(&KdVersion, &State->u.GetVersion64, sizeof(KdVersion)); - DebuggerDataList = (LIST_ENTRY*)(ULONG_PTR)KdVersion.DebuggerDataList; - KdDebuggerDataBlock = CONTAINING_RECORD(DebuggerDataList->Flink, KDDEBUGGER_DATA64, Header.List); - return; - } default: /* FIXME */ while (1); } +} + +KDSTATUS +ContinueManipulateStateHandler( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext +) +{ + /* Let's go on */ + State->ApiNumber = DbgKdContinueApi; + State->ReturnStatus = STATUS_SUCCESS; /* ? */ + State->Processor = CurrentStateChange.Processor; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + if (MessageData) + MessageData->Length = 0; + *MessageLength = 0; + State->u.Continue.ContinueStatus = STATUS_SUCCESS; + + /* We definitely are at the end of the send <-> receive loop, if any */ + KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = NULL; + return KdPacketReceived; +} + +static +VOID +GetVersionSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData) +{ + DBGKD_MANIPULATE_STATE64* State = (DBGKD_MANIPULATE_STATE64*)MessageHeader->Buffer; + LIST_ENTRY* DebuggerDataList; + + /* Confirm that all went well */ + if ((PacketType != PACKET_TYPE_KD_STATE_MANIPULATE) + || (State->ApiNumber != DbgKdGetVersionApi) + || !NT_SUCCESS(State->ReturnStatus)) + { + /* FIXME: should detach from KD and go along without debugging */ + KDDBGPRINT("Wrong packet received after asking for data.\n"); + while(1); + } + + /* Copy the relevant data */ + RtlCopyMemory(&KdVersion, &State->u.GetVersion64, sizeof(KdVersion)); + DebuggerDataList = (LIST_ENTRY*)(ULONG_PTR)KdVersion.DebuggerDataList; + KdDebuggerDataBlock = CONTAINING_RECORD(DebuggerDataList->Flink, KDDEBUGGER_DATA64, Header.List); + + /* We can tell KD to continue */ + KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = ContinueManipulateStateHandler; +} + +static +KDSTATUS +GetVersionManipulateStateHandler( + _Out_ DBGKD_MANIPULATE_STATE64* State, + _Out_ PSTRING MessageData, + _Out_ PULONG MessageLength, + _Inout_ PKD_CONTEXT KdContext) +{ + /* Ask for the version data */ + State->ApiNumber = DbgKdGetVersionApi; + State->Processor = CurrentStateChange.Processor; + State->ProcessorLevel = CurrentStateChange.ProcessorLevel; + + /* The next send call will serve this query */ + KdpSendPacketHandler = GetVersionSendHandler; + KdpManipulateStateHandler = NULL; + + /* This will make KD breakin and we will be able to properly attach to GDB */ + KdContext->KdpControlCPending = TRUE; + + return KdPacketReceived; +} + +static +VOID +FirstSendHandler( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_ PSTRING MessageData) +{ + DBGKD_ANY_WAIT_STATE_CHANGE* StateChange = (DBGKD_ANY_WAIT_STATE_CHANGE*)MessageHeader->Buffer; + + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* This is not the packet we are waiting for */ + send_kd_debug_io((DBGKD_DEBUG_IO*)MessageHeader->Buffer, MessageData); + return; + } + + if (PacketType != PACKET_TYPE_KD_STATE_CHANGE64) + { + KDDBGPRINT("First KD packet is not a state change!\n"); + /* FIXME: What should we send back to KD ? */ + while(1); + } + + CurrentStateChange = *StateChange; + + /* The next receive call will be asking for the version data */ + KdpSendPacketHandler = NULL; + KdpManipulateStateHandler = GetVersionManipulateStateHandler; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -162,13 +344,6 @@ if (KdpManipulateStateHandler != NULL) return KdpManipulateStateHandler(State, MessageData, DataLength, KdContext); - if (FakeNextManipulatePacket) - { - FakeNextManipulatePacket = FALSE; - *State = FakeManipulateState; - return KdPacketReceived; - } - /* Receive data from GDB */ Status = gdb_receive_packet(KdContext); if (Status != KdPacketReceived)

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