Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 60729: [SAMSRV] Create and set a security descriptor for new alias account objects.
by ekohl＠svn.reactos.org 21 Oct '13

21 Oct '13

Author: ekohl Date: Mon Oct 21 18:53:26 2013 New Revision: 60729 URL: http://svn.reactos.org/svn/reactos?rev=60729&view=rev Log: [SAMSRV] Create and set a security descriptor for new alias account objects. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/security.c trunk/reactos/dll/win32/samsrv/setup.c 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] Mon Oct 21 18:53:26 2013 @@ -2714,6 +2714,8 @@ SAM_DOMAIN_FIXED_DATA FixedDomainData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT AliasObject; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; ULONG ulSize; ULONG ulRid; WCHAR szRid[9]; @@ -2755,6 +2757,15 @@ { TRACE("Alias name \'%S\' already exists in domain (Status 0x%08lx)\n", AccountName->Buffer, Status); + goto done; + } + + /* Create the security descriptor */ + Status = SampCreateAliasSD(&Sd, + &SdSize); + if (!NT_SUCCESS(Status)) + { + TRACE("SampCreateAliasSD failed (Status 0x%08lx)\n", Status); goto done; } @@ -2837,6 +2848,18 @@ goto done; } + /* Set SecDesc attribute*/ + Status = SampSetObjectAttribute(AliasObject, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + goto done; + } + if (NT_SUCCESS(Status)) { *AliasHandle = (SAMPR_HANDLE)AliasObject; @@ -2844,6 +2867,9 @@ } done: + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + RtlReleaseResource(&SampResource); TRACE("returns 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] Mon Oct 21 18:53:26 2013 @@ -321,12 +321,16 @@ OUT PULONG Size); NTSTATUS -SampCreateBuiltinDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, +SampCreateBuiltinDomainSD(OUT PSECURITY_DESCRIPTOR *DomainSd, OUT PULONG Size); NTSTATUS -SampCreateAccountDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, +SampCreateAccountDomainSD(OUT PSECURITY_DESCRIPTOR *DomainSd, OUT PULONG Size); + +NTSTATUS +SampCreateAliasSD(OUT PSECURITY_DESCRIPTOR *AliasSd, + OUT PULONG Size); /* setup.c */ Modified: trunk/reactos/dll/win32/samsrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/security.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] Mon Oct 21 18:53:26 2013 @@ -859,4 +859,292 @@ return Status; } + +NTSTATUS +SampCreateAliasSD(OUT PSECURITY_DESCRIPTOR *AliasSd, + OUT PULONG Size) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSECURITY_DESCRIPTOR RelSD = NULL; + PSID EveryoneSid = NULL; + PSID AnonymousSid = NULL; + PSID AdministratorsSid = NULL; + PSID AccountOperatorsSid = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; + ULONG DaclSize; + ULONG SaclSize; + ULONG RelSDSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + + /* Create the Everyone SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Anonymous SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_ANONYMOUS_LOGON_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &AnonymousSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Account Operators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ACCOUNT_OPS, + 0, + 0, + 0, + 0, + 0, + 0, + &AccountOperatorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Allocate a buffer for the absolute SD */ + AbsSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_DESCRIPTOR)); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Create the absolute SD */ + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + + 3 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AdministratorsSid) + + RtlLengthSid(AccountOperatorsSid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + READ_CONTROL | ALIAS_READ_INFORMATION | ALIAS_LIST_MEMBERS, + EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + ALIAS_ALL_ACCESS, + AdministratorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + ALIAS_ALL_ACCESS, + AccountOperatorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the SACL */ + SaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AnonymousSid); + + Sacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Sacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Sacl, + SaclSize, + ACL_REVISION); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | WRITE_DAC | DELETE | + ALIAS_WRITE_ACCOUNT | ALIAS_REMOVE_MEMBER | + ALIAS_ADD_MEMBER, + EveryoneSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + AnonymousSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the SACL */ + Status = RtlSetSaclSecurityDescriptor(AbsSD, + TRUE, + Sacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the group SID */ + Status = RtlSetGroupSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the reqired buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the self-relative SD */ + RelSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelSDSize); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Convert the absolute SD to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + RelSD, + &RelSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + *AliasSd = RelSD; + *Size = RelSDSize; + +done: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelSD); + } + + if (EveryoneSid != NULL) + RtlFreeSid(EveryoneSid); + + if (AnonymousSid != NULL) + RtlFreeSid(AnonymousSid); + + if (AdministratorsSid != NULL) + RtlFreeSid(AdministratorsSid); + + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (Sacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sacl); + + if (AbsSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AbsSD); + + return Status; +} + + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Mon Oct 21 18:53:26 2013 @@ -98,6 +98,8 @@ WCHAR szAccountKeyName[32]; HANDLE hAccountKey = NULL; HANDLE hNamesKey = NULL; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; NTSTATUS Status; swprintf(szAccountKeyName, L"Aliases\\%08lX", ulRelativeId); @@ -125,6 +127,20 @@ if (!NT_SUCCESS(Status)) goto done; + /* Create the server SD */ + Status = SampCreateAliasSD(&Sd, + &SdSize); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set SecDesc attribute*/ + Status = SampRegSetValue(hAccountKey, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + goto done; Status = SampRegOpenKey(hDomainKey, L"Aliases\\Names", @@ -141,6 +157,9 @@ done: SampRegCloseKey(&hNamesKey); + + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); if (hAccountKey != NULL) {

1 0

[ekohl] 60728: [SAMSRV] - SampSetupCreateUserAccount, SamrCreateUserInDomain and SamrCreateUser2InDomain: Set the PrivateData attribute. - SamrGetAliasMembership: Remove a superfluous call to SampR...
by ekohl＠svn.reactos.org 21 Oct '13

21 Oct '13

Author: ekohl Date: Mon Oct 21 10:25:21 2013 New Revision: 60728 URL: http://svn.reactos.org/svn/reactos?rev=60728&view=rev Log: [SAMSRV] - SampSetupCreateUserAccount, SamrCreateUserInDomain and SamrCreateUser2InDomain: Set the PrivateData attribute. - SamrGetAliasMembership: Remove a superfluous call to SampRegCloseKey. - SampQueryUserAll and SampSetUserAll: Disable access to the SecDesc attribute as long as it is not set upon user account creation. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/setup.c 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] Mon Oct 21 10:25:21 2013 @@ -2469,6 +2469,16 @@ goto done; } + /* Set the PrivateData attribute */ + Status = SampSetObjectAttributeString(UserObject, + L"PrivateData", + NULL); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + goto done; + } + /* FIXME: Set SecDesc attribute*/ if (NT_SUCCESS(Status)) @@ -3191,7 +3201,6 @@ } done: - SampRegCloseKey(&MembersKeyHandle); SampRegCloseKey(&MembersKeyHandle); SampRegCloseKey(&AliasesKeyHandle); @@ -6810,6 +6819,7 @@ if (InfoBuffer->All.WhichFields & USER_ALL_SECURITYDESCRIPTOR) { +#if 0 Length = 0; SampGetObjectAttribute(UserObject, L"SecDesc", @@ -6836,6 +6846,7 @@ if (!NT_SUCCESS(Status)) goto done; } +#endif } *Buffer = InfoBuffer; @@ -7607,11 +7618,13 @@ if (WhichFields & USER_ALL_SECURITYDESCRIPTOR) { +#if 0 Status = SampSetObjectAttribute(UserObject, L"SecDesc", REG_BINARY, Buffer->All.SecurityDescriptor.SecurityDescriptor, Buffer->All.SecurityDescriptor.Length); +#endif } if (WriteFixedData == TRUE) @@ -8786,6 +8799,16 @@ goto done; } + /* Set the PrivateData attribute */ + Status = SampSetObjectAttributeString(UserObject, + L"PrivateData", + NULL); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + goto done; + } + /* FIXME: Set SecDesc attribute*/ if (NT_SUCCESS(Status)) Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Mon Oct 21 10:25:21 2013 @@ -509,6 +509,16 @@ 0); if (!NT_SUCCESS(Status)) goto done; + + /* Set PrivateData attribute*/ + Status = SampRegSetValue(hAccountKey, + L"PrivateData", + REG_SZ, + (LPVOID)lpEmptyString, + sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + goto done; + /* FIXME: Set SecDesc attribute*/

1 0

[ekohl] 60727: [INCLUDE] - sam.idl: Rename GROUP_ATTRIBUTE_INFORMATION to SAMPR_GROUP_ATTRIBUTE_INFORMATION in order to avoid confilcts with new types in ntsam.h. - ntsam.h: Add missing group speci...
by ekohl＠svn.reactos.org 21 Oct '13

21 Oct '13

Author: ekohl Date: Mon Oct 21 09:13:14 2013 New Revision: 60727 URL: http://svn.reactos.org/svn/reactos?rev=60727&view=rev Log: [INCLUDE] - sam.idl: Rename GROUP_ATTRIBUTE_INFORMATION to SAMPR_GROUP_ATTRIBUTE_INFORMATION in order to avoid confilcts with new types in ntsam.h. - ntsam.h: Add missing group specific structures. Modified: trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=60… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Mon Oct 21 09:13:14 2013 @@ -439,6 +439,29 @@ GroupAdminCommentInformation, GroupReplicationInformation } GROUP_INFORMATION_CLASS; + +typedef struct _GROUP_GENERAL_INFORMATION +{ + UNICODE_STRING Name; + ULONG Attributes; + ULONG MemberCount; + UNICODE_STRING AdminComment; +} GROUP_GENERAL_INFORMATION, *PGROUP_GENERAL_INFORMATION; + +typedef struct _GROUP_NAME_INFORMATION +{ + UNICODE_STRING Name; +} GROUP_NAME_INFORMATION, *PGROUP_NAME_INFORMATION; + +typedef struct _GROUP_ATTRIBUTE_INFORMATION +{ + ULONG Attributes; +} GROUP_ATTRIBUTE_INFORMATION, *PGROUP_ATTRIBUTE_INFORMATION; + +typedef struct GROUP_ADM_COMMENT_INFORMATION +{ + UNICODE_STRING AdminComment; +} GROUP_ADM_COMMENT_INFORMATION, *PGROUP_ADM_COMMENT_INFORMATION; typedef struct _GROUP_MEMBERSHIP { 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] Mon Oct 21 09:13:14 2013 @@ -366,10 +366,10 @@ [case(DomainDisplayOemGroup)] SAMPR_DOMAIN_DISPLAY_OEM_GROUP_BUFFER OemGroupInformation; } SAMPR_DISPLAY_INFO_BUFFER, *PSAMPR_DISPLAY_INFO_BUFFER; -typedef struct _GROUP_ATTRIBUTE_INFORMATION +typedef struct _SAMPR_GROUP_ATTRIBUTE_INFORMATION { unsigned long Attributes; -} GROUP_ATTRIBUTE_INFORMATION, *PGROUP_ATTRIBUTE_INFORMATION; +} SAMPR_GROUP_ATTRIBUTE_INFORMATION, *PSAMPR_GROUP_ATTRIBUTE_INFORMATION; typedef struct _SAMPR_GROUP_GENERAL_INFORMATION { @@ -404,7 +404,7 @@ { [case(GroupGeneralInformation)] SAMPR_GROUP_GENERAL_INFORMATION General; [case(GroupNameInformation)] SAMPR_GROUP_NAME_INFORMATION Name; - [case(GroupAttributeInformation)] GROUP_ATTRIBUTE_INFORMATION Attribute; + [case(GroupAttributeInformation)] SAMPR_GROUP_ATTRIBUTE_INFORMATION Attribute; [case(GroupAdminCommentInformation)] SAMPR_GROUP_ADM_COMMENT_INFORMATION AdminComment; [case(GroupReplicationInformation)] SAMPR_GROUP_GENERAL_INFORMATION DoNotUse; } SAMPR_GROUP_INFO_BUFFER, *PSAMPR_GROUP_INFO_BUFFER;

1 0

[hbelusca] 60726: [CONSRV][WIN32K] - Fix console palette setting; introduce the ConsoleMakePalettePublic control code for NtUserConsoleControl API which is called by the SetConsolePalette to make t...
by hbelusca＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: hbelusca Date: Sun Oct 20 22:35:15 2013 New Revision: 60726 URL: http://svn.reactos.org/svn/reactos?rev=60726&view=rev Log: [CONSRV][WIN32K] - Fix console palette setting; introduce the ConsoleMakePalettePublic control code for NtUserConsoleControl API which is called by the SetConsolePalette to make the given palette handle public (indeed, the caller to SetConsoleHandle gives to this API a GDI palette handle which is aimed at being used by another process, i.e. by CSRSS.EXE; in normal operation this is impossible unless saying to GDI that the handle is meant to be public; that's what it's done there). Thanks to Aleksander and David (who provided tests) and Timo (see revision 60725) for having helped me in understanding what happened exactly there. - Remove now-unneeded DPRINT1s and the hacked palette that was introduced in revision 60629/60641. Part 1/2 Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sun Oct 20 22:35:15 2013 @@ -1571,6 +1571,7 @@ typedef enum _CONSOLECONTROL { GuiConsoleWndClassAtom, + ConsoleMakePalettePublic = 5, ConsoleAcquireDisplayOwnership, } CONSOLECONTROL, *PCONSOLECONTROL; @@ -1579,7 +1580,7 @@ NtUserConsoleControl( IN CONSOLECONTROL ConsoleCtrl, IN PVOID ConsoleCtrlInfo, - IN DWORD ConsoleCtrlInfoLength); + IN ULONG ConsoleCtrlInfoLength); HANDLE NTAPI Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sun Oct 20 22:35:15 2013 @@ -546,7 +546,7 @@ NtUserConsoleControl( IN CONSOLECONTROL ConsoleCtrl, IN PVOID ConsoleCtrlInfo, - IN DWORD ConsoleCtrlInfoLength) + IN ULONG ConsoleCtrlInfoLength) { NTSTATUS Status = STATUS_SUCCESS; @@ -562,8 +562,8 @@ { _SEH2_TRY { + ASSERT(ConsoleCtrlInfoLength == sizeof(ATOM)); ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - ASSERT(ConsoleCtrlInfoLength == sizeof(ATOM)); gaGuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -575,8 +575,33 @@ break; } + case ConsoleMakePalettePublic: + { + _SEH2_TRY + { + ASSERT(ConsoleCtrlInfoLength == sizeof(HPALETTE)); + ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); + /* + * Make the palette handle public - Use the extended + * function introduced by Timo in revision 60725. + */ + GreSetObjectOwnerEx(*(HPALETTE*)ConsoleCtrlInfo, + GDI_OBJ_HMGR_PUBLIC, + GDIOBJFLAG_IGNOREPID); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + break; + } + case ConsoleAcquireDisplayOwnership: { + ERR("NtUserConsoleControl - ConsoleAcquireDisplayOwnership is UNIMPLEMENTED\n"); + Status = STATUS_NOT_IMPLEMENTED; break; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Oct 20 22:35:15 2013 @@ -237,8 +237,6 @@ { BOOL Success; - DPRINT1("ConDrvSetConsolePalette\n"); - /* * Parameters validation */ @@ -256,11 +254,9 @@ ASSERT(Console == Buffer->Header.Console); /* Change the palette */ - DPRINT1("ConDrvSetConsolePalette calling TermSetPalette\n"); Success = TermSetPalette(Console, PaletteHandle, PaletteUsage); if (Success) { - DPRINT1("TermSetPalette succeeded\n"); /* Free the old palette handle if there was already one set */ if ( Buffer->PaletteHandle != NULL && Buffer->PaletteHandle != PaletteHandle ) @@ -271,10 +267,6 @@ /* Save the new palette in the screen buffer */ Buffer->PaletteHandle = PaletteHandle; Buffer->PaletteUsage = PaletteUsage; - } - else - { - DPRINT1("TermSetPalette failed\n"); } return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sun Oct 20 22:35:15 2013 @@ -63,38 +63,7 @@ // PGRAPHICS_SCREEN_BUFFER Buffer; PCONSOLE_SCREEN_BUFFER Buffer; - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - -#define PALETTESIZE 256 - - LPLOGPALETTE LogPalette; /* Pointer to logical palette */ - PALETTEENTRY MyPalette[] = - { {0, 0, 0x80,0} , // 1 - {0, 0x80,0, 0} , // 2 - {0, 0, 0, 0} , // 0 - {0, 0x80,0x80,0} , // 3 - {0x80,0, 0, 0} , // 4 - {0x80,0, 0x80,0} , // 5 - {0x80,0x80,0, 0} , // 6 - {0xC0,0xC0,0xC0,0} , // 7 - {0x80,0x80,0x80,0} , // 8 - {0, 0, 0xFF,0} , // 9 - {0, 0xFF,0, 0} , // 10 - {0, 0xFF,0xFF,0} , // 11 - {0xFF,0, 0, 0} , // 12 - {0xFF,0, 0xFF,0} , // 13 - {0xFF,0xFF,0, 0} , // 14 - {0xFF,0xFF,0xFF,0} }; // 15 - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - - - DPRINT1("SrvSetConsolePalette\n"); + DPRINT("SrvSetConsolePalette\n"); // NOTE: Tests show that this function is used only for graphics screen buffers // and otherwise it returns FALSE + sets last error to invalid handle. @@ -111,50 +80,20 @@ &Buffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - - DPRINT1("HACK: FIXME: SrvSetConsolePalette - Use hacked palette for testing purposes!!\n"); - - LogPalette = (LPLOGPALETTE)ConsoleAllocHeap(HEAP_ZERO_MEMORY, - (sizeof(LOGPALETTE) + - (sizeof(PALETTEENTRY) * PALETTESIZE))); - if (LogPalette) - { - UINT i; - - LogPalette->palVersion = 0x300; - LogPalette->palNumEntries = PALETTESIZE; - - for (i = 0 ; i < PALETTESIZE ; i++) - { - LogPalette->palPalEntry[i] = MyPalette[i % sizeof(MyPalette)/sizeof(MyPalette[0])]; - } - - SetPaletteRequest->PaletteHandle = CreatePalette(LogPalette); - SetPaletteRequest->Usage = SYSPAL_NOSTATIC256; - ConsoleFreeHeap(LogPalette); - } - else - { - DPRINT1("SrvSetConsolePalette - Hacked LogPalette is NULL\n"); - } - -/******************************************************************************\ -|************** HACK! HACK! HACK! HACK! HACK! HACK! HACK! HACK! ***************| -\******************************************************************************/ - - - DPRINT1("ConDrvSetConsolePalette calling...\n"); + /* + * Make the palette handle public, so that it can be + * used by other threads calling GDI functions on it. + * Indeed, the palette handle comes from a console app + * calling ourselves, running in CSRSS. + */ + NtUserConsoleControl(ConsoleMakePalettePublic, + &SetPaletteRequest->PaletteHandle, + sizeof(SetPaletteRequest->PaletteHandle)); Status = ConDrvSetConsolePalette(Buffer->Header.Console, Buffer, SetPaletteRequest->PaletteHandle, SetPaletteRequest->Usage); - - DPRINT1("ConDrvSetConsolePalette returned Status 0x%08lx\n", Status); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status;

1 0

[tkreuzer] 60725: [WIN32K] Add GreSetObjectOwnerEx, allowing to set the owner of not-owned objects by passing GDIOBJFLAG_IGNOREPID as 3rd parameter. Use with care :) Dedicated to Alexander and Hermès.
by tkreuzer＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: tkreuzer Date: Sun Oct 20 19:46:28 2013 New Revision: 60725 URL: http://svn.reactos.org/svn/reactos?rev=60725&view=rev Log: [WIN32K] Add GreSetObjectOwnerEx, allowing to set the owner of not-owned objects by passing GDIOBJFLAG_IGNOREPID as 3rd parameter. Use with care :) Dedicated to Alexander and Hermès. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sun Oct 20 19:46:28 2013 @@ -222,7 +222,7 @@ FORCEINLINE VOID -IncrementGdiHandleCount(void) +IncrementCurrentProcessGdiHandleCount(void) { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); if (ppi) InterlockedIncrement((LONG*)&ppi->GDIHandleCount); @@ -230,9 +230,39 @@ FORCEINLINE VOID -DecrementGdiHandleCount(void) +DecrementCurrentProcessGdiHandleCount(void) { PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + if (ppi) InterlockedDecrement((LONG*)&ppi->GDIHandleCount); +} + +FORCEINLINE +VOID +IncrementGdiHandleCount(ULONG ulProcessId) +{ + PEPROCESS pep; + PPROCESSINFO ppi; + NTSTATUS Status; + + Status = PsLookupProcessByProcessId(ULongToHandle(ulProcessId), &pep); + NT_ASSERT(NT_SUCCESS(Status)); + + ppi = PsGetProcessWin32Process(pep); + if (ppi) InterlockedIncrement((LONG*)&ppi->GDIHandleCount); +} + +FORCEINLINE +VOID +DecrementGdiHandleCount(ULONG ulProcessId) +{ + PEPROCESS pep; + PPROCESSINFO ppi; + NTSTATUS Status; + + Status = PsLookupProcessByProcessId(ULongToHandle(ulProcessId), &pep); + NT_ASSERT(NT_SUCCESS(Status)); + + ppi = PsGetProcessWin32Process(pep); if (ppi) InterlockedDecrement((LONG*)&ppi->GDIHandleCount); } @@ -497,7 +527,7 @@ /* Decrement the process handle count */ ASSERT(gpentHmgr[ulIndex].ObjectOwner.ulObj == HandleToUlong(PsGetCurrentProcessId())); - DecrementGdiHandleCount(); + DecrementCurrentProcessGdiHandleCount(); } /* Push entry to the free list */ @@ -710,7 +740,7 @@ if (ulOwner == GDI_OBJ_HMGR_POWNED) { /* Increment the process handle count */ - IncrementGdiHandleCount(); + IncrementCurrentProcessGdiHandleCount(); /* Use Process id */ ulOwner = HandleToUlong(PsGetCurrentProcessId()); @@ -729,50 +759,64 @@ NTAPI GDIOBJ_vSetObjectOwner( POBJ pobj, - ULONG ulOwner) + ULONG ulNewOwner) { PENTRY pentry; + ULONG ulOldOwner; /* This is a ugly HACK, needed to fix IntGdiSetDCOwnerEx */ if (GDI_HANDLE_IS_STOCKOBJ(pobj->hHmgr)) { - DPRINT("Trying to set ownership of stock object %p to %lx\n", pobj->hHmgr, ulOwner); + DPRINT("Trying to set ownership of stock object %p to %lx\n", pobj->hHmgr, ulNewOwner); return; } /* Get the handle entry */ - ASSERT(GDI_HANDLE_GET_INDEX(pobj->hHmgr)); + NT_ASSERT(GDI_HANDLE_GET_INDEX(pobj->hHmgr)); pentry = &gpentHmgr[GDI_HANDLE_GET_INDEX(pobj->hHmgr)]; + /* Check if the new owner is the same as the old one */ + ulOldOwner = pentry->ObjectOwner.ulObj; + if (ulOldOwner == ulNewOwner) + { + /* Nothing to do */ + return; + } + /* Is the current process requested? */ - if (ulOwner == GDI_OBJ_HMGR_POWNED) + if (ulNewOwner == GDI_OBJ_HMGR_POWNED) { /* Use process id */ - ulOwner = HandleToUlong(PsGetCurrentProcessId()); - if (pentry->ObjectOwner.ulObj != ulOwner) - { - IncrementGdiHandleCount(); - } + ulNewOwner = HandleToUlong(PsGetCurrentProcessId()); } // HACK - if (ulOwner == GDI_OBJ_HMGR_NONE) - ulOwner = GDI_OBJ_HMGR_PUBLIC; - - if (ulOwner == GDI_OBJ_HMGR_PUBLIC || - ulOwner == GDI_OBJ_HMGR_NONE) + if (ulNewOwner == GDI_OBJ_HMGR_NONE) + ulNewOwner = GDI_OBJ_HMGR_PUBLIC; + + /* Was the object process owned? */ + if ((ulOldOwner != GDI_OBJ_HMGR_PUBLIC) && + (ulOldOwner != GDI_OBJ_HMGR_NONE)) + { + /* Decrement the previous owners handle count */ + DecrementGdiHandleCount(ulOldOwner); + } + + /* Is the new owner a process? */ + if ((ulNewOwner != GDI_OBJ_HMGR_PUBLIC) && + (ulNewOwner != GDI_OBJ_HMGR_NONE)) + { + /* Increment the new owners handle count */ + IncrementGdiHandleCount(ulNewOwner); + } + else { /* Make sure we don't leak user mode memory */ - ASSERT(pentry->pUser == NULL); - if (pentry->ObjectOwner.ulObj != GDI_OBJ_HMGR_PUBLIC && - pentry->ObjectOwner.ulObj != GDI_OBJ_HMGR_NONE) - { - DecrementGdiHandleCount(); - } + NT_ASSERT(pentry->pUser == NULL); } /* Set new owner */ - pentry->ObjectOwner.ulObj = ulOwner; + pentry->ObjectOwner.ulObj = ulNewOwner; DBG_LOGEVENT(&pobj->slhLog, EVENT_SET_OWNER, 0); } @@ -970,34 +1014,44 @@ BOOL NTAPI +GreSetObjectOwnerEx( + HGDIOBJ hobj, + ULONG ulOwner, + ULONG Flags) +{ + PENTRY pentry; + + /* Check for stock objects */ + if (GDI_HANDLE_IS_STOCKOBJ(hobj)) + { + DPRINT("GreSetObjectOwner: Got stock object %p\n", hobj); + return FALSE; + } + + /* Reference the handle entry */ + pentry = ENTRY_ReferenceEntryByHandle(hobj, Flags); + if (!pentry) + { + DPRINT("GreSetObjectOwner: Invalid handle 0x%p.\n", hobj); + return FALSE; + } + + /* Call internal function */ + GDIOBJ_vSetObjectOwner(pentry->einfo.pobj, ulOwner); + + /* Dereference the object */ + GDIOBJ_vDereferenceObject(pentry->einfo.pobj); + + return TRUE; +} + +BOOL +NTAPI GreSetObjectOwner( HGDIOBJ hobj, ULONG ulOwner) { - PENTRY pentry; - - /* Check for stock objects */ - if (GDI_HANDLE_IS_STOCKOBJ(hobj)) - { - DPRINT("GreSetObjectOwner: Got stock object %p\n", hobj); - return FALSE; - } - - /* Reference the handle entry */ - pentry = ENTRY_ReferenceEntryByHandle(hobj, 0); - if (!pentry) - { - DPRINT("GreSetObjectOwner: Invalid handle 0x%p.\n", hobj); - return FALSE; - } - - /* Call internal function */ - GDIOBJ_vSetObjectOwner(pentry->einfo.pobj, ulOwner); - - /* Dereference the object */ - GDIOBJ_vDereferenceObject(pentry->einfo.pobj); - - return TRUE; + return GreSetObjectOwnerEx(hobj, ulOwner, 0); } INT Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Sun Oct 20 19:46:28 2013 @@ -93,6 +93,13 @@ HGDIOBJ hobj, ULONG ulOwner); +BOOL +NTAPI +GreSetObjectOwnerEx( + HGDIOBJ hobj, + ULONG ulOwner, + ULONG Flags); + INT NTAPI GreGetObject(

1 0

[aandrejevic] 60724: [NTVDM] Implement the "Get Default Drive" DOS command.
by aandrejevic＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: aandrejevic Date: Sun Oct 20 15:01:28 2013 New Revision: 60724 URL: http://svn.reactos.org/svn/reactos?rev=60724&view=rev Log: [NTVDM] Implement the "Get Default Drive" DOS command. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sun Oct 20 15:01:28 2013 @@ -1446,6 +1446,15 @@ break; } + /* Get Default Drive */ + case 0x19: + { + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFFFF00) | CurrentDrive); + + break; + } + /* Set Disk Transfer Area */ case 0x1A: {

1 0

[hbelusca] 60723: Fix the fix.
by hbelusca＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: hbelusca Date: Sun Oct 20 13:54:16 2013 New Revision: 60723 URL: http://svn.reactos.org/svn/reactos?rev=60723&view=rev Log: Fix the fix. Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Oct 20 13:54:16 2013 @@ -986,7 +986,7 @@ { 6, 8, - "El programa est instalando el cargador de arranque", + "El programa est instalando el cargador de arranque", TEXT_STYLE_NORMAL }, {

1 0

[hbelusca] 60722: [USETUP]: Fix spanish translations, suggestions by Mario Rugiero and Julio Carchi CORE-7516 #resolve #comment Suggestions committed in revision r60722. Thanks :)
by hbelusca＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: hbelusca Date: Sun Oct 20 13:51:18 2013 New Revision: 60722 URL: http://svn.reactos.org/svn/reactos?rev=60722&view=rev Log: [USETUP]: Fix spanish translations, suggestions by Mario Rugiero and Julio Carchi CORE-7516 #resolve #comment Suggestions committed in revision r60722. Thanks :) Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Oct 20 13:51:18 2013 @@ -986,25 +986,25 @@ { 6, 8, - "El programa est instalando el cargador de arranque", + "El programa est instalando el cargador de arranque", TEXT_STYLE_NORMAL }, { 8, 12, - "Instalar cargador de arranque en el disco duro (MBR and VBR).", + "Instalar el cargador de arranque en el disco duro (MBR y VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Instalar cargador de arranque en el disco duro (VBR only).", + "Instalar el cargador de arranque en el disco duro (s¢lo VBR).", TEXT_STYLE_NORMAL }, { 8, 14, - "Instalar cargador de inicio en un disquete.", + "Instalar el cargador de inicio en un disquete.", TEXT_STYLE_NORMAL }, {

1 0

[fireball] 60721: [NTOS] - Correctly compute addresses of MI_VAD_BITMAP and MI_WORKING_SET_LIST. In trunk's MM it went unnoticed because nothing really cares about these two structs.
by fireball＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: fireball Date: Sun Oct 20 09:41:54 2013 New Revision: 60721 URL: http://svn.reactos.org/svn/reactos?rev=60721&view=rev Log: [NTOS] - Correctly compute addresses of MI_VAD_BITMAP and MI_WORKING_SET_LIST. In trunk's MM it went unnoticed because nothing really cares about these two structs. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Sun Oct 20 09:41:54 2013 @@ -96,11 +96,11 @@ #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ +#define MI_DUMMY_PTE (PMMPTE)((ULONG_PTR)MI_MAPPING_RANGE_END + \ PAGE_SIZE) -#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ +#define MI_VAD_BITMAP (PMMPTE)((ULONG_PTR)MI_DUMMY_PTE + \ PAGE_SIZE) -#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ +#define MI_WORKING_SET_LIST (PMMPTE)((ULONG_PTR)MI_VAD_BITMAP + \ PAGE_SIZE) /* On x86, these two are the same */

1 0

[jimtabor] 60720: - Fix ATI test and go.
by jimtabor＠svn.reactos.org 20 Oct '13

20 Oct '13

Author: jimtabor Date: Sun Oct 20 05:36:36 2013 New Revision: 60720 URL: http://svn.reactos.org/svn/reactos?rev=60720&view=rev Log: - Fix ATI test and go. Modified: trunk/rostests/apitests/user32/AttachThreadInput.c Modified: trunk/rostests/apitests/user32/AttachThreadInput.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/AttachThr… ============================================================================== --- trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/AttachThreadInput.c [iso-8859-1] Sun Oct 20 05:36:36 2013 @@ -357,6 +357,7 @@ { BOOL ret; + trace("Thread hWnd0 0x%p hWnd1 0x%p\n",data[0].hWnd, data[1].hWnd); /* Window 1 is in the foreground */ SetForegroundWindow(data[1].hWnd); SetActiveWindow(data[0].hWnd); @@ -552,13 +553,33 @@ BOOL ret; + //trace("Thread hWnd0 0x%p hWnd1 0x%p\n",data[0].hWnd, data[1].hWnd); + /* First try sending input without attaching. It will go to the foreground */ { SetForegroundWindow(data[1].hWnd); SetActiveWindow(data[0].hWnd); - - ok(GetForegroundWindow() == data[1].hWnd, "wrong foreground\n"); - ok(GetActiveWindow() == data[0].hWnd, "wrong active\n"); + + ok(GetForegroundWindow() == data[1].hWnd, "wrong foreground got 0x%p\n",GetForegroundWindow()); + ok(GetActiveWindow() == data[0].hWnd, "wrong active got 0x%p\n",GetActiveWindow()); + + FlushMessages(); + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, empty_chain); + COMPARE_CACHE_(&data[1].cache, Thread1_chain); + } + + /* Next attach and send input. It will go to the same thread as before */ + { // from to + ret = AttachThreadInput( data[1].tid, data[0].tid , TRUE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); FlushMessages(); EMPTY_CACHE_(&data[0].cache); @@ -572,10 +593,34 @@ COMPARE_CACHE_(&data[0].cache, empty_chain); COMPARE_CACHE_(&data[1].cache, Thread1_chain); } - - /* Next attach and send input. It will go to the same thread as before */ - { - ret = AttachThreadInput( data[1].tid, data[0].tid , TRUE); + + /* Now set foreground and active again. Input will go to thread 0 */ + { + SetForegroundWindow(data[1].hWnd); + SetActiveWindow(data[0].hWnd); + FlushMessages(); + + ok(GetForegroundWindow() == data[0].hWnd, "wrong foreground got 0x%p\n",GetForegroundWindow()); + ok(GetActiveWindow() == data[0].hWnd, "wrong active got 0x%p\n",GetActiveWindow()); + + EMPTY_CACHE_(&data[0].cache); + EMPTY_CACHE_(&data[1].cache); + + keybd_event(VK_SHIFT, 0,0,0); + keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); + Sleep(100); + FlushMessages(); + + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, empty_chain); + + ret = AttachThreadInput( data[1].tid, data[0].tid , FALSE); + ok(ret==1, "expected AttachThreadInput to succeed\n"); + } + + /* Attach in the opposite order and send input */ + { + ret = AttachThreadInput( data[0].tid, data[1].tid , TRUE); ok(ret==1, "expected AttachThreadInput to succeed\n"); FlushMessages(); @@ -587,16 +632,19 @@ Sleep(100); FlushMessages(); - COMPARE_CACHE_(&data[0].cache, empty_chain); - COMPARE_CACHE_(&data[1].cache, Thread1_chain); - } - - /* Now set foregroung and active again. Input will go to thread 0 */ + COMPARE_CACHE_(&data[0].cache, Thread0_chain); + COMPARE_CACHE_(&data[1].cache, empty_chain); + } + + /* Now set foreground and active again. Input will go to thread 0 */ { SetForegroundWindow(data[1].hWnd); SetActiveWindow(data[0].hWnd); - FlushMessages(); + + ok(GetForegroundWindow() == data[0].hWnd, "wrong foreground got 0x%p\n",GetForegroundWindow()); + ok(GetActiveWindow() == data[0].hWnd, "wrong active got 0x%p\n",GetActiveWindow()); + EMPTY_CACHE_(&data[0].cache); EMPTY_CACHE_(&data[1].cache); @@ -608,45 +656,6 @@ COMPARE_CACHE_(&data[0].cache, Thread0_chain); COMPARE_CACHE_(&data[1].cache, empty_chain); - ret = AttachThreadInput( data[1].tid, data[0].tid , FALSE); - ok(ret==1, "expected AttachThreadInput to succeed\n"); - } - - /* Attach in the opposite order and send input */ - { - ret = AttachThreadInput( data[0].tid, data[1].tid , TRUE); - ok(ret==1, "expected AttachThreadInput to succeed\n"); - - FlushMessages(); - EMPTY_CACHE_(&data[0].cache); - EMPTY_CACHE_(&data[1].cache); - - keybd_event(VK_SHIFT, 0,0,0); - keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); - Sleep(100); - FlushMessages(); - - COMPARE_CACHE_(&data[0].cache, Thread0_chain); - COMPARE_CACHE_(&data[1].cache, empty_chain); - } - - /* Now set foregroung and active again. Input will go to thread 0 */ - { - SetForegroundWindow(data[1].hWnd); - SetActiveWindow(data[0].hWnd); - - FlushMessages(); - EMPTY_CACHE_(&data[0].cache); - EMPTY_CACHE_(&data[1].cache); - - keybd_event(VK_SHIFT, 0,0,0); - keybd_event(VK_SHIFT, 0,KEYEVENTF_KEYUP,0); - Sleep(100); - FlushMessages(); - - COMPARE_CACHE_(&data[0].cache, Thread0_chain); - COMPARE_CACHE_(&data[1].cache, empty_chain); - ret = AttachThreadInput( data[0].tid, data[1].tid , FALSE); ok(ret==1, "expected AttachThreadInput to succeed\n"); } @@ -657,9 +666,8 @@ if(!InitThreads()) return; - win_skip("skip Test_SimpleParameters that crash ros\n"); - //Test_SimpleParameters(); - //cleanup_attachments(); + Test_SimpleParameters(); + cleanup_attachments(); Test_Focus(); cleanup_attachments(); Test_UnaffectedMessages();

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