Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[tfaber] 56940: [ADVAPI32] - Fix a potential memory leak. Spotted by Hermès
by tfaber＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: tfaber Date: Sun Jul 22 18:48:28 2012 New Revision: 56940 URL: http://svn.reactos.org/svn/reactos?rev=56940&view=rev Log: [ADVAPI32] - Fix a potential memory leak. Spotted by Hermès Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Jul 22 18:48:28 2012 @@ -177,7 +177,7 @@ (lpService->ThreadParams.W.lpServiceMain)(lpService->ThreadParams.W.dwArgCount, lpService->ThreadParams.W.lpArgVector); - if (lpService->ThreadParams.A.lpArgVector != NULL) + if (lpService->ThreadParams.W.lpArgVector != NULL) { HeapFree(GetProcessHeap(), 0,

1 0

[tkreuzer] 56939: [NTOSKNRL] Add a missing NULL check in IoShutdownSystem
by tkreuzer＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: tkreuzer Date: Sun Jul 22 18:48:09 2012 New Revision: 56939 URL: http://svn.reactos.org/svn/reactos?rev=56939&view=rev Log: [NTOSKNRL] Add a missing NULL check in IoShutdownSystem Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Jul 22 18:48:09 2012 @@ -136,10 +136,10 @@ PIRP Irp; KEVENT Event; NTSTATUS Status; - + /* Initialize an event to wait on */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - + /* What phase? */ if (Phase == 0) { @@ -167,11 +167,14 @@ NULL, &Event, &StatusBlock); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) + if (Irp) { - /* Wait on the driver */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait on the driver */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } } /* Remove the flag */ @@ -202,7 +205,7 @@ /* Shutdown tape filesystems */ IopShutdownBaseFileSystems(&IopTapeFileSystemQueueHead); - + /* Loop last-chance shutdown notifications */ ListEntry = ExInterlockedRemoveHeadList(&LastChanceShutdownListHead, &ShutdownListLock); @@ -889,7 +892,7 @@ /* Set the Type and Size. Question: why is Size 0 on Windows? */ DeviceObjectExtension->Type = IO_TYPE_DEVICE_OBJECT_EXTENSION; DeviceObjectExtension->Size = 0; - + /* Initialize with Power Manager */ PoInitializeDeviceObject(DeviceObjectExtension); @@ -981,7 +984,7 @@ ASSERT((DriverObject->Flags & DRVO_UNLOAD_INVOKED) == 0); CreatedDeviceObject->DriverObject = DriverObject; IopEditDeviceList(DriverObject, CreatedDeviceObject, IopAdd); - + /* Link with the power manager */ if (CreatedDeviceObject->Vpb) PoVolumeDevice(CreatedDeviceObject); @@ -1402,7 +1405,7 @@ /* Set the DO */ Entry->DeviceObject = DeviceObject; - + /* Reference it so it doesn't go away */ ObReferenceObject(DeviceObject); @@ -1433,7 +1436,7 @@ /* Set the DO */ Entry->DeviceObject = DeviceObject; - + /* Reference it so it doesn't go away */ ObReferenceObject(DeviceObject); @@ -1457,7 +1460,7 @@ PSHUTDOWN_ENTRY ShutdownEntry; PLIST_ENTRY NextEntry; KIRQL OldIrql; - + /* Remove the flag */ DeviceObject->Flags &= ~DO_SHUTDOWN_REGISTERED; @@ -1480,7 +1483,7 @@ /* Free the entry */ ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); - + /* Get rid of our reference to it */ ObDereferenceObject(DeviceObject); } @@ -1507,7 +1510,7 @@ /* Free the entry */ ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); - + /* Get rid of our reference to it */ ObDereferenceObject(DeviceObject); }

1 0

[tfaber] 56938: [ADVAPI32] - Fix a double free
by tfaber＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: tfaber Date: Sun Jul 22 18:25:53 2012 New Revision: 56938 URL: http://svn.reactos.org/svn/reactos?rev=56938&view=rev Log: [ADVAPI32] - Fix a double free Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Jul 22 18:25:53 2012 @@ -575,10 +575,6 @@ break; } - HeapFree(GetProcessHeap(), - 0, - ControlPacket); - return TRUE; }

1 0

[tkreuzer] 56937: [CMAKE] Fix configure script for arm [GENINC] Add support for IMAGE_FILE_MACHINE_ARMNT
by tkreuzer＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: tkreuzer Date: Sun Jul 22 16:29:47 2012 New Revision: 56937 URL: http://svn.reactos.org/svn/reactos?rev=56937&view=rev Log: [CMAKE] Fix configure script for arm [GENINC] Add support for IMAGE_FILE_MACHINE_ARMNT Modified: trunk/reactos/configure.cmd trunk/reactos/tools/geninc/geninc.c Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=56937&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 22 16:29:47 2012 @@ -9,7 +9,7 @@ :: Configure host tools for x86 cmake -G %3 -DARCH=i386 %~dp0 - exit /b + exit ) :: Get the source root directory @@ -158,7 +158,7 @@ :: Use x86 for ARM host tools if "%ARCH%" == "arm" ( :: Launch new script instance for x86 host tools configuration - start "Preparing host tools for ARM cross build..." /WAIT /I /B %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% + start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% ) else ( cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR% ) Modified: trunk/reactos/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/geninc.c?rev=… ============================================================================== --- trunk/reactos/tools/geninc/geninc.c [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/geninc.c [iso-8859-1] Sun Jul 22 16:29:47 2012 @@ -3,6 +3,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + +#define IMAGE_FILE_MACHINE_I386 0x014c +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_ARMNT 0x01c4 #ifdef _WIN32 #define PRIx64 "I64x" @@ -112,7 +116,9 @@ goto quit; } - if (Machine != 0x14c && Machine != 0x8664) + if ((Machine != IMAGE_FILE_MACHINE_I386) && + (Machine != IMAGE_FILE_MACHINE_AMD64) && + (Machine != IMAGE_FILE_MACHINE_ARMNT)) { fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine); goto quit;

1 0

[ekohl] 56936: [SAMSRV] - Ensure that account names are not in use when a new alias, group or user is created. Return a proper status code if the account name is alread in use. - Initialize logon/p...
by ekohl＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: ekohl Date: Sun Jul 22 15:12:00 2012 New Revision: 56936 URL: http://svn.reactos.org/svn/reactos?rev=56936&view=rev Log: [SAMSRV] - Ensure that account names are not in use when a new alias, group or user is created. Return a proper status code if the account name is alread in use. - Initialize logon/password related data for new user account objects. - Add missing prototypes and user account control bits to ntsam.h Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sun Jul 22 15:12:00 2012 @@ -484,10 +484,10 @@ NTSTATUS -SampSetDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAliasName, - IN ULONG ulAliasValue) +SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName, + IN ULONG ulRelativeId) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -496,6 +496,8 @@ HANDLE NamesKeyHandle = NULL; NTSTATUS Status; + TRACE("SampSetAccountNameInDomain()\n"); + /* Open the container key */ RtlInitUnicodeString(&KeyName, lpContainerName); @@ -527,13 +529,13 @@ goto done; /* Set the alias value */ - RtlInitUnicodeString(&ValueName, lpAliasName); + RtlInitUnicodeString(&ValueName, lpAccountName); Status = NtSetValueKey(NamesKeyHandle, &ValueName, 0, REG_DWORD, - (LPVOID)&ulAliasValue, + (LPVOID)&ulRelativeId, sizeof(ULONG)); done: @@ -548,87 +550,6 @@ NTSTATUS -SampCheckDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAliasName, - OUT PBOOL bAliasExists) -{ - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE ContainerKeyHandle = NULL; - HANDLE NamesKeyHandle = NULL; - ULONG BufferLength = sizeof(ULONG); - NTSTATUS Status; - - /* Open the container key */ - RtlInitUnicodeString(&KeyName, lpContainerName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - DomainObject->KeyHandle, - NULL); - - Status = NtOpenKey(&ContainerKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return Status; - - /* Open the 'Names' key */ - RtlInitUnicodeString(&KeyName, L"Names"); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ContainerKeyHandle, - NULL); - - Status = NtOpenKey(&NamesKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - goto done; - - /* Get the alias value */ - RtlInitUnicodeString(&ValueName, lpAliasName); - - BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); - - /* Allocate memory for the value */ - ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); - if (ValueInfo == NULL) - return STATUS_NO_MEMORY; - - /* Query the value */ - Status = ZwQueryValueKey(NamesKeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &BufferLength); - - *bAliasExists = (Status != STATUS_OBJECT_NAME_NOT_FOUND); - - Status = STATUS_SUCCESS; - - /* Free the memory and return status */ - RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); - -done: - if (NamesKeyHandle) - NtClose(NamesKeyHandle); - - if (ContainerKeyHandle) - NtClose(ContainerKeyHandle); - - return Status; -} - - -NTSTATUS SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, IN LPWSTR lpAccountName) { @@ -636,7 +557,7 @@ HANDLE NamesKey; NTSTATUS Status; - TRACE("SampCheckNameInDomain()\n"); + TRACE("SampCheckAccountNameInDomain()\n"); Status = SampRegOpenKey(DomainObject->KeyHandle, L"Aliases", @@ -656,11 +577,12 @@ NULL, NULL); if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); Status = STATUS_ALIAS_EXISTS; + } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; - - SampRegCloseKey(NamesKey); } SampRegCloseKey(AccountKey); @@ -690,11 +612,12 @@ NULL, NULL); if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); Status = STATUS_ALIAS_EXISTS; + } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; - - SampRegCloseKey(NamesKey); } SampRegCloseKey(AccountKey); @@ -724,11 +647,12 @@ NULL, NULL); if (Status == STATUS_SUCCESS) + { + SampRegCloseKey(NamesKey); Status = STATUS_ALIAS_EXISTS; + } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) Status = STATUS_SUCCESS; - - SampRegCloseKey(NamesKey); } SampRegCloseKey(AccountKey); Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Jul 22 15:12:00 2012 @@ -1622,11 +1622,11 @@ return Status; } - /* Add the name alias for the user object */ - Status = SampSetDbObjectNameAlias(DomainObject, - L"Groups", - Name->Buffer, - ulRid); + /* Add the account name of the user object */ + Status = SampSetAccountNameInDomain(DomainObject, + L"Groups", + Name->Buffer, + ulRid); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -1723,6 +1723,13 @@ TRACE("SamrCreateUserInDomain(%p %p %lx %p %p)\n", DomainHandle, Name, DesiredAccess, UserHandle, RelativeId); + if (Name == NULL || + Name->Length == 0 || + Name->Buffer == NULL || + UserHandle == NULL || + RelativeId == NULL) + return STATUS_INVALID_PARAMETER; + /* Validate the domain handle */ Status = SampValidateDbObject(DomainHandle, SamDbDomainObject, @@ -1791,11 +1798,11 @@ return Status; } - /* Add the name alias for the user object */ - Status = SampSetDbObjectNameAlias(DomainObject, - L"Users", - Name->Buffer, - ulRid); + /* Add the account name for the user object */ + Status = SampSetAccountNameInDomain(DomainObject, + L"Users", + Name->Buffer, + ulRid); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); @@ -1805,12 +1812,17 @@ /* Initialize fixed user data */ memset(&FixedUserData, 0, sizeof(SAM_USER_FIXED_DATA)); FixedUserData.Version = 1; - + FixedUserData.LastLogon.QuadPart = 0; + FixedUserData.LastLogoff.QuadPart = 0; + FixedUserData.PasswordLastSet.QuadPart = 0; + FixedUserData.AccountExpires.LowPart = MAXULONG; + FixedUserData.AccountExpires.HighPart = MAXLONG; + FixedUserData.LastBadPasswordTime.QuadPart = 0; FixedUserData.UserId = ulRid; FixedUserData.PrimaryGroupId = DOMAIN_GROUP_RID_USERS; -// FixedUserData.UserAccountControl = USER_ACCOUNT_DISABLED | -// USER_PASSWORD_NOT_REQUIRED || -// USER_NORMAL_ACCOUNT; + FixedUserData.UserAccountControl = USER_ACCOUNT_DISABLED | + USER_PASSWORD_NOT_REQUIRED | + USER_NORMAL_ACCOUNT; /* Set fixed user data attribute */ Status = SampSetObjectAttribute(UserObject, @@ -2050,11 +2062,11 @@ return Status; } - /* Add the name alias for the user object */ - Status = SampSetDbObjectNameAlias(DomainObject, - L"Aliases", - AccountName->Buffer, - ulRid); + /* Add the account name for the alias object */ + Status = SampSetAccountNameInDomain(DomainObject, + L"Aliases", + AccountName->Buffer, + ulRid); if (!NT_SUCCESS(Status)) { TRACE("failed with status 0x%08lx\n", Status); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jul 22 15:12:00 2012 @@ -139,20 +139,14 @@ SampCloseDbObject(PSAM_DB_OBJECT DbObject); NTSTATUS -SampSetDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAliasName, - IN DWORD dwAliasValue); - -NTSTATUS -SampCheckDbObjectNameAlias(IN PSAM_DB_OBJECT DomainObject, - IN LPCWSTR lpContainerName, - IN LPCWSTR lpAliasName, - OUT PBOOL bAliasExists); - -NTSTATUS SampCheckAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, IN LPWSTR lpAccountName); + +NTSTATUS +SampSetAccountNameInDomain(IN PSAM_DB_OBJECT DomainObject, + IN LPCWSTR lpContainerName, + IN LPCWSTR lpAccountName, + IN ULONG ulRelativeId); NTSTATUS SampSetObjectAttribute(PSAM_DB_OBJECT DbObject, Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=56… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sun Jul 22 15:12:00 2012 @@ -162,6 +162,31 @@ USER_LIST_GROUPS |\ USER_READ_GROUP_INFORMATION |\ USER_WRITE_GROUP_INFORMATION) + +/* User account control bits */ +#define USER_ACCOUNT_DISABLED 0x00000001 +#define USER_HOME_DIRECTORY_REQUIRED 0x00000002 +#define USER_PASSWORD_NOT_REQUIRED 0x00000004 +#define USER_TEMP_DUPLICATE_ACCOUNT 0x00000008 +#define USER_NORMAL_ACCOUNT 0x00000010 +#define USER_MNS_LOGON_ACCOUNT 0x00000020 +#define USER_INTERDOMAIN_TRUST_ACCOUNT 0x00000040 +#define USER_WORKSTATION_TRUST_ACCOUNT 0x00000080 +#define USER_SERVER_TRUST_ACCOUNT 0x00000100 +#define USER_DONT_EXPIRE_PASSWORD 0x00000200 +#define USER_ACCOUNT_AUTO_LOCKED 0x00000400 +#define USER_ENCRYPTED_TEXT_PASSWORD_ALLOWED 0x00000800 +#define USER_SMARTCARD_REQUIRED 0x00001000 +#define USER_TRUSTED_FOR_DELEGATION 0x00002000 +#define USER_NOT_DELEGATED 0x00004000 +#define USER_USE_DES_KEY_ONLY 0x00008000 +#define USER_DONT_REQUIRE_PREAUTH 0x00010000 +#define USER_PASSWORD_EXPIRED 0x00020000 +#define USER_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION 0x00040000 +#define USER_NO_AUTH_DATA_REQUIRED 0x00080000 +#define USER_PARTIAL_SECRETS_ACCOUNT 0x00100000 +#define USER_USE_AES_KEYS 0x00200000 + typedef PVOID SAM_HANDLE, *PSAM_HANDLE; typedef ULONG SAM_ENUMERATE_HANDLE, *PSAM_ENUMERATE_HANDLE; @@ -293,6 +318,12 @@ NTSTATUS NTAPI +SamAddMemberToGroup(IN SAM_HANDLE GroupHandle, + IN ULONG MemberId, + IN ULONG Attributes); + +NTSTATUS +NTAPI SamCloseHandle(IN SAM_HANDLE SamHandle); NTSTATUS @@ -416,6 +447,12 @@ NTSTATUS NTAPI +SamQueryInformationGroup(IN SAM_HANDLE GroupHandle, + IN GROUP_INFORMATION_CLASS GroupInformationClass, + OUT PVOID *Buffer); + +NTSTATUS +NTAPI SamQueryInformationUser(IN SAM_HANDLE UserHandle, IN USER_INFORMATION_CLASS UserInformationClass, OUT PVOID *Buffer); @@ -435,7 +472,13 @@ NTAPI SamSetInformationDomain(IN SAM_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, - IN PVOID DomainInformation); + IN PVOID Buffer); + +NTSTATUS +NTAPI +SamSetInformationGroup(IN SAM_HANDLE GroupHandle, + IN GROUP_INFORMATION_CLASS GroupInformationClass, + IN PVOID Buffer); NTSTATUS NTAPI @@ -447,7 +490,6 @@ NTAPI SamShutdownSamServer(IN SAM_HANDLE ServerHandle); - #ifdef __cplusplus } #endif Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sun Jul 22 15:12:00 2012 @@ -628,9 +628,9 @@ { ENCRYPTED_NT_OWF_PASSWORD EncryptedNtOwfPassword; ENCRYPTED_LM_OWF_PASSWORD EncryptedLmOwfPassword; - unsigned char NtPasswordPresent; - unsigned char LmPasswordPresent; - unsigned char PasswordExpired; + BOOLEAN NtPasswordPresent; + BOOLEAN LmPasswordPresent; + BOOLEAN PasswordExpired; } SAMPR_USER_INTERNAL1_INFORMATION, *PSAMPR_USER_INTERNAL1_INFORMATION; typedef struct _SAMPR_USER_INTERNAL4_INFORMATION @@ -648,13 +648,13 @@ typedef struct _SAMPR_USER_INTERNAL5_INFORMATION { SAMPR_ENCRYPTED_USER_PASSWORD UserPassword; - unsigned char PasswordExpired; + BOOLEAN PasswordExpired; } SAMPR_USER_INTERNAL5_INFORMATION, *PSAMPR_USER_INTERNAL5_INFORMATION; typedef struct _SAMPR_USER_INTERNAL5_INFORMATION_NEW { SAMPR_ENCRYPTED_USER_PASSWORD_NEW UserPassword; - unsigned char PasswordExpired; + BOOLEAN PasswordExpired; } SAMPR_USER_INTERNAL5_INFORMATION_NEW, *PSAMPR_USER_INTERNAL5_INFORMATION_NEW; cpp_quote("#ifndef _NTSAM_")

1 0

[tkreuzer] 56935: [CMAKE] Add support for MSVC ARM Configuration script works as usual from VS 11 ARM command prompt, host tools is configured for x86 and must be compiled from a VS x86 command pro...
by tkreuzer＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: tkreuzer Date: Sun Jul 22 14:21:43 2012 New Revision: 56935 URL: http://svn.reactos.org/svn/reactos?rev=56935&view=rev Log: [CMAKE] Add support for MSVC ARM Configuration script works as usual from VS 11 ARM command prompt, host tools is configured for x86 and must be compiled from a VS x86 command prompt. Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=56935&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 22 14:21:43 2012 @@ -1,4 +1,16 @@ @echo off + +:: Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% +if /I "%1" == "arm_hosttools" ( + echo Configuring x86 host tools for ARM cross build + + :: This launches %VSINSTALLDIR%VS\vcvarsall.bat + call %2 x86 + + :: Configure host tools for x86 + cmake -G %3 -DARCH=i386 %~dp0 + exit /b +) :: Get the source root directory set REACTOS_SOURCE_DIR=%~dp0 @@ -37,6 +49,7 @@ :: VS command prompt does not put this in enviroment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 + cl 2>&1 | find "ARM" > NUL && set ARCH=arm cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8 cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9 cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 @@ -69,6 +82,8 @@ ) else if "%BUILD_ENVIRONMENT%" == "VS11" ( if "%ARCH%" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 11 Win64" + ) else if "%ARCH%" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 11 ARM" ) else ( set CMAKE_GENERATOR="Visual Studio 11" ) @@ -140,7 +155,14 @@ ) set REACTOS_BUILD_TOOLS_DIR=%CD% -cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +:: Use x86 for ARM host tools +if "%ARCH%" == "arm" ( + :: Launch new script instance for x86 host tools configuration + start "Preparing host tools for ARM cross build..." /WAIT /I /B %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR% +) else ( + cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR% +) + cd.. echo Preparing reactos...

1 0

[jgardou] 56934: [CMAKE] - Revert r56892 and r56889. Add a comment as to why this should be this way.
by jgardou＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: jgardou Date: Sun Jul 22 11:03:20 2012 New Revision: 56934 URL: http://svn.reactos.org/svn/reactos?rev=56934&view=rev Log: [CMAKE] - Revert r56892 and r56889. Add a comment as to why this should be this way. Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Sun Jul 22 11:03:20 2012 @@ -33,12 +33,11 @@ COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman) -# Then we create the actual cab file -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab +# Then we create the actual cab file using a custom target +# Please do not change this into custom command + custom target. This breaks reactos.cab dependencies on modules +# and you can't do something like "make gdi32/fast reactos_cab/fast bootcd/fast" +add_custom_target(reactos_cab COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman) -# Finally, we create the reactos_cab target -add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)

1 0

[jgardou] 56933: [DIBLIB] - Fix GCC compilation
by jgardou＠svn.reactos.org 22 Jul '12

22 Jul '12

Author: jgardou Date: Sun Jul 22 00:15:02 2012 New Revision: 56933 URL: http://svn.reactos.org/svn/reactos?rev=56933&view=rev Log: [DIBLIB] - Fix GCC compilation Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c trunk/reactos/win32ss/gdi/diblib/DibLib.h Modified: trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/BitBlt_… ============================================================================== --- trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c [iso-8859-1] Sun Jul 22 00:15:02 2012 @@ -45,14 +45,15 @@ pjSrcBase += pBltData->siSrc.cjAdvanceY; } } +#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 #else #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #endif -#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf_manual 1 -#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1 -#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1 -#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 +#define Dib_BitBlt_SRCCOPY_EqSurf_manual 1 +// #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1 +// #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1 +// #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 #define __USES_SOURCE 1 #define __USES_PATTERN 0 Modified: trunk/reactos/win32ss/gdi/diblib/DibLib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/diblib/DibLib.… ============================================================================== --- trunk/reactos/win32ss/gdi/diblib/DibLib.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/diblib/DibLib.h [iso-8859-1] Sun Jul 22 00:15:02 2012 @@ -30,15 +30,16 @@ #define __PASTE_(s1,s2) s1##s2 #define __PASTE(s1,s2) __PASTE_(s1,s2) +#define EVALUATE(x) x #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) #define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name, dst_bpp) -#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurf -#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfL2R -#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfR2L +#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurf) +#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfL2R) +#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfR2L) #define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1) #define _WritePixel_1(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(1<<(jShift))) | ((ulColor)<<(jShift))))

1 0

[fireball] 56932: [CMLIB] - Remove unused HFILE_TYPE_ALTERNATE. - Reapply changes from r56884: Hermes Belusca: Fix wrong definition of CMHIVE structure. See issue #7162 for more details.
by fireball＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: fireball Date: Sat Jul 21 23:27:30 2012 New Revision: 56932 URL: http://svn.reactos.org/svn/reactos?rev=56932&view=rev Log: [CMLIB] - Remove unused HFILE_TYPE_ALTERNATE. - Reapply changes from r56884: Hermes Belusca: Fix wrong definition of CMHIVE structure. See issue #7162 for more details. Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivedata.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=5693… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Jul 21 23:27:30 2012 @@ -151,7 +151,7 @@ typedef struct _CMHIVE { HHIVE Hive; - HANDLE FileHandles[3]; + HANDLE FileHandles[HFILE_TYPE_MAX]; LIST_ENTRY NotifyList; LIST_ENTRY HiveList; EX_PUSH_LOCK HiveLock; Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Jul 21 23:27:30 2012 @@ -31,10 +31,9 @@ // Hive types // #define HFILE_TYPE_PRIMARY 0 -#define HFILE_TYPE_ALTERNATE 1 -#define HFILE_TYPE_LOG 2 -#define HFILE_TYPE_EXTERNAL 3 -#define HFILE_TYPE_MAX 4 +#define HFILE_TYPE_LOG 1 +#define HFILE_TYPE_EXTERNAL 2 +#define HFILE_TYPE_MAX 3 // // Hive sizes

1 0

[jgardou] 56931: [WIN32SS/USER] - Handle transferring buffer to user mode in WH_CALLWNDPROC(RET) hooks if lParam is a pointer. This fixes the gallium3d opengl ICD, so newest VMWare opengl Driver sh...
by jgardou＠svn.reactos.org 21 Jul '12

21 Jul '12

Author: jgardou Date: Sat Jul 21 22:59:41 2012 New Revision: 56931 URL: http://svn.reactos.org/svn/reactos?rev=56931&view=rev Log: [WIN32SS/USER] - Handle transferring buffer to user mode in WH_CALLWNDPROC(RET) hooks if lParam is a pointer. This fixes the gallium3d opengl ICD, so newest VMWare opengl Driver should now work. Please TEST! Modified: trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -13,6 +13,7 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserCallback); + /* CALLBACK MEMORY MANAGEMENT ************************************************/ typedef struct _INT_CALLBACK_HEADER @@ -115,8 +116,8 @@ /* Calls ClientLoadLibrary in user32 */ HMODULE -co_IntClientLoadLibrary(PUNICODE_STRING pstrLibName, - PUNICODE_STRING pstrInitFunc, +co_IntClientLoadLibrary(PUNICODE_STRING pstrLibName, + PUNICODE_STRING pstrInitFunc, BOOL Unload, BOOL ApiHook) { @@ -139,7 +140,7 @@ } if(pstrInitFunc) { - pInitFuncBuffer = ArgumentLength; + pInitFuncBuffer = ArgumentLength; ArgumentLength += pstrInitFunc->Length + sizeof(WCHAR); } @@ -443,6 +444,7 @@ PWND pWnd; PMSG pMsg = NULL; BOOL Hit = FALSE; + UINT lParamSize = 0; ASSERT(Proc); @@ -509,11 +511,21 @@ ArgumentLength += sizeof(MOUSEHOOKSTRUCT); break; case WH_CALLWNDPROC: + { + CWPSTRUCT* pCWP = (CWPSTRUCT*) lParam; ArgumentLength += sizeof(CWPSTRUCT); - break; + lParamSize = lParamMemorySize(pCWP->message, pCWP->wParam, pCWP->lParam); + ArgumentLength += lParamSize; + break; + } case WH_CALLWNDPROCRET: + { + CWPRETSTRUCT* pCWPR = (CWPRETSTRUCT*) lParam; ArgumentLength += sizeof(CWPRETSTRUCT); - break; + lParamSize = lParamMemorySize(pCWPR->message, pCWPR->wParam, pCWPR->lParam); + ArgumentLength += lParamSize; + break; + } case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: @@ -583,12 +595,25 @@ Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; case WH_CALLWNDPROC: + /* For CALLWNDPROC and CALLWNDPROCRET, we must be wary of the fact that + * lParam could be a pointer to a buffer. This buffer must be exported + * to user space too */ RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + if(lParamSize) + { + RtlCopyMemory(Extra + sizeof(CWPSTRUCT), (PVOID)((CWPSTRUCT*)lParam)->lParam, lParamSize); + ((CWPSTRUCT*)Extra)->lParam = (LPARAM)lParamSize; + } break; case WH_CALLWNDPROCRET: RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPRETSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + if(lParamSize) + { + RtlCopyMemory(Extra + sizeof(CWPRETSTRUCT), (PVOID)((CWPRETSTRUCT*)lParam)->lParam, lParamSize); + ((CWPRETSTRUCT*)Extra)->lParam = (LPARAM)lParamSize; + } break; case WH_MSGFILTER: case WH_SYSMSGFILTER: Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -223,6 +223,13 @@ return Size; } +UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PMSGMEMORY MsgMemory = FindMsgMemory(Msg); + if(MsgMemory == NULL) return 0; + return MsgMemorySize(MsgMemory, wParam, lParam); +} + static NTSTATUS PackParam(LPARAM *lParamPacked, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL NonPagedPoolNeeded) { @@ -2143,7 +2150,7 @@ } else { - ERR("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); + ERR("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); Ret = FALSE; } UserLeave(); Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -296,4 +296,6 @@ BOOL ForceChange); DWORD APIENTRY IntGetQueueStatus(DWORD); + +UINT lParamMemorySize(UINT Msg, WPARAM wParam, LPARAM lParam); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Sat Jul 21 22:59:41 2012 @@ -216,7 +216,7 @@ ClientInfo = GetWin32ClientInfo(); if (!ClientInfo->phkCurrent) return 0; - + pHook = DesktopPtrToUser(ClientInfo->phkCurrent); if (!pHook->phkNext) return 0; // Nothing to do.... @@ -240,7 +240,7 @@ NtUserMessageCall( pCWP->hwnd, pCWP->message, pCWP->wParam, - pCWP->lParam, + pCWP->lParam, (ULONG_PTR)&lResult, FNID_CALLWNDPROC, phkNext->Ansi); @@ -254,7 +254,7 @@ NtUserMessageCall( pCWPR->hwnd, pCWPR->message, pCWPR->wParam, - pCWPR->lParam, + pCWPR->lParam, (ULONG_PTR)&lResult, FNID_CALLWNDPROCRET, phkNext->Ansi); @@ -427,8 +427,8 @@ return IntSetWindowsHook(idHook, lpfn, hMod, dwThreadId, FALSE); } -HINSTANCE ClientLoadLibrary(PUNICODE_STRING pstrLibName, - PUNICODE_STRING pstrInitFunc, +HINSTANCE ClientLoadLibrary(PUNICODE_STRING pstrLibName, + PUNICODE_STRING pstrInitFunc, BOOL Unload, BOOL ApiHook) { @@ -440,7 +440,7 @@ TRACE("ClientLoadLibrary: pid: %d, strLibraryName: %S, " "strInitFuncName: %S, Unload: %d, ApiHook:%d\n", - GetCurrentProcessId(), + GetCurrentProcessId(), pstrLibName->Buffer, pstrInitFunc->Buffer, Unload, @@ -467,7 +467,7 @@ /* Initialize the user api hook */ ASSERT(pstrInitFunc->Buffer); - /*Status = */ RtlUnicodeStringToAnsiString(&InitFuncName, + /*Status = */ RtlUnicodeStringToAnsiString(&InitFuncName, pstrInitFunc, TRUE); @@ -539,7 +539,7 @@ } /* Call the implementation of the callback */ - Result = ClientLoadLibrary(&Argument->strLibraryName, + Result = ClientLoadLibrary(&Argument->strLibraryName, &Argument->strInitFuncName, Argument->Unload, Argument->ApiHook); @@ -558,9 +558,9 @@ MSLLHOOKSTRUCT MouseLlData, *pMouseLlData; MSG *pcMsg, *pMsg; PMOUSEHOOKSTRUCT pMHook; - CWPSTRUCT CWP, *pCWP; - CWPRETSTRUCT CWPR, *pCWPR; - PRECTL prl; + CWPSTRUCT *pCWP; + CWPRETSTRUCT *pCWPR; + PRECTL prl; LPCBTACTIVATESTRUCT pcbtas; WPARAM wParam = 0; LPARAM lParam = 0; @@ -631,7 +631,7 @@ switch(Common->Code) { case HCBT_CREATEWND: - CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; + CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; CbtCreatewndExtra->Cs.x = CbtCreatewndw.lpcs->x; CbtCreatewndExtra->Cs.y = CbtCreatewndw.lpcs->y; CbtCreatewndExtra->Cs.cx = CbtCreatewndw.lpcs->cx; @@ -666,14 +666,34 @@ break; case WH_CALLWNDPROC: // ERR("WH_CALLWNDPROC: Code %d, wParam %d\n",Common->Code,Common->wParam); - pCWP = (PCWPSTRUCT)((PCHAR) Common + Common->lParam); - RtlCopyMemory(&CWP, pCWP, sizeof(CWPSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWP); + pCWP = HeapAlloc(GetProcessHeap(), 0, ArgumentLength - sizeof(HOOKPROC_CALLBACK_ARGUMENTS)); + RtlCopyMemory(pCWP, (PCHAR) Common + Common->lParam, sizeof(CWPSTRUCT)); + /* If more memory is reserved, then lParam is a pointer. + * Size of the buffer is stocked in the lParam member, and its content + * is at the end of the argument buffer */ + if(ArgumentLength > (sizeof(CWPSTRUCT) + sizeof(HOOKPROC_CALLBACK_ARGUMENTS))) + { + RtlCopyMemory((PCHAR)pCWP + sizeof(CWPSTRUCT), + (PCHAR)Common + Common->lParam + sizeof(CWPSTRUCT), + pCWP->lParam); + pCWP->lParam = (LPARAM)((PCHAR)pCWP + sizeof(CWPSTRUCT)); + } + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWP); + HeapFree(GetProcessHeap(), 0, pCWP); break; case WH_CALLWNDPROCRET: - pCWPR = (PCWPRETSTRUCT)((PCHAR) Common + Common->lParam); - RtlCopyMemory(&CWPR, pCWPR, sizeof(CWPRETSTRUCT)); - Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) &CWPR); + /* Almost the same as WH_CALLWNDPROC */ + pCWPR = HeapAlloc(GetProcessHeap(), 0, ArgumentLength - sizeof(HOOKPROC_CALLBACK_ARGUMENTS)); + RtlCopyMemory(pCWPR, (PCHAR) Common + Common->lParam, sizeof(CWPRETSTRUCT)); + if(ArgumentLength > (sizeof(CWPRETSTRUCT) + sizeof(HOOKPROC_CALLBACK_ARGUMENTS))) + { + RtlCopyMemory((PCHAR)pCWPR + sizeof(CWPRETSTRUCT), + (PCHAR)Common + Common->lParam + sizeof(CWPRETSTRUCT), + pCWPR->lParam); + pCWPR->lParam = (LPARAM)((PCHAR)pCWPR + sizeof(CWPRETSTRUCT)); + } + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) pCWPR); + HeapFree(GetProcessHeap(), 0, pCWPR); break; case WH_MSGFILTER: /* All SEH support */ case WH_SYSMSGFILTER: @@ -698,7 +718,7 @@ case WH_KEYBOARD: case WH_SHELL: Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); - break; + break; case WH_FOREGROUNDIDLE: /* <-- SEH support */ _SEH2_TRY {

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2012