Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[hbelusca] 65012: [NTVDM]: Return the latched data for keyboard ps/2 port only. Also when starting an app put a ENTER key release into the keyboard buffer because some apps expect it.
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 15:01:14 2014 New Revision: 65012 URL: http://svn.reactos.org/svn/reactos?rev=65012&view=rev Log: [NTVDM]: Return the latched data for keyboard ps/2 port only. Also when starting an app put a ENTER key release into the keyboard buffer because some apps expect it. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/ntvdm/hardware/ps2.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sun Oct 26 15:01:14 2014 @@ -19,6 +19,9 @@ #include "dos/dem.h" #include "bios/bios.h" + +#include "io.h" +#include "hardware/ps2.h" /* PRIVATE VARIABLES **********************************************************/ @@ -1164,6 +1167,12 @@ /* Attach to the console */ VidBiosAttachToConsole(); // FIXME: And in fact, attach the full NTVDM UI to the console + // HACK: Simulate a ENTER key release scancode on the PS/2 port because + // some apps expect to read a key release scancode (> 0x80) when they + // are started. + IOWriteB(PS2_CONTROL_PORT, 0xD2); // Next write is for the first PS/2 port + IOWriteB(PS2_DATA_PORT, 0x80 | 0x1C); // ENTER key release + /* Start simulation */ SetEvent(VdmTaskEvent); CpuSimulate(); Modified: trunk/reactos/subsystems/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/keyboard.c [iso-8859-1] Sun Oct 26 15:01:14 2014 @@ -47,7 +47,7 @@ BOOLEAN KeyboardInit(BYTE PS2Connector) { - /* Finish to plug the mouse to the specified PS/2 port */ + /* Finish to plug the keyboard to the specified PS/2 port */ PS2Port = PS2Connector; PS2SetDeviceCmdProc(PS2Port, NULL, KeyboardCommand); Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Sun Oct 26 15:01:14 2014 @@ -80,11 +80,14 @@ if (StatusRegister & (1 << 0)) // || StatusRegister & (1 << 5) for second PS/2 port StatusRegister &= ~(1 << 0); // StatusRegister &= ~(1 << 5); + // FIXME: We may check there whether there is data latched in + // PS2 ports 1 or 2 (keyboard or mouse) and retrieve it there... + /* Always return the available byte stored in the output buffer */ return OutputBuffer; } - return 0; + return 0x00; } static VOID WINAPI PS2WritePort(USHORT Port, BYTE Data) @@ -270,7 +273,18 @@ if (!Port->IsEnabled) return FALSE; /* Make sure the queue is not empty (fast check) */ - if (Port->QueueEmpty) return FALSE; + if (Port->QueueEmpty) + { + /* Only the keyboard should have its last data latched */ + // FIXME: Alternatively this can be done in PS2ReadPort when + // we read PS2_DATA_PORT. What is the best solution?? + if (PS2Port == 0) + { + OutputBuffer = Port->Queue[(Port->QueueStart - 1) % BUFFER_SIZE]; + } + + return FALSE; + } WaitForSingleObject(Port->QueueMutex, INFINITE); @@ -337,7 +351,7 @@ Port->QueueEnd++; Port->QueueEnd %= BUFFER_SIZE; - /* Since we inserted a value, it's not empty anymore */ + /* The queue is not empty anymore */ Port->QueueEmpty = FALSE; /*

1 0

[aandrejevic] 65011: [NTVDM] Signal the next IRQ on EOI.
by aandrejevic＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: aandrejevic Date: Sun Oct 26 14:57:44 2014 New Revision: 65011 URL: http://svn.reactos.org/svn/reactos?rev=65011&view=rev Log: [NTVDM] Signal the next IRQ on EOI. Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Sun Oct 26 14:57:44 2014 @@ -84,6 +84,12 @@ { /* Otherwise, clear all of them */ Pic->InServiceRegister = 0; + } + + if (MasterPic.IntRequestRegister || SlavePic.IntRequestRegister) + { + /* Signal the next IRQ */ + EmulatorInterruptSignal(); } } }

1 0

[akhaldi] 65010: [ADVAPI32] * Import ADVAPI_GetComputerSid from Wine 1.7.27. * Apply Wine commit f7a6c4c3 by Detlef Riekenberg: Allow string alias for common RID in sid strings. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 11:55:05 2014 New Revision: 65010 URL: http://svn.reactos.org/svn/reactos?rev=65010&view=rev Log: [ADVAPI32] * Import ADVAPI_GetComputerSid from Wine 1.7.27. * Apply Wine commit f7a6c4c3 by Detlef Riekenberg: Allow string alias for common RID in sid strings. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 11:55:05 2014 @@ -115,26 +115,28 @@ { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, }; +/* these SIDs must be constructed as relative to some domain - only the RID is well-known */ typedef struct WELLKNOWNRID { + WCHAR wstr[2]; WELL_KNOWN_SID_TYPE Type; DWORD Rid; } WELLKNOWNRID; static const WELLKNOWNRID WellKnownRids[] = { - { WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, - { WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, - { WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, - { WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, - { WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, - { WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, - { WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, - { WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, - { WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, - { WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, - { WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, - { WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, - { WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, + { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, + { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, + { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, + { {0,0}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { {0,0}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { {0,0}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { {0,0}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { {0,0}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { {0,0}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { {0,0}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { {0,0}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { {0,0}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { {0,0}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, }; static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; @@ -301,6 +303,24 @@ return Result; } +/************************************************************ + * ADVAPI_GetComputerSid + */ +BOOL ADVAPI_GetComputerSid(PSID sid) +{ + static const struct /* same fields as struct SID */ + { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[4]; + } computer_sid = + { SID_REVISION, 4, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0 } }; + + memcpy( sid, &computer_sid, sizeof(computer_sid) ); + return TRUE; +} + /* Exported functions */ /* @@ -3621,6 +3641,15 @@ for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) + { + MAX_SID local; + ADVAPI_GetComputerSid(&local); + return GetSidLengthRequired(*GetSidSubAuthorityCount(&local) + 1); + } + } return GetSidLengthRequired(0); @@ -3648,7 +3677,7 @@ *cBytes = ComputeStringSidSize(StringSid); if (!pisid) /* Simply compute the size */ { - TRACE("only size requested, returning TRUE\n"); + TRACE("only size requested, returning TRUE with %d\n", *cBytes); return TRUE; } @@ -3727,6 +3756,15 @@ bret = TRUE; } + for (i = 0; i < sizeof(WellKnownRids)/sizeof(WellKnownRids[0]); i++) + if (!strncmpW(WellKnownRids[i].wstr, StringSid, 2)) + { + ADVAPI_GetComputerSid(pisid); + pisid->SubAuthority[pisid->SubAuthorityCount] = WellKnownRids[i].Rid; + pisid->SubAuthorityCount++; + bret = TRUE; + } + if (!bret) FIXME("String constant not supported: %s\n", debugstr_wn(StringSid, 2)); }

1 0

[hbelusca] 65009: [FAST486][NTVDM]: Do not compile some FPU functions when FAST486_NO_FPU is defined (fixes build).
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 11:50:14 2014 New Revision: 65009 URL: http://svn.reactos.org/svn/reactos?rev=65009&view=rev Log: [FAST486][NTVDM]: Do not compile some FPU functions when FAST486_NO_FPU is defined (fixes build). Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/subsystems/ntvdm/cpu/registers.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6500… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun Oct 26 11:50:14 2014 @@ -32,6 +32,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#ifndef FAST486_NO_FPU + static ULONGLONG UnsignedMult128(ULONGLONG Multiplicand, ULONGLONG Multiplier, @@ -302,6 +304,8 @@ UNREFERENCED_PARAMETER(TempResult); UNIMPLEMENTED; } + +#endif /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/ntvdm/cpu/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/regis… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/registers.c [iso-8859-1] Sun Oct 26 11:50:14 2014 @@ -39,6 +39,7 @@ IntelRegPtr.Dr7 = EmulatorContext.DebugRegisters[FAST486_REG_DR7]; } +#ifndef FAST486_NO_FPU if (IntelRegPtr.ContextFlags & CONTEXT_FLOATING_POINT) { // IntelRegPtr.FloatSave = ; @@ -52,6 +53,7 @@ // IntelRegPtr.FloatSave.RegisterArea = ; // This is a region of size SIZE_OF_80387_REGISTERS == 80 bytes // IntelRegPtr.FloatSave.Cr0NpxState = ; } +#endif if (IntelRegPtr.ContextFlags & CONTEXT_SEGMENTS) {

1 0

[akhaldi] 65008: [ADVAPI32] * Reorder AceRights to reduce difference to Wine. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 11:47:29 2014 New Revision: 65008 URL: http://svn.reactos.org/svn/reactos?rev=65008&view=rev Log: [ADVAPI32] * Reorder AceRights to reduce difference to Wine. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 11:47:29 2014 @@ -226,40 +226,6 @@ return "(too-big)"; } -static const ACEFLAG AceRights[] = -{ - { SDDL_GENERIC_ALL, GENERIC_ALL }, - { SDDL_GENERIC_READ, GENERIC_READ }, - { SDDL_GENERIC_WRITE, GENERIC_WRITE }, - { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, - - { SDDL_READ_CONTROL, READ_CONTROL }, - { SDDL_STANDARD_DELETE, DELETE }, - { SDDL_WRITE_DAC, WRITE_DAC }, - { SDDL_WRITE_OWNER, WRITE_OWNER }, - - { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, - { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, - { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, - { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, - { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, - { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, - { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, - { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, - { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, - - { SDDL_FILE_ALL, FILE_ALL_ACCESS }, - { SDDL_FILE_READ, FILE_GENERIC_READ }, - { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, - { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, - - { SDDL_KEY_ALL, KEY_ALL_ACCESS }, - { SDDL_KEY_READ, KEY_READ }, - { SDDL_KEY_WRITE, KEY_WRITE }, - { SDDL_KEY_EXECUTE, KEY_EXECUTE }, - { NULL, 0 }, -}; - /* set last error code from NT status and get the proper boolean return value */ /* used for functions that are a simple wrapper around the corresponding ntdll API */ static __inline BOOL set_ntstatus( NTSTATUS status ) @@ -2399,6 +2365,40 @@ /****************************************************************************** * ParseAceStringRights */ +static const ACEFLAG AceRights[] = +{ + { SDDL_GENERIC_ALL, GENERIC_ALL }, + { SDDL_GENERIC_READ, GENERIC_READ }, + { SDDL_GENERIC_WRITE, GENERIC_WRITE }, + { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, + + { SDDL_READ_CONTROL, READ_CONTROL }, + { SDDL_STANDARD_DELETE, DELETE }, + { SDDL_WRITE_DAC, WRITE_DAC }, + { SDDL_WRITE_OWNER, WRITE_OWNER }, + + { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, + { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, + { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, + { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, + { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, + { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, + { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, + { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, + { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, + + { SDDL_FILE_ALL, FILE_ALL_ACCESS }, + { SDDL_FILE_READ, FILE_GENERIC_READ }, + { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, + { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, + + { SDDL_KEY_ALL, KEY_ALL_ACCESS }, + { SDDL_KEY_READ, KEY_READ }, + { SDDL_KEY_WRITE, KEY_WRITE }, + { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + { NULL, 0 }, +}; + static DWORD ParseAceStringRights(LPCWSTR* StringAcl) { UINT len = 0;

1 0

[akhaldi] 65007: [ADVAPI32] * Apply Wine commit e57edfea by Paul Vriens: Skip leading spaces when parsing. * Update the related functions with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 10:59:11 2014 New Revision: 65007 URL: http://svn.reactos.org/svn/reactos?rev=65007&view=rev Log: [ADVAPI32] * Apply Wine commit e57edfea by Paul Vriens: Skip leading spaces when parsing. * Update the related functions with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 10:59:11 2014 @@ -2335,6 +2335,9 @@ LPCWSTR szAcl = *StringAcl; const ACEFLAG *lpaf = AceType; + while (*szAcl == ' ') + szAcl++; + while (lpaf->wstr && (len = strlenW(lpaf->wstr)) && strncmpW(lpaf->wstr, szAcl, len)) @@ -2343,7 +2346,7 @@ if (!lpaf->wstr) return 0; - *StringAcl += len; + *StringAcl = szAcl + len; return lpaf->value; } @@ -2369,6 +2372,9 @@ BYTE flags = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + while (*szAcl != ';') { const ACEFLAG *lpaf = AceFlags; @@ -2381,7 +2387,7 @@ if (!lpaf->wstr) return 0; - flags |= lpaf->value; + flags |= lpaf->value; szAcl += len; } @@ -2399,19 +2405,22 @@ DWORD rights = 0; LPCWSTR szAcl = *StringAcl; + while (*szAcl == ' ') + szAcl++; + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) { LPCWSTR p = szAcl; - while (*p && *p != ';') + while (*p && *p != ';') p++; - if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) - { - rights = strtoulW(szAcl, NULL, 16); - szAcl = p; - } - else + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + rights = strtoulW(szAcl, NULL, 16); + szAcl = p; + } + else WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl)); } else @@ -2421,16 +2430,16 @@ const ACEFLAG *lpaf = AceRights; while (lpaf->wstr && - (len = strlenW(lpaf->wstr)) && - strncmpW(lpaf->wstr, szAcl, len)) - { - lpaf++; - } + (len = strlenW(lpaf->wstr)) && + strncmpW(lpaf->wstr, szAcl, len)) + { + lpaf++; + } if (!lpaf->wstr) return 0; - rights |= lpaf->value; + rights |= lpaf->value; szAcl += len; } } @@ -2445,11 +2454,8 @@ * * dacl_flags(string_ace1)(string_ace2)... (string_acen) */ -static BOOL -ParseStringAclToAcl(LPCWSTR StringAcl, - LPDWORD lpdwFlags, - PACL pAcl, - LPDWORD cBytes) +static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, + PACL pAcl, LPDWORD cBytes) { DWORD val; DWORD sidlen; @@ -2457,11 +2463,12 @@ DWORD acesize = 0; DWORD acecount = 0; PACCESS_ALLOWED_ACE pAce = NULL; /* pointer to current ACE */ + DWORD error = ERROR_INVALID_ACL; TRACE("%s\n", debugstr_w(StringAcl)); if (!StringAcl) - return FALSE; + return FALSE; if (pAcl) /* pAce is only useful if we're setting values */ pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); @@ -2476,29 +2483,34 @@ /* Parse ACE type */ val = ParseAceStringType(&StringAcl); - if (pAce) + if (pAce) pAce->Header.AceType = (BYTE) val; if (*StringAcl != ';') + { + error = RPC_S_INVALID_STRING_UUID; goto lerr; + } StringAcl++; /* Parse ACE flags */ - val = ParseAceStringFlags(&StringAcl); - if (pAce) + val = ParseAceStringFlags(&StringAcl); + if (pAce) pAce->Header.AceFlags = (BYTE) val; if (*StringAcl != ';') goto lerr; StringAcl++; /* Parse ACE rights */ - val = ParseAceStringRights(&StringAcl); - if (pAce) + val = ParseAceStringRights(&StringAcl); + if (pAce) pAce->Mask = val; if (*StringAcl != ';') goto lerr; StringAcl++; /* Parse ACE object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -2507,6 +2519,8 @@ StringAcl++; /* Parse ACE inherit object guid */ + while (*StringAcl == ' ') + StringAcl++; if (*StringAcl != ';') { FIXME("Support for *_OBJECT_ACE_TYPE not implemented\n"); @@ -2516,10 +2530,10 @@ /* Parse ACE account sid */ if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) - { + { while (*StringAcl && *StringAcl != ')') StringAcl++; - } + } if (*StringAcl != ')') goto lerr; @@ -2554,7 +2568,7 @@ return TRUE; lerr: - SetLastError(ERROR_INVALID_ACL); + SetLastError(error); WARN("Invalid ACE string format\n"); return FALSE; } @@ -2563,10 +2577,10 @@ /****************************************************************************** * ParseStringSecurityDescriptorToSecurityDescriptor */ -static BOOL -ParseStringSecurityDescriptorToSecurityDescriptor(LPCWSTR StringSecurityDescriptor, - SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, - LPDWORD cBytes) +static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( + LPCWSTR StringSecurityDescriptor, + SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor, + LPDWORD cBytes) { BOOL bret = FALSE; WCHAR toktype; @@ -2580,25 +2594,28 @@ if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); + while (*StringSecurityDescriptor == ' ') + StringSecurityDescriptor++; + while (*StringSecurityDescriptor) { toktype = *StringSecurityDescriptor; - /* Expect char identifier followed by ':' */ - StringSecurityDescriptor++; + /* Expect char identifier followed by ':' */ + StringSecurityDescriptor++; if (*StringSecurityDescriptor != ':') { SetLastError(ERROR_INVALID_PARAMETER); goto lend; } - StringSecurityDescriptor++; - - /* Extract token */ - lptoken = StringSecurityDescriptor; - while (*lptoken && *lptoken != ':') + StringSecurityDescriptor++; + + /* Extract token */ + lptoken = StringSecurityDescriptor; + while (*lptoken && *lptoken != ':') lptoken++; - if (*lptoken) + if (*lptoken) lptoken--; len = lptoken - StringSecurityDescriptor; @@ -2606,7 +2623,7 @@ tok[len] = 0; switch (toktype) - { + { case 'O': { DWORD bytes; @@ -2620,7 +2637,7 @@ lpNext += bytes; /* Advance to next token */ } - *cBytes += bytes; + *cBytes += bytes; break; } @@ -2638,13 +2655,13 @@ lpNext += bytes; /* Advance to next token */ } - *cBytes += bytes; + *cBytes += bytes; break; } case 'D': - { + { DWORD flags; DWORD bytes; @@ -2656,11 +2673,11 @@ SecurityDescriptor->Control |= SE_DACL_PRESENT | flags; SecurityDescriptor->Dacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; + } + + *cBytes += bytes; + + break; } case 'S': @@ -2676,18 +2693,18 @@ SecurityDescriptor->Control |= SE_SACL_PRESENT | flags; SecurityDescriptor->Sacl = lpNext - (LPBYTE)SecurityDescriptor; lpNext += bytes; /* Advance to next token */ - } - - *cBytes += bytes; - - break; + } + + *cBytes += bytes; + + break; } default: FIXME("Unknown token\n"); SetLastError(ERROR_INVALID_PARAMETER); - goto lend; - } + goto lend; + } StringSecurityDescriptor = lptoken; }

1 0

[akhaldi] 65006: [ADVAPI32] * Update CopySid(). CORE-8540
by akhaldi＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: akhaldi Date: Sun Oct 26 10:34:40 2014 New Revision: 65006 URL: http://svn.reactos.org/svn/reactos?rev=65006&view=rev Log: [ADVAPI32] * Update CopySid(). CORE-8540 Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Oct 26 10:34:40 2014 @@ -627,26 +627,18 @@ return RtlFreeSid(pSid); } -/* - * @implemented +/****************************************************************************** + * CopySid [ADVAPI32.@] + * + * PARAMS + * nDestinationSidLength [] + * pDestinationSid [] + * pSourceSid [] */ BOOL WINAPI -CopySid(DWORD nDestinationSidLength, - PSID pDestinationSid, - PSID pSourceSid) -{ - NTSTATUS Status; - - Status = RtlCopySid(nDestinationSidLength, - pDestinationSid, - pSourceSid); - if (!NT_SUCCESS (Status)) - { - SetLastError(RtlNtStatusToDosError(Status)); - return FALSE; - } - - return TRUE; +CopySid( DWORD nDestinationSidLength, PSID pDestinationSid, PSID pSourceSid ) +{ + return set_ntstatus(RtlCopySid(nDestinationSidLength, pDestinationSid, pSourceSid)); } /*

1 0

[hbelusca] 65005: [NTVDM]: Addendum to r64985: correctly display the IPS and the TimerTicks (both of them are *LONGLONG).
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 02:38:07 2014 New Revision: 65005 URL: http://svn.reactos.org/svn/reactos?rev=65005&view=rev Log: [NTVDM]: Addendum to r64985: correctly display the IPS and the TimerTicks (both of them are *LONGLONG). Modified: trunk/reactos/subsystems/ntvdm/clock.c Modified: trunk/reactos/subsystems/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/clock.c?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/clock.c [iso-8859-1] Sun Oct 26 02:38:07 2014 @@ -149,7 +149,7 @@ #ifdef IPS_DISPLAY if ((CurrentTickCount - LastCyclePrintout) >= 1000) { - DPRINT1("NTVDM: %lu Instructions Per Second; TimerTicks = %I64d\n", Cycles * 1000 / (CurrentTickCount - LastCyclePrintout), TimerTicks); + DPRINT1("NTVDM: %I64u Instructions Per Second; TimerTicks = %I64d\n", Cycles * 1000 / (CurrentTickCount - LastCyclePrintout), TimerTicks); LastCyclePrintout = CurrentTickCount; Cycles = 0; }

1 0

[aandrejevic] 65004: [NTVDM] Make sure the offset doesn't exceed the VGA bank size. Load the latch registers after the loop (optimization).
by aandrejevic＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: aandrejevic Date: Sun Oct 26 02:29:31 2014 New Revision: 65004 URL: http://svn.reactos.org/svn/reactos?rev=65004&view=rev Log: [NTVDM] Make sure the offset doesn't exceed the VGA bank size. Load the latch registers after the loop (optimization). Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sun Oct 26 02:29:31 2014 @@ -1200,16 +1200,16 @@ { /* One byte per pixel */ PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE - + (Address + (j / VGA_NUM_BANKS)) - * AddressSize]; + + LOWORD((Address + (j / VGA_NUM_BANKS)) + * AddressSize)]; } else { /* 4-bits per pixel */ PixelData = VgaMemory[(j % VGA_NUM_BANKS) * VGA_BANK_SIZE - + (Address + (j / (VGA_NUM_BANKS * 2))) - * AddressSize]; + + LOWORD((Address + (j / (VGA_NUM_BANKS * 2))) + * AddressSize)]; /* Check if we should use the highest 4 bits or lowest 4 */ if (((j / VGA_NUM_BANKS) % 2) == 0) @@ -1240,8 +1240,8 @@ */ DWORD BankNumber = (j / 4) % 2; DWORD Offset = Address + (j / 8); - BYTE LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + Offset * AddressSize]; - BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + Offset * AddressSize]; + BYTE LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; + BYTE HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + LOWORD(Offset * AddressSize)]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; @@ -1264,8 +1264,8 @@ { /* The data is on plane k, 4 pixels per byte */ BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE - + (Address + (j / VGA_NUM_BANKS)) - * AddressSize]; + + LOWORD((Address + (j / VGA_NUM_BANKS)) + * AddressSize)]; /* The mask of the first bit in the pair */ BYTE BitMask = 1 << (((3 - (j % VGA_NUM_BANKS)) * 2) + 1); @@ -1284,8 +1284,8 @@ for (k = 0; k < VGA_NUM_BANKS; k++) { BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE - + (Address + (j / (VGA_NUM_BANKS * 2))) - * AddressSize]; + + LOWORD((Address + (j / (VGA_NUM_BANKS * 2))) + * AddressSize)]; /* If the bit on that plane is set, set it */ if (PlaneData & (1 << (7 - (j % 8)))) PixelData |= 1 << k; @@ -1866,15 +1866,15 @@ { VideoAddress = VgaTranslateReadAddress(Address + i); - /* Load the latch registers */ - VgaLatchRegisters[0] = VgaMemory[LOWORD(VideoAddress)]; - VgaLatchRegisters[1] = VgaMemory[VGA_BANK_SIZE + LOWORD(VideoAddress)]; - VgaLatchRegisters[2] = VgaMemory[(2 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; - VgaLatchRegisters[3] = VgaMemory[(3 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; - /* Copy the value to the buffer */ Buffer[i] = VgaMemory[VideoAddress]; } + + /* Load the latch registers */ + VgaLatchRegisters[0] = VgaMemory[LOWORD(VideoAddress)]; + VgaLatchRegisters[1] = VgaMemory[VGA_BANK_SIZE + LOWORD(VideoAddress)]; + VgaLatchRegisters[2] = VgaMemory[(2 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; + VgaLatchRegisters[3] = VgaMemory[(3 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; } VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size)

1 0

[hbelusca] 65003: [NTVDM]: Fix the validity check of the hVdd handle in the port structure so that we don't try to call an invalid VDD IO handler. That fixes stack corruption for example in the cas...
by hbelusca＠svn.reactos.org 26 Oct '14

26 Oct '14

Author: hbelusca Date: Sun Oct 26 02:27:11 2014 New Revision: 65003 URL: http://svn.reactos.org/svn/reactos?rev=65003&view=rev Log: [NTVDM]: Fix the validity check of the hVdd handle in the port structure so that we don't try to call an invalid VDD IO handler. That fixes stack corruption for example in the case of OUTSB/W operations, where we could call an invalid VDD handler taking 3 parameters that in fact calls (because VDD handlers and our internal ones are stored in a union, the choice of the handler is done via the hVdd value) an internal handler taking only 2 parameters... Bug triggered when testing MSVC-compiled NTVDM in speed-optimized mode. Diagnosed by V. and I, thanks V! Modified: trunk/reactos/subsystems/ntvdm/io.c Modified: trunk/reactos/subsystems/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/io.c?rev=… ============================================================================== --- trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/io.c [iso-8859-1] Sun Oct 26 02:27:11 2014 @@ -37,7 +37,7 @@ typedef struct _EMULATOR_IOPORT_HANDLERS { - HANDLE hVdd; // == 0 if unused, + HANDLE hVdd; // == NULL if unused, // INVALID_HANDLE_VALUE if handled internally, // a valid VDD handle if handled externally. union @@ -65,7 +65,7 @@ { return IoPortProc[Port].IoHandlers.InB(Port); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.inb_handler) { UCHAR Data; @@ -91,7 +91,7 @@ { IoPortProc[Port].IoHandlers.InsB(Port, Buffer, Count); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.insb_handler) { ASSERT(Port <= MAXWORD); @@ -113,7 +113,7 @@ { IoPortProc[Port].IoHandlers.OutB(Port, Buffer); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.outb_handler) { ASSERT(Port <= MAXWORD); @@ -136,7 +136,7 @@ { IoPortProc[Port].IoHandlers.OutsB(Port, Buffer, Count); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.outsb_handler) { ASSERT(Port <= MAXWORD); @@ -157,7 +157,7 @@ { return IoPortProc[Port].IoHandlers.InW(Port); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.inw_handler) { USHORT Data; @@ -186,7 +186,7 @@ { IoPortProc[Port].IoHandlers.InsW(Port, Buffer, Count); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.insw_handler) { ASSERT(Port <= MAXWORD); @@ -208,7 +208,7 @@ { IoPortProc[Port].IoHandlers.OutW(Port, Buffer); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.outw_handler) { ASSERT(Port <= MAXWORD); @@ -232,7 +232,7 @@ { IoPortProc[Port].IoHandlers.OutsW(Port, Buffer, Count); } - else if (IoPortProc[Port].hVdd > 0 && + else if (IoPortProc[Port].hVdd != NULL && IoPortProc[Port].hVdd != INVALID_HANDLE_VALUE && IoPortProc[Port].VddIoHandlers.outsw_handler) { ASSERT(Port <= MAXWORD); @@ -501,8 +501,8 @@ PVDD_IO_PORTRANGE pPortRange, PVDD_IO_HANDLERS IOhandler) { - /* Check possible validity of the VDD handle */ - if (hVdd == 0 || hVdd == INVALID_HANDLE_VALUE) return FALSE; + /* Check validity of the VDD handle */ + if (hVdd == NULL || hVdd == INVALID_HANDLE_VALUE) return FALSE; /* Loop for each range of I/O ports */ while (cPortRange--) @@ -516,7 +516,7 @@ * Don't do anything if the I/O port is already * handled internally or externally. */ - if (IoPortProc[i].hVdd != 0) + if (IoPortProc[i].hVdd != NULL) { DPRINT1("IoPortProc[0x%X] already registered\n", i); continue; @@ -560,8 +560,8 @@ WORD cPortRange, PVDD_IO_PORTRANGE pPortRange) { - /* Check possible validity of the VDD handle */ - if (hVdd == 0 || hVdd == INVALID_HANDLE_VALUE) return; + /* Check validity of the VDD handle */ + if (hVdd == NULL || hVdd == INVALID_HANDLE_VALUE) return; /* Loop for each range of I/O ports */ while (cPortRange--)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
73
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 October 2014