Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 61069: [FAST486] DAA, DAS: Update the flags. AAA, AAS: Subtract from AX instead of AL. The specification says AL, but so far in all known CPUs and emulators, AX is subtracted. AAD: Cl...
by aandrejevic＠svn.reactos.org 22 Nov '13

22 Nov '13

Author: aandrejevic Date: Fri Nov 22 02:02:05 2013 New Revision: 61069 URL: http://svn.reactos.org/svn/reactos?rev=61069&view=rev Log: [FAST486] DAA, DAS: Update the flags. AAA, AAS: Subtract from AX instead of AL. The specification says AL, but so far in all known CPUs and emulators, AX is subtracted. AAD: Clear AH. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Nov 22 02:02:05 2013 @@ -3042,6 +3042,13 @@ State->Flags.Cf = TRUE; } + Value = State->GeneralRegs[FAST486_REG_EAX].LowByte; + + /* Update the flags */ + State->Flags.Sf = (Value & SIGN_FLAG_BYTE) != 0; + State->Flags.Zf = (Value == 0); + State->Flags.Pf = Fast486CalculateParity(Value); + return TRUE; } @@ -3374,6 +3381,13 @@ State->Flags.Cf = TRUE; } + Value = State->GeneralRegs[FAST486_REG_EAX].LowByte; + + /* Update the flags */ + State->Flags.Sf = (Value & SIGN_FLAG_BYTE) != 0; + State->Flags.Zf = (Value == 0); + State->Flags.Pf = Fast486CalculateParity(Value); + return TRUE; } @@ -3388,7 +3402,7 @@ if (((Value & 0x0F) > 9) || State->Flags.Af) { /* Correct it */ - State->GeneralRegs[FAST486_REG_EAX].LowByte += 0x06; + State->GeneralRegs[FAST486_REG_EAX].LowWord += 0x06; State->GeneralRegs[FAST486_REG_EAX].HighByte++; /* Set CF and AF */ @@ -3417,7 +3431,7 @@ if (((Value & 0x0F) > 9) || State->Flags.Af) { /* Correct it */ - State->GeneralRegs[FAST486_REG_EAX].LowByte -= 0x06; + State->GeneralRegs[FAST486_REG_EAX].LowWord -= 0x06; State->GeneralRegs[FAST486_REG_EAX].HighByte--; /* Set CF and AF */ @@ -4876,6 +4890,7 @@ State->GeneralRegs[FAST486_REG_EAX].LowByte = Value %= Base; /* Update flags */ + State->Flags.Af = FALSE; State->Flags.Zf = (Value == 0); State->Flags.Sf = ((Value & SIGN_FLAG_BYTE) != 0); State->Flags.Pf = Fast486CalculateParity(Value); @@ -4899,9 +4914,10 @@ /* Adjust */ Value += State->GeneralRegs[FAST486_REG_EAX].HighByte * Base; - State->GeneralRegs[FAST486_REG_EAX].LowByte = Value; + State->GeneralRegs[FAST486_REG_EAX].LowWord = Value; /* Update flags */ + State->Flags.Af = FALSE; State->Flags.Zf = (Value == 0); State->Flags.Sf = ((Value & SIGN_FLAG_BYTE) != 0); State->Flags.Pf = Fast486CalculateParity(Value);

1 0

[aandrejevic] 61068: [FAST486] Fix the calculation of AF in ADC and the calculation of AF and CF in SBB.
by aandrejevic＠svn.reactos.org 22 Nov '13

22 Nov '13

Author: aandrejevic Date: Fri Nov 22 01:22:00 2013 New Revision: 61068 URL: http://svn.reactos.org/svn/reactos?rev=61068&view=rev Log: [FAST486] Fix the calculation of AF in ADC and the calculation of AF and CF in SBB. Modified: branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Nov 22 01:22:00 2013 @@ -2483,7 +2483,7 @@ State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = ((((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_BYTE) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2540,7 +2540,7 @@ State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); - State->Flags.Af = ((((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_LONG) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2575,7 +2575,7 @@ State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); - State->Flags.Af = ((((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_WORD) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2621,7 +2621,7 @@ State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) == (SecondValue & SIGN_FLAG_BYTE)) && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = ((((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_BYTE) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2664,7 +2664,7 @@ State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) == (SecondValue & SIGN_FLAG_LONG)) && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); - State->Flags.Af = ((((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_LONG) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2694,7 +2694,7 @@ State->Flags.Cf = State->Flags.Cf || ((Result < FirstValue) && (Result < SecondValue)); State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) == (SecondValue & SIGN_FLAG_WORD)) && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); - State->Flags.Af = ((((FirstValue & 0x0F) + (SecondValue & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_WORD) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2765,10 +2765,10 @@ Result = FirstValue - SecondValue - Carry; /* Update the flags */ - State->Flags.Cf = FirstValue < (SecondValue + 1); + State->Flags.Cf = Carry ? (FirstValue <= SecondValue) : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_BYTE) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2826,10 +2826,10 @@ Result = FirstValue - SecondValue - Carry; /* Update the flags */ - State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Cf = Carry ? (FirstValue <= SecondValue) : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_LONG) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2864,10 +2864,10 @@ Result = FirstValue - SecondValue - Carry; /* Update the flags */ - State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Cf = Carry ? (FirstValue <= SecondValue) : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_WORD) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2906,10 +2906,10 @@ Result = FirstValue - SecondValue - Carry; /* Update the flags */ - State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Cf = Carry ? (FirstValue <= SecondValue) : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SIGN_FLAG_BYTE) != (SecondValue & SIGN_FLAG_BYTE)) && ((FirstValue & SIGN_FLAG_BYTE) != (Result & SIGN_FLAG_BYTE)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + 1) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_BYTE) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2947,10 +2947,10 @@ Result = FirstValue - SecondValue - Carry; /* Update the flags */ - State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Cf = Carry ? (FirstValue <= SecondValue) : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SIGN_FLAG_LONG) != (SecondValue & SIGN_FLAG_LONG)) && ((FirstValue & SIGN_FLAG_LONG) != (Result & SIGN_FLAG_LONG)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + Carry) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_LONG) != 0); State->Flags.Pf = Fast486CalculateParity(Result); @@ -2973,10 +2973,10 @@ Result = FirstValue - SecondValue - Carry; /* Update the flags */ - State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Cf = Carry ? (FirstValue <= SecondValue) : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SIGN_FLAG_WORD) != (SecondValue & SIGN_FLAG_WORD)) && ((FirstValue & SIGN_FLAG_WORD) != (Result & SIGN_FLAG_WORD)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + Carry) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; State->Flags.Zf = (Result == 0); State->Flags.Sf = ((Result & SIGN_FLAG_WORD) != 0); State->Flags.Pf = Fast486CalculateParity(Result); Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Fri Nov 22 01:22:00 2013 @@ -85,7 +85,7 @@ || ((Result < FirstValue) && (Result < (SecondValue + Carry))); State->Flags.Of = ((FirstValue & SignFlag) == (SecondValue & SignFlag)) && ((FirstValue & SignFlag) != (Result & SignFlag)); - State->Flags.Af = ((((FirstValue & 0x0F) + ((SecondValue + Carry) & 0x0F)) & 0x10) != 0); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; break; } @@ -98,10 +98,12 @@ Result = (FirstValue - SecondValue - Carry) & MaxValue; /* Update CF, OF and AF */ - State->Flags.Cf = FirstValue < (SecondValue + Carry); + State->Flags.Cf = Carry + ? (FirstValue <= SecondValue) + : (FirstValue < SecondValue); State->Flags.Of = ((FirstValue & SignFlag) != (SecondValue & SignFlag)) && ((FirstValue & SignFlag) != (Result & SignFlag)); - State->Flags.Af = (FirstValue & 0x0F) < ((SecondValue + Carry) & 0x0F); + State->Flags.Af = ((FirstValue ^ SecondValue ^ Result) & 0x10) != 0; break; }

1 0

[aandrejevic] 61067: [FAST486] In the string functions, use ADSIZE and not OPSIZE. In SCAS and CMPS, fix the "(1 << 32) - 1" bug.
by aandrejevic＠svn.reactos.org 22 Nov '13

22 Nov '13

Author: aandrejevic Date: Fri Nov 22 00:46:28 2013 New Revision: 61067 URL: http://svn.reactos.org/svn/reactos?rev=61067&view=rev Log: [FAST486] In the string functions, use ADSIZE and not OPSIZE. In SCAS and CMPS, fix the "(1 << 32) - 1" bug. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Fri Nov 22 00:46:28 2013 @@ -5437,7 +5437,7 @@ if (State->PrefixFlags & FAST486_PREFIX_REP) { UCHAR Block[STRING_BLOCK_SIZE]; - ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long + ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long : State->GeneralRegs[FAST486_REG_ECX].LowWord; /* Clear the memory block */ @@ -5488,7 +5488,7 @@ Processed * DataSize)) { /* Set ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); /* Exception occurred */ @@ -5504,7 +5504,7 @@ Processed * DataSize)) { /* Set ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); /* Exception occurred */ @@ -5531,7 +5531,7 @@ } /* Clear ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; } else @@ -5562,7 +5562,7 @@ } /* Increment/decrement ESI and EDI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) { @@ -5620,8 +5620,8 @@ else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); /* Calculate the mask and sign flag */ - DataMask = (1 << (DataSize * 8)) - 1; SignFlag = 1 << ((DataSize * 8) - 1); + DataMask = SignFlag | (SignFlag - 1); /* Read from the first source operand */ if (!Fast486ReadMemory(State, @@ -5664,7 +5664,7 @@ State->Flags.Pf = Fast486CalculateParity(Result); /* Increment/decrement ESI and EDI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) { @@ -5697,7 +5697,7 @@ { BOOLEAN Repeat = TRUE; - if (OperandSize) + if (AddressSize) { if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0) { @@ -5752,7 +5752,7 @@ if (State->PrefixFlags & FAST486_PREFIX_REP) { UCHAR Block[STRING_BLOCK_SIZE]; - ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long + ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long : State->GeneralRegs[FAST486_REG_ECX].LowWord; /* Fill the memory block with the data */ @@ -5809,7 +5809,7 @@ Processed * DataSize)) { /* Set ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); /* Exception occurred */ @@ -5828,7 +5828,7 @@ } /* Clear ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; } else @@ -5846,7 +5846,7 @@ } /* Increment/decrement EDI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; @@ -5888,7 +5888,7 @@ if (State->PrefixFlags & FAST486_PREFIX_REP) { - ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long + ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long : State->GeneralRegs[FAST486_REG_ECX].LowWord; /* If the count is 0, do nothing */ @@ -5907,7 +5907,7 @@ } /* Clear ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; } @@ -5925,7 +5925,7 @@ } /* Increment/decrement ESI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_ESI].Long += DataSize; else State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize; @@ -5961,8 +5961,8 @@ else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); /* Calculate the mask and sign flag */ - DataMask = (1 << (DataSize * 8)) - 1; SignFlag = 1 << ((DataSize * 8) - 1); + DataMask = SignFlag | (SignFlag - 1); /* Read from the source operand */ if (!Fast486ReadMemory(State, @@ -5992,7 +5992,7 @@ State->Flags.Pf = Fast486CalculateParity(Result); /* Increment/decrement EDI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; @@ -6009,7 +6009,7 @@ { BOOLEAN Repeat = TRUE; - if (OperandSize) + if (AddressSize) { if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0) { @@ -6064,7 +6064,7 @@ if (State->PrefixFlags & FAST486_PREFIX_REP) { UCHAR Block[STRING_BLOCK_SIZE]; - ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long + ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long : State->GeneralRegs[FAST486_REG_ECX].LowWord; /* Clear the memory block */ @@ -6123,7 +6123,7 @@ Processed * DataSize)) { /* Set ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); /* Exception occurred */ @@ -6142,7 +6142,7 @@ } /* Clear ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; } else @@ -6169,7 +6169,7 @@ } /* Increment/decrement EDI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; @@ -6205,7 +6205,7 @@ if (State->PrefixFlags & FAST486_PREFIX_REP) { UCHAR Block[STRING_BLOCK_SIZE]; - ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long + ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long : State->GeneralRegs[FAST486_REG_ECX].LowWord; /* Clear the memory block */ @@ -6237,7 +6237,7 @@ Processed * DataSize)) { /* Set ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); /* Exception occurred */ @@ -6284,7 +6284,7 @@ } /* Clear ECX */ - if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; + if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; } else @@ -6312,7 +6312,7 @@ DataSize); /* Increment/decrement ESI */ - if (OperandSize) + if (AddressSize) { if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_ESI].Long += DataSize; else State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize;

1 0

[dgorbachev] 61066: [NTOSKRNL] Trick GCC into not optimizing out RtlMoveMemory.
by dgorbachev＠svn.reactos.org 21 Nov '13

21 Nov '13

Author: dgorbachev Date: Thu Nov 21 20:44:49 2013 New Revision: 61066 URL: http://svn.reactos.org/svn/reactos?rev=61066&view=rev Log: [NTOSKRNL] Trick GCC into not optimizing out RtlMoveMemory. Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c Modified: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmmain.c [iso-8859-1] Thu Nov 21 20:44:49 2013 @@ -93,7 +93,7 @@ NTSTATUS Status; HANDLE PhysMemHandle; PVOID BaseAddress; - PVOID NullAddress = NULL; + volatile PVOID NullAddress = NULL; LARGE_INTEGER Offset; ULONG ViewSize;

1 0

[gadamopoulos] 61065: forgot to commit this
by gadamopoulos＠svn.reactos.org 21 Nov '13

21 Nov '13

Author: gadamopoulos Date: Thu Nov 21 11:34:56 2013 New Revision: 61065 URL: http://svn.reactos.org/svn/reactos?rev=61065&view=rev Log: forgot to commit this Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… ============================================================================== --- trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Thu Nov 21 11:34:56 2013 @@ -28,6 +28,7 @@ oleaut32 shell32 shlwapi + shdocvw version uxtheme msvcrt

1 0

[gadamopoulos] 61064: [explorer_new] - call ShellDDEInit, FileIconInit and WinList_Init while initializing - Calling ShellDDEInit fixes cases like pressing Explore in a folder context menu from a f...
by gadamopoulos＠svn.reactos.org 21 Nov '13

21 Nov '13

Author: gadamopoulos Date: Thu Nov 21 11:28:53 2013 New Revision: 61064 URL: http://svn.reactos.org/svn/reactos?rev=61064&view=rev Log: [explorer_new] - call ShellDDEInit, FileIconInit and WinList_Init while initializing - Calling ShellDDEInit fixes cases like pressing Explore in a folder context menu from a file open dialog (before this it just hanged) - We also need to call FileIconInit in order to initialize the shell icons properly. Before this Shell_GetImageLists called FileIconInit in case it was not called - Calling WinList_Init should make CLSID_ShellWindows work but it fails for now. CLSID_ShellWindows is needed in cases like opening a second time My computer from desktop should activates the existing My computer window and it is also needed for SHOpenFolderAndSelectItems in order to work Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/include/psdk/shlobj_undoc.h Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Thu Nov 21 11:28:53 2013 @@ -410,6 +410,15 @@ if (CreateShellDesktop) { + /* Initialize shell dde support */ + ShellDDEInit(TRUE); + + /* Initialize shell icons */ + FileIconInit(TRUE); + + /* Initialize CLSID_ShellWindows class */ + WinList_Init(); + if (RegisterTrayWindowClass() && RegisterTaskSwitchWndClass()) { Tray = CreateTrayWindow(); Modified: trunk/reactos/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj_undoc.… ============================================================================== --- trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] Thu Nov 21 11:28:53 2013 @@ -754,6 +754,10 @@ #define ILGDN_FORPARSING 0 #define ILGDN_NORMAL 1 #define ILGDN_INFOLDER 2 + +BOOL WINAPI FileIconInit(BOOL bFullInit); +void WINAPI ShellDDEInit(BOOL bInit); +DWORD WINAPI WinList_Init(void); HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE);

1 0

[aandrejevic] 61063: [FAST486] Put the conditional expression in parenthesis so that the addition happens after it.
by aandrejevic＠svn.reactos.org 21 Nov '13

21 Nov '13

Author: aandrejevic Date: Thu Nov 21 04:07:15 2013 New Revision: 61063 URL: http://svn.reactos.org/svn/reactos?rev=61063&view=rev Log: [FAST486] Put the conditional expression in parenthesis so that the addition happens after it. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Thu Nov 21 04:07:15 2013 @@ -4919,8 +4919,8 @@ /* Read a byte from DS:[(E)BX + AL] */ if (!Fast486ReadMemory(State, FAST486_REG_DS, - AddressSize ? State->GeneralRegs[FAST486_REG_EBX].Long - : State->GeneralRegs[FAST486_REG_EBX].LowWord + (AddressSize ? State->GeneralRegs[FAST486_REG_EBX].Long + : State->GeneralRegs[FAST486_REG_EBX].LowWord) + State->GeneralRegs[FAST486_REG_EAX].LowByte, FALSE, &Value,

1 0

[aandrejevic] 61062: [FAST486] Fix a bug in Fast486LoadSegment.
by aandrejevic＠svn.reactos.org 21 Nov '13

21 Nov '13

Author: aandrejevic Date: Thu Nov 21 03:18:34 2013 New Revision: 61062 URL: http://svn.reactos.org/svn/reactos?rev=61062&view=rev Log: [FAST486] Fix a bug in Fast486LoadSegment. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Thu Nov 21 03:18:34 2013 @@ -486,7 +486,7 @@ return FALSE; } - if (GdtEntry.SystemType) + if (!GdtEntry.SystemType) { // TODO: Call/interrupt/task gates NOT IMPLEMENTED! UNIMPLEMENTED;

1 0

[tkreuzer] 61061: {NTOSKRNL] Properly implement MmGetSessionById, MmAttachSession, MmDetachSession and MmQuitNextSession. Implement more session cleanup code and make sure a session is not killed w...
by tkreuzer＠svn.reactos.org 20 Nov '13

20 Nov '13

Author: tkreuzer Date: Wed Nov 20 23:50:42 2013 New Revision: 61061 URL: http://svn.reactos.org/svn/reactos?rev=61061&view=rev Log: {NTOSKRNL] Properly implement MmGetSessionById, MmAttachSession, MmDetachSession and MmQuitNextSession. Implement more session cleanup code and make sure a session is not killed while a process is attached to it. There used to be a bug, where removing a process from the session list caused pool corruption, which was because we called MiSessionRemoveProcess twice: once from PspExitThread, when the last thread exited and another time from PspDeleteProcess, when the reaper thread deleted the process object. This was, because the flag that said the process was in a session was not cleared properly. This is now fixed and inserting and removing processes into the session's list works fine. Also protect it properly with a spinlock. Modified: trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/session.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c [iso-8859-1] Wed Nov 20 23:50:42 2013 @@ -72,7 +72,7 @@ (PsGetCurrentProcessSessionId() != Win32ObjectHeader->SessionId)) { /* Get the session from the objects session Id */ - DPRINT1("SessionId == %d\n", Win32ObjectHeader->SessionId); + DPRINT("SessionId == %d\n", Win32ObjectHeader->SessionId); SessionEntry = MmGetSessionById(Win32ObjectHeader->SessionId); if (SessionEntry == NULL) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Nov 20 23:50:42 2013 @@ -18,7 +18,7 @@ #define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) -#define MI_SESSION_VIEW_SIZE (20 * _1MB) +#define MI_SESSION_VIEW_SIZE (48 * _1MB) #define MI_SESSION_POOL_SIZE (16 * _1MB) #define MI_SESSION_IMAGE_SIZE (8 * _1MB) #define MI_SESSION_WORKING_SET_SIZE (4 * _1MB) @@ -716,6 +716,7 @@ extern SIZE_T MmSystemLockPagesCount; extern ULONG_PTR MmSubsectionBase; extern LARGE_INTEGER MmCriticalSectionTimeout; +extern LIST_ENTRY MmWorkingSetExpansionHead; BOOLEAN FORCEINLINE @@ -1732,6 +1733,12 @@ VOID NTAPI +MiInitializeSessionWsSupport( + VOID +); + +VOID +NTAPI MiInitializeSessionIds( VOID ); Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Wed Nov 20 23:50:42 2013 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/mm/ARM3/session.c * PURPOSE: Session support routines * PROGRAMMERS: ReactOS Portable Systems Group + * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *******************************************************************/ @@ -25,11 +26,46 @@ PRTL_BITMAP MiSessionIdBitmap; volatile LONG MiSessionLeaderExists; -// HACK: we support only one process. The creator is CSRSS and that lives! -PEPROCESS Session0CreatorProcess; +LIST_ENTRY MiSessionWsList; +LIST_ENTRY MmWorkingSetExpansionHead; + +KSPIN_LOCK MmExpansionLock; +PETHREAD MiExpansionLockOwner; /* PRIVATE FUNCTIONS **********************************************************/ + +FORCEINLINE +KIRQL +MiAcquireExpansionLock() +{ + KIRQL OldIrql; + + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + KeAcquireSpinLock(&MmExpansionLock, &OldIrql); + ASSERT(MiExpansionLockOwner == NULL); + MiExpansionLockOwner = PsGetCurrentThread(); + return OldIrql; +} + +FORCEINLINE +VOID +MiReleaseExpansionLock(KIRQL OldIrql) +{ + ASSERT(MiExpansionLockOwner == PsGetCurrentThread()); + MiExpansionLockOwner = NULL; + KeReleaseSpinLock(&MmExpansionLock, OldIrql); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); +} + +VOID +NTAPI +MiInitializeSessionWsSupport(VOID) +{ + /* Initialize the list heads */ + InitializeListHead(&MiSessionWsList); + InitializeListHead(&MmWorkingSetExpansionHead); +} LCID NTAPI @@ -225,9 +261,132 @@ VOID NTAPI +MiDereferenceSessionFinal(VOID) +{ + PMM_SESSION_SPACE SessionGlobal; + KIRQL OldIrql; + + /* Get the pointer to the global session address */ + SessionGlobal = MmSessionSpace->GlobalVirtualAddress; + + /* Acquire the expansion lock */ + OldIrql = MiAcquireExpansionLock(); + + /* Set delete pending flag, so that processes can no longer attach to this + session and the last process that detaches sets the AttachEvent */ + ASSERT(SessionGlobal->u.Flags.DeletePending == 0); + SessionGlobal->u.Flags.DeletePending = 1; + + /* Check if we have any attached processes */ + if (SessionGlobal->AttachCount) + { + /* Initialize the event (it's not in use yet!) */ + KeInitializeEvent(&SessionGlobal->AttachEvent, NotificationEvent, FALSE); + + /* Release the expansion lock for the wait */ + MiReleaseExpansionLock(OldIrql); + + /* Wait for the event to be set due to the last process detach */ + KeWaitForSingleObject(&SessionGlobal->AttachEvent, WrVirtualMemory, 0, 0, 0); + + /* Reacquire the expansion lock */ + OldIrql = MiAcquireExpansionLock(); + + /* Makes sure we still have the delete flag and no attached processes */ + ASSERT(MmSessionSpace->u.Flags.DeletePending == 1); + ASSERT(MmSessionSpace->AttachCount == 0); + } + + /* Check if the session is in the workingset expansion list */ + if (SessionGlobal->Vm.WorkingSetExpansionLinks.Flink != NULL) + { + /* Remove the session from the list and zero the list entry */ + RemoveEntryList(&SessionGlobal->Vm.WorkingSetExpansionLinks); + SessionGlobal->Vm.WorkingSetExpansionLinks.Flink = 0; + } + + /* Check if the session is in the workingset list */ + if (SessionGlobal->WsListEntry.Flink) + { + /* Remove the session from the list and zero the list entry */ + RemoveEntryList(&SessionGlobal->WsListEntry); + SessionGlobal->WsListEntry.Flink = NULL; + } + + /* Release the expansion lock */ + MiReleaseExpansionLock(OldIrql); + + /* Check for a win32k unload routine */ + if (SessionGlobal->Win32KDriverUnload) + { + /* Call it */ + SessionGlobal->Win32KDriverUnload(NULL); + } +} + + +VOID +NTAPI +MiDereferenceSession(VOID) +{ + PMM_SESSION_SPACE SessionGlobal; + PEPROCESS Process; + ULONG ReferenceCount, SessionId; + + /* Sanity checks */ + ASSERT(PsGetCurrentProcess()->ProcessInSession || + ((MmSessionSpace->u.Flags.Initialized == 0) && + (PsGetCurrentProcess()->Vm.Flags.SessionLeader == 1) && + (MmSessionSpace->ReferenceCount == 1))); + + /* The session bit must be set */ + SessionId = MmSessionSpace->SessionId; + ASSERT(RtlCheckBit(MiSessionIdBitmap, SessionId)); + + /* Get the current process */ + Process = PsGetCurrentProcess(); + + /* Decrement the process count */ + InterlockedDecrement(&MmSessionSpace->ResidentProcessCount); + + /* Decrement the reference count and check if was the last reference */ + ReferenceCount = InterlockedDecrement(&MmSessionSpace->ReferenceCount); + if (ReferenceCount == 0) + { + /* No more references left, kill the session completely */ + MiDereferenceSessionFinal(); + } + + /* Check if tis is the session leader or the last process in the session */ + if ((Process->Vm.Flags.SessionLeader) || (ReferenceCount == 0)) + { + /* Get the global session address before we kill the session mapping */ + SessionGlobal = MmSessionSpace->GlobalVirtualAddress; + + /* Delete all session PDEs and flush the TB */ + RtlZeroMemory(MiAddressToPde(MmSessionBase), + BYTES_TO_PAGES(MmSessionSize) * sizeof(MMPDE)); + KeFlushEntireTb(FALSE, FALSE); + + /* Is this the session leader? */ + if (Process->Vm.Flags.SessionLeader) + { + /* Clean up the references here. */ + ASSERT(Process->Session == NULL); + MiReleaseProcessReferenceToSessionDataPage(SessionGlobal); + } + } + + /* Reset the current process' session flag */ + RtlInterlockedClearBits(&Process->Flags, PSF_PROCESS_IN_SESSION_BIT); +} + +VOID +NTAPI MiSessionRemoveProcess(VOID) { PEPROCESS CurrentProcess = PsGetCurrentProcess(); + KIRQL OldIrql; /* If the process isn't already in a session, or if it's the leader... */ if (!(CurrentProcess->Flags & PSF_PROCESS_IN_SESSION_BIT) || @@ -240,10 +399,17 @@ /* Sanity check */ ASSERT(MmIsAddressValid(MmSessionSpace) == TRUE); - /* Remove the process from the list ,and dereference the session */ - // DO NOT ENABLE THIS UNLESS YOU FIXED THE NP POOL CORRUPTION THAT IT CAUSES!!! - //RemoveEntryList(&CurrentProcess->SessionProcessLinks); - //MiDereferenceSession(); + /* Acquire the expansion lock while touching the session */ + OldIrql = MiAcquireExpansionLock(); + + /* Remove the process from the list */ + RemoveEntryList(&CurrentProcess->SessionProcessLinks); + + /* Release the lock again */ + MiReleaseExpansionLock(OldIrql); + + /* Dereference the session */ + MiDereferenceSession(); } VOID @@ -251,6 +417,7 @@ MiSessionAddProcess(IN PEPROCESS NewProcess) { PMM_SESSION_SPACE SessionGlobal; + KIRQL OldIrql; /* The current process must already be in a session */ if (!(PsGetCurrentProcess()->Flags & PSF_PROCESS_IN_SESSION_BIT)) return; @@ -270,9 +437,14 @@ ASSERT(NewProcess->Session == NULL); NewProcess->Session = SessionGlobal; + /* Acquire the expansion lock while touching the session */ + OldIrql = MiAcquireExpansionLock(); + /* Insert it into the process list */ - // DO NOT ENABLE THIS UNLESS YOU FIXED THE NP POOL CORRUPTION THAT IT CAUSES!!! - //InsertTailList(&SessionGlobal->ProcessList, &NewProcess->SessionProcessLinks); + InsertTailList(&SessionGlobal->ProcessList, &NewProcess->SessionProcessLinks); + + /* Release the lock again */ + MiReleaseExpansionLock(OldIrql); /* Set the flag */ PspSetProcessFlag(NewProcess, PSF_PROCESS_IN_SESSION_BIT); @@ -389,11 +561,21 @@ WorkingSetList->HashTableSize = 0; WorkingSetList->Wsle = MmSessionSpace->Wsle; - /* FIXME: Handle list insertions */ + /* Acquire the expansion lock while touching the session */ + OldIrql = MiAcquireExpansionLock(); + + /* Handle list insertions */ ASSERT(SessionGlobal->WsListEntry.Flink == NULL); ASSERT(SessionGlobal->WsListEntry.Blink == NULL); + InsertTailList(&MiSessionWsList, &SessionGlobal->WsListEntry); + ASSERT(SessionGlobal->Vm.WorkingSetExpansionLinks.Flink == NULL); ASSERT(SessionGlobal->Vm.WorkingSetExpansionLinks.Blink == NULL); + InsertTailList(&MmWorkingSetExpansionHead, + &SessionGlobal->Vm.WorkingSetExpansionLinks); + + /* Release the lock again */ + MiReleaseExpansionLock(OldIrql); /* All done, return */ //MmUnlockPageableImageSection(ExPageLockHandle); @@ -610,10 +792,6 @@ ASSERT(SessionGlobal->ProcessReferenceToSession == 0); SessionGlobal->ProcessReferenceToSession = 1; - // HACK: we only support 1 session and save the creator process - NT_ASSERT(Session0CreatorProcess == NULL); - Session0CreatorProcess = PsGetCurrentProcess(); - /* We're done */ InterlockedIncrement(&MmSessionDataPages); return STATUS_SUCCESS; @@ -716,16 +894,63 @@ _Out_ PKAPC_STATE ApcState) { PEPROCESS EntryProcess; + PMM_SESSION_SPACE EntrySession, CurrentSession; + PEPROCESS CurrentProcess; + KIRQL OldIrql; /* The parameter is the actual process! */ EntryProcess = SessionEntry; NT_ASSERT(EntryProcess != NULL); - /* HACK: for now we only support 1 session! */ - NT_ASSERT(((PMM_SESSION_SPACE)EntryProcess->Session)->SessionId == 1); - - /* Very simple for now: just attach to the process we have */ + /* Sanity checks */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + ASSERT(EntryProcess->Vm.Flags.SessionLeader == 0); + + /* Get the session from the process that was passed in */ + EntrySession = EntryProcess->Session; + ASSERT(EntrySession != NULL); + + /* Get the current process and it's session */ + CurrentProcess = PsGetCurrentProcess(); + CurrentSession = CurrentProcess->Session; + + /* Acquire the expansion lock while touching the session */ + OldIrql = MiAcquireExpansionLock(); + + /* Check if the session is about to be deleted */ + if (EntrySession->u.Flags.DeletePending) + { + /* We cannot attach to it, so unlock and fail */ + MiReleaseExpansionLock(OldIrql); + return STATUS_PROCESS_IS_TERMINATING; + } + + /* Count the number of attaches */ + EntrySession->AttachCount++; + + /* we can release the lock again */ + MiReleaseExpansionLock(OldIrql); + + /* Check if we are not the session leader and we are in a session */ + if (!CurrentProcess->Vm.Flags.SessionLeader && (CurrentSession != NULL)) + { + /* Are we already in the right session? */ + if (CurrentSession == EntrySession) + { + /* We are, so "attach" to the current process */ + EntryProcess = CurrentProcess; + } + else + { + /* We are not, the session id should better not match! */ + ASSERT(CurrentSession->SessionId != EntrySession->SessionId); + } + } + + /* Now attach to the process that we have */ KeStackAttachProcess(&EntryProcess->Pcb, ApcState); + + /* Success! */ return STATUS_SUCCESS; } @@ -737,16 +962,42 @@ _In_ PKAPC_STATE ApcState) { PEPROCESS EntryProcess; + PMM_SESSION_SPACE EntrySession; + KIRQL OldIrql; + BOOLEAN DeletePending; /* The parameter is the actual process! */ EntryProcess = SessionEntry; NT_ASSERT(EntryProcess != NULL); - /* HACK: for now we only support 1 session! */ - NT_ASSERT(((PMM_SESSION_SPACE)EntryProcess->Session)->SessionId == 0); - - /* Very simple for now: just detach */ + /* Sanity checks */ + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + ASSERT(EntryProcess->Vm.Flags.SessionLeader == 0); + + /* Get the session from the process that was passed in */ + EntrySession = EntryProcess->Session; + ASSERT(EntrySession != NULL); + + /* Acquire the expansion lock while touching the session */ + OldIrql = MiAcquireExpansionLock(); + + /* Make sure we have at least one attach and decrement the count */ + ASSERT(EntrySession->AttachCount >= 1); + EntrySession->AttachCount--; + + /* Remember if a delete is pending and we were the last one attached */ + DeletePending = EntrySession->u.Flags.DeletePending && + (EntrySession->AttachCount == 0); + + /* Release the lock again */ + MiReleaseExpansionLock(OldIrql); + + /* Detach from the process */ KeUnstackDetachProcess(ApcState); + + /* Check if we need to set the attach event */ + if (DeletePending) + KeSetEvent(&EntrySession->AttachEvent, IO_NO_INCREMENT, FALSE); } VOID @@ -760,11 +1011,13 @@ EntryProcess = SessionEntry; NT_ASSERT(EntryProcess != NULL); - /* HACK: for now we only support 1 session! */ - NT_ASSERT(((PMM_SESSION_SPACE)EntryProcess->Session)->SessionId == 0); - - /* Get rid of the reference we got */ - ObDereferenceObject(SessionEntry); + /* Sanity checks */ + ASSERT(KeGetCurrentIrql () <= APC_LEVEL); + ASSERT(EntryProcess->Vm.Flags.SessionLeader == 0); + ASSERT(EntryProcess->Session != NULL); + + /* Get rid of the reference we took */ + ObDereferenceObject(EntryProcess); } PVOID @@ -772,9 +1025,39 @@ MmGetSessionById( _In_ ULONG SessionId) { - /* HACK: for now we only support 1 session! */ - NT_ASSERT(SessionId == 0); - - /* Just return the sessions creator process, which is csrss and still alive. */ - return Session0CreatorProcess; -} + PLIST_ENTRY ListEntry; + PMM_SESSION_SPACE Session; + PEPROCESS Process = NULL; + KIRQL OldIrql; + + /* Acquire the expansion lock while touching the session */ + OldIrql = MiAcquireExpansionLock(); + + /* Loop all entries in the session ws list */ + ListEntry = MiSessionWsList.Flink; + while (ListEntry != &MiSessionWsList) + { + Session = CONTAINING_RECORD(ListEntry, MM_SESSION_SPACE, WsListEntry); + + /* Check if this is the session we are looking for */ + if (Session->SessionId == SessionId) + { + /* Check if we also have a process in the process list */ + if (!IsListEmpty(&Session->ProcessList)) + { + Process = CONTAINING_RECORD(Session->ProcessList.Flink, + EPROCESS, + SessionProcessLinks); + + /* Reference the process */ + ObReferenceObject(Process); + break; + } + } + } + + /* Release the lock again */ + MiReleaseExpansionLock(OldIrql); + + return Process; +} Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Nov 20 23:50:42 2013 @@ -450,6 +450,9 @@ PageFrameNumber); *MmSharedUserDataPte = TempPte; + /* Initialize session working set support */ + MiInitializeSessionWsSupport(); + /* Setup session IDs */ MiInitializeSessionIds();

1 0

[tkreuzer] 61060: [I8042PRT] Hackplement support for IOCTL_KEYBOARD_QUERY_ATTRIBUTES
by tkreuzer＠svn.reactos.org 20 Nov '13

20 Nov '13

Author: tkreuzer Date: Wed Nov 20 21:57:51 2013 New Revision: 61060 URL: http://svn.reactos.org/svn/reactos?rev=61060&view=rev Log: [I8042PRT] Hackplement support for IOCTL_KEYBOARD_QUERY_ATTRIBUTES Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Wed Nov 20 21:57:51 2013 @@ -468,6 +468,34 @@ return Status; } +VOID +NTAPI +i8042InitializeKeyboardAttributes( + PI8042_KEYBOARD_EXTENSION DeviceExtension) +{ + PPORT_DEVICE_EXTENSION PortDeviceExtension; + PI8042_SETTINGS Settings; + PKEYBOARD_ATTRIBUTES KeyboardAttributes; + + PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension; + Settings = &PortDeviceExtension->Settings; + + KeyboardAttributes = &DeviceExtension->KeyboardAttributes; + + KeyboardAttributes->KeyboardIdentifier.Type = (UCHAR)Settings->OverrideKeyboardType; + KeyboardAttributes->KeyboardIdentifier.Subtype = (UCHAR)Settings->OverrideKeyboardSubtype; + KeyboardAttributes->NumberOfFunctionKeys = 4; + KeyboardAttributes->NumberOfIndicators = 3; + KeyboardAttributes->NumberOfKeysTotal = 101; + KeyboardAttributes->InputDataQueueLength = Settings->KeyboardDataQueueSize; + KeyboardAttributes->KeyRepeatMinimum.UnitId = 0; + KeyboardAttributes->KeyRepeatMinimum.Rate = (USHORT)Settings->SampleRate; + KeyboardAttributes->KeyRepeatMinimum.Delay = 0; + KeyboardAttributes->KeyRepeatMinimum.UnitId = 0; + KeyboardAttributes->KeyRepeatMinimum.Rate = (USHORT)Settings->SampleRate; + KeyboardAttributes->KeyRepeatMinimum.Delay = 0; +} + /* * Runs the keyboard IOCTL_INTERNAL dispatch. */ @@ -557,6 +585,8 @@ } DeviceExtension->Common.PortDeviceExtension->KeyboardExtension = DeviceExtension; DeviceExtension->Common.PortDeviceExtension->Flags |= KEYBOARD_CONNECTED; + + i8042InitializeKeyboardAttributes(DeviceExtension); IoMarkIrpPending(Irp); /* FIXME: DeviceExtension->KeyboardHook.IsrWritePort = ; */ @@ -601,8 +631,8 @@ } case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: { - DPRINT1("IOCTL_KEYBOARD_QUERY_ATTRIBUTES not implemented\n"); -#if 0 + PKEYBOARD_ATTRIBUTES KeyboardAttributes; + /* FIXME: KeyboardAttributes are not initialized anywhere */ TRACE_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_KEYBOARD_QUERY_ATTRIBUTES\n"); if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_ATTRIBUTES)) @@ -611,11 +641,13 @@ break; } - *(PKEYBOARD_ATTRIBUTES) Irp->AssociatedIrp.SystemBuffer = DeviceExtension->KeyboardAttributes; + KeyboardAttributes = Irp->AssociatedIrp.SystemBuffer; + *KeyboardAttributes = DeviceExtension->KeyboardAttributes; + Irp->IoStatus.Information = sizeof(KEYBOARD_ATTRIBUTES); Status = STATUS_SUCCESS; break; -#endif + Status = STATUS_NOT_IMPLEMENTED; break; } @@ -812,7 +844,7 @@ else if (DeviceExtension->TabPressed) { DeviceExtension->TabPressed = FALSE; - + /* Check which action to do */ if (InputData->MakeCode == 0x25) { @@ -826,7 +858,7 @@ } else { - /* Send request to the kernel debugger. + /* Send request to the kernel debugger. * Unknown requests will be ignored. */ KdSystemDebugControl(' soR', (PVOID)(ULONG_PTR)InputData->MakeCode,

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