Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 60689: [SOFT386] Allow the DS segment to overriden in LODS, MOVS and CMPS.
by aandrejevic＠svn.reactos.org 16 Oct '13

16 Oct '13

Author: aandrejevic Date: Wed Oct 16 03:44:06 2013 New Revision: 60689 URL: http://svn.reactos.org/svn/reactos?rev=60689&view=rev Log: [SOFT386] Allow the DS segment to overriden in LODS, MOVS and CMPS. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Wed Oct 16 03:44:06 2013 @@ -6080,6 +6080,7 @@ { ULONG Data, DataSize; BOOLEAN OperandSize, AddressSize; + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -6096,6 +6097,12 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead of DS */ + Segment = State->SegmentOverride; } /* Calculate the size */ @@ -6148,7 +6155,7 @@ /* Read from memory */ if (!Soft386ReadMemory(State, - SOFT386_REG_DS, + Segment, AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long : State->GeneralRegs[SOFT386_REG_ESI].LowWord, FALSE, @@ -6267,6 +6274,7 @@ ULONG FirstValue = 0, SecondValue = 0, Result; ULONG DataSize, DataMask, SignFlag; BOOLEAN OperandSize, AddressSize; + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -6285,12 +6293,10 @@ AddressSize = !AddressSize; } - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead of DS */ + Segment = State->SegmentOverride; } /* Calculate the size */ @@ -6303,7 +6309,7 @@ /* Read from the first source operand */ if (!Soft386ReadMemory(State, - SOFT386_REG_DS, + Segment, AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long : State->GeneralRegs[SOFT386_REG_ESI].LowWord, FALSE, @@ -6553,6 +6559,7 @@ { ULONG DataSize; BOOLEAN OperandSize, AddressSize; + SOFT386_SEG_REGS Segment = SOFT386_REG_DS; OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; @@ -6569,6 +6576,12 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead of DS */ + Segment = State->SegmentOverride; } /* Calculate the size */ @@ -6598,7 +6611,7 @@ /* Read from the source operand */ if (!Soft386ReadMemory(State, - SOFT386_REG_DS, + Segment, AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long : State->GeneralRegs[SOFT386_REG_ESI].LowWord, FALSE,

1 0

[aandrejevic] 60688: [SOFT386] Implement the far absolute indirect JMP/CALL instructions in group 0xFF.
by aandrejevic＠svn.reactos.org 16 Oct '13

16 Oct '13

Author: aandrejevic Date: Wed Oct 16 03:14:12 2013 New Revision: 60688 URL: http://svn.reactos.org/svn/reactos?rev=60688&view=rev Log: [SOFT386] Implement the far absolute indirect JMP/CALL instructions in group 0xFF. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Wed Oct 16 03:14:12 2013 @@ -1508,8 +1508,90 @@ /* Set the EIP to the address */ State->InstPtr.Long = Value; } + else if (ModRegRm.Register == 3) + { + USHORT Selector; + INT Segment = SOFT386_REG_DS; + + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read the selector */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm.MemoryAddress + sizeof(ULONG), + FALSE, + &Selector, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + + /* Push the current value of CS */ + if (!Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Push the current value of EIP */ + if (!Soft386StackPush(State, State->InstPtr.Long)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new code segment */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the EIP to the address */ + State->InstPtr.Long = Value; + } else if (ModRegRm.Register == 4) { + /* Set the EIP to the address */ + State->InstPtr.Long = Value; + } + else if (ModRegRm.Register == 5) + { + USHORT Selector; + INT Segment = SOFT386_REG_DS; + + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read the selector */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm.MemoryAddress + sizeof(ULONG), + FALSE, + &Selector, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new code segment */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector)) + { + /* Exception occurred */ + return FALSE; + } + /* Set the EIP to the address */ State->InstPtr.Long = Value; } @@ -1569,15 +1651,104 @@ /* Set the IP to the address */ State->InstPtr.LowWord = Value; } - else if (ModRegRm.Register == 4) - { + else if (ModRegRm.Register == 3) + { + USHORT Selector; + INT Segment = SOFT386_REG_DS; + + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read the selector */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm.MemoryAddress + sizeof(USHORT), + FALSE, + &Selector, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + + /* Push the current value of CS */ + if (!Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Push the current value of IP */ + if (!Soft386StackPush(State, State->InstPtr.LowWord)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new code segment */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector)) + { + /* Exception occurred */ + return FALSE; + } + /* Set the IP to the address */ State->InstPtr.LowWord = Value; + + } + else if (ModRegRm.Register == 4) + { + /* Set the IP to the address */ + State->InstPtr.LowWord = Value; + } + else if (ModRegRm.Register == 5) + { + USHORT Selector; + INT Segment = SOFT386_REG_DS; + + /* Check for the segment override */ + if (State->PrefixFlags & SOFT386_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Read the selector */ + if (!Soft386ReadMemory(State, + Segment, + ModRegRm.MemoryAddress + sizeof(USHORT), + FALSE, + &Selector, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new code segment */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the IP to the address */ + State->InstPtr.LowWord = Value; } else if (ModRegRm.Register == 6) { /* Push the value on to the stack */ return Soft386StackPush(State, Value); + } + else + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; } if (ModRegRm.Register <= 1) @@ -1595,14 +1766,6 @@ } } - if ((ModRegRm.Register == 3) - || (ModRegRm.Register == 5) - || (ModRegRm.Register == 7)) - { - UNIMPLEMENTED; - return FALSE; // NOT IMPLEMENTED - } - return TRUE; }

1 0

[aandrejevic] 60687: [SOFT386] Fix bugs in SF calculation.
by aandrejevic＠svn.reactos.org 16 Oct '13

16 Oct '13

Author: aandrejevic Date: Wed Oct 16 02:22:40 2013 New Revision: 60687 URL: http://svn.reactos.org/svn/reactos?rev=60687&view=rev Log: [SOFT386] Fix bugs in SF calculation. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Wed Oct 16 02:22:40 2013 @@ -1663,7 +1663,7 @@ State->Flags.Cf = FALSE; State->Flags.Of = FALSE; State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Result); /* Write back the result */ @@ -1930,7 +1930,7 @@ State->Flags.Cf = FALSE; State->Flags.Of = FALSE; State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Result); /* Write back the result */ @@ -2197,7 +2197,7 @@ State->Flags.Cf = FALSE; State->Flags.Of = FALSE; State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Result); /* Write back the result */ @@ -2454,7 +2454,7 @@ State->Flags.Cf = FALSE; State->Flags.Of = FALSE; State->Flags.Zf = (Result == 0) ? TRUE : FALSE; - State->Flags.Sf = (Result & SIGN_FLAG_LONG) ? TRUE : FALSE; + State->Flags.Sf = (Result & SIGN_FLAG_WORD) ? TRUE : FALSE; State->Flags.Pf = Soft386CalculateParity(Result); }

1 0

[aandrejevic] 60686: [SOFT386] Implement the near absolute indirect JMP/CALL in opcode group 0xFF.
by aandrejevic＠svn.reactos.org 16 Oct '13

16 Oct '13

Author: aandrejevic Date: Wed Oct 16 01:44:39 2013 New Revision: 60686 URL: http://svn.reactos.org/svn/reactos?rev=60686&view=rev Log: [SOFT386] Implement the near absolute indirect JMP/CALL in opcode group 0xFF. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Wed Oct 16 01:44:39 2013 @@ -1496,6 +1496,23 @@ Value--; State->Flags.Af = ((Value & 0x0F) == 0x0F); } + else if (ModRegRm.Register == 2) + { + /* Push the current value of EIP */ + if (!Soft386StackPush(State, State->InstPtr.Long)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the EIP to the address */ + State->InstPtr.Long = Value; + } + else if (ModRegRm.Register == 4) + { + /* Set the EIP to the address */ + State->InstPtr.Long = Value; + } else if (ModRegRm.Register == 6) { /* Push the value on to the stack */ @@ -1540,6 +1557,23 @@ Value--; State->Flags.Af = ((Value & 0x0F) == 0x0F); } + else if (ModRegRm.Register == 2) + { + /* Push the current value of IP */ + if (!Soft386StackPush(State, State->InstPtr.LowWord)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the IP to the address */ + State->InstPtr.LowWord = Value; + } + else if (ModRegRm.Register == 4) + { + /* Set the IP to the address */ + State->InstPtr.LowWord = Value; + } else if (ModRegRm.Register == 6) { /* Push the value on to the stack */ @@ -1561,7 +1595,9 @@ } } - if ((ModRegRm.Register > 1) && (ModRegRm.Register != 6)) + if ((ModRegRm.Register == 3) + || (ModRegRm.Register == 5) + || (ModRegRm.Register == 7)) { UNIMPLEMENTED; return FALSE; // NOT IMPLEMENTED

1 0

[aandrejevic] 60685: [SOFT386] Start implementing call gate support. Implement the direct far call opcode (0x9A).
by aandrejevic＠svn.reactos.org 16 Oct '13

16 Oct '13

Author: aandrejevic Date: Wed Oct 16 00:41:24 2013 New Revision: 60685 URL: http://svn.reactos.org/svn/reactos?rev=60685&view=rev Log: [SOFT386] Start implementing call gate support. Implement the direct far call opcode (0x9A). Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h branches/ntvdm/lib/soft386/common.inl branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Wed Oct 16 00:41:24 2013 @@ -227,6 +227,19 @@ ULONG Granularity : 1; ULONG BaseHigh : 8; } SOFT386_GDT_ENTRY, *PSOFT386_GDT_ENTRY; + +typedef struct +{ + ULONG Offset : 16; + ULONG Selector : 16; + ULONG ParamCount : 5; + ULONG Reserved : 3; + ULONG Type : 4; + ULONG SystemType : 1; + ULONG Dpl : 2; + ULONG Present : 1; + ULONG OffsetHigh : 16; +} SOFT386_CALL_GATE, *PSOFT386_CALL_GATE; typedef struct { Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Wed Oct 16 00:41:24 2013 @@ -202,11 +202,19 @@ sizeof(GdtEntry)); } - /* Check if we are loading SS */ if (Segment == SOFT386_REG_SS) { + /* Loading the stack segment */ + if (GET_SEGMENT_INDEX(Selector) == 0) { + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.SystemType) + { + /* This is a special descriptor */ Soft386Exception(State, SOFT386_EXCEPTION_GP); return FALSE; } @@ -230,8 +238,22 @@ return FALSE; } } + else if (Segment == SOFT386_REG_CS) + { + /* Loading the code segment */ + // TODO: NOT IMPLEMENTED + } else { + /* Loading a data segment */ + + if (!GdtEntry.SystemType) + { + /* This is a special descriptor */ + Soft386Exception(State, SOFT386_EXCEPTION_GP); + return FALSE; + } + if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) && (Soft386GetCurrentPrivLevel(State) > GdtEntry.Dpl)) { Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Wed Oct 16 00:41:24 2013 @@ -4612,10 +4612,77 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeCallAbs) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + USHORT Segment = 0; + ULONG Offset = 0; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x9A); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Fetch the offset */ + if (Size) + { + if (!Soft386FetchDword(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Fetch the segment */ + if (!Soft386FetchWord(State, &Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Push the current code segment selector */ + if (!Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Push the current value of the instruction pointer */ + if (!Soft386StackPush(State, State->InstPtr.Long)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load new (E)IP */ + if (Size) State->InstPtr.Long = Offset; + else State->InstPtr.LowWord = LOWORD(Offset); + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeWait)

1 0

[jimtabor] 60684: - Properly remove window properties when destroying the window.
by jimtabor＠svn.reactos.org 16 Oct '13

16 Oct '13

Author: jimtabor Date: Wed Oct 16 00:11:23 2013 New Revision: 60684 URL: http://svn.reactos.org/svn/reactos?rev=60684&view=rev Log: - Properly remove window properties when destroying the window. Modified: trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Wed Oct 16 00:11:23 2013 @@ -16,12 +16,12 @@ { PLIST_ENTRY ListEntry; PPROPERTY Property; + int i; ListEntry = Window->PropListHead.Flink; - while (ListEntry != &Window->PropListHead) + for (i = 0; i < Window->PropListItems; i++ ) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - if (!Property) break; if (Property->Atom == Atom) { return(Property); @@ -77,6 +77,25 @@ Prop->Data = Data; return TRUE; +} + +VOID FASTCALL +IntRemoveWindowProp(PWND Window) +{ + PLIST_ENTRY ListEntry; + PPROPERTY Property; + int i, Count = Window->PropListItems; + + ListEntry = Window->PropListHead.Flink; + for (i = 0; i < Count; i++ ) + { + Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + ListEntry = ListEntry->Flink; + RemoveEntryList(&Property->PropListEntry); + UserHeapFree(Property); + Window->PropListItems--; + } + return; } /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Wed Oct 16 00:11:23 2013 @@ -4,3 +4,4 @@ BOOL FASTCALL IntRemoveProp(PWND,ATOM); BOOL FASTCALL IntSetProp(PWND, ATOM, HANDLE); HANDLE FASTCALL UserGetProp(PWND, ATOM); +VOID FASTCALL IntRemoveWindowProp(PWND Window); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Wed Oct 16 00:11:23 2013 @@ -426,8 +426,6 @@ PWND Child; PMENU_OBJECT Menu; BOOLEAN BelongsToThreadData; - PLIST_ENTRY ListEntry; - PPROPERTY Property; ASSERT(Window); @@ -556,12 +554,11 @@ IntUnlinkWindow(Window); - ListEntry = Window->PropListHead.Flink; - while (ListEntry != &Window->PropListHead) - { - Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - ListEntry = ListEntry->Flink; - IntRemoveProp(Window, Property->Atom); + if (Window->PropListItems) + { + IntRemoveWindowProp(Window); + TRACE("Window->PropListItems %d\n",Window->PropListItems); + ASSERT(Window->PropListItems==0); } UserReferenceObject(Window);

1 0

[jimtabor] 60683: [Win32ss] - Prevent a potential kernel exception.
by jimtabor＠svn.reactos.org 15 Oct '13

15 Oct '13

Author: jimtabor Date: Tue Oct 15 22:16:31 2013 New Revision: 60683 URL: http://svn.reactos.org/svn/reactos?rev=60683&view=rev Log: [Win32ss] - Prevent a potential kernel exception. Modified: trunk/reactos/win32ss/user/ntuser/prop.c Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Tue Oct 15 22:16:31 2013 @@ -21,6 +21,7 @@ while (ListEntry != &Window->PropListHead) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + if (!Property) break; if (Property->Atom == Atom) { return(Property);

1 0

[jimtabor] 60682: [Win32ss] - Prevent a potential kernel exception.
by jimtabor＠svn.reactos.org 15 Oct '13

15 Oct '13

Author: jimtabor Date: Tue Oct 15 22:14:48 2013 New Revision: 60682 URL: http://svn.reactos.org/svn/reactos?rev=60682&view=rev Log: [Win32ss] - Prevent a potential kernel exception. Modified: trunk/reactos/win32ss/user/user32/windows/prop.c Modified: trunk/reactos/win32ss/user/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] Tue Oct 15 22:14:48 2013 @@ -53,6 +53,7 @@ for (i = 0; i < pWnd->PropListItems; i++ ) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); + if (!Property) break; if (Property->Atom == Atom) { return(Property);

1 0

[aandrejevic] 60681: [SOFT386] Implement the PUSH instruction in opcode group 0xFF.
by aandrejevic＠svn.reactos.org 15 Oct '13

15 Oct '13

Author: aandrejevic Date: Tue Oct 15 19:03:40 2013 New Revision: 60681 URL: http://svn.reactos.org/svn/reactos?rev=60681&view=rev Log: [SOFT386] Implement the PUSH instruction in opcode group 0xFF. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Tue Oct 15 19:03:40 2013 @@ -1496,6 +1496,11 @@ Value--; State->Flags.Af = ((Value & 0x0F) == 0x0F); } + else if (ModRegRm.Register == 6) + { + /* Push the value on to the stack */ + return Soft386StackPush(State, Value); + } if (ModRegRm.Register <= 1) { @@ -1535,6 +1540,11 @@ Value--; State->Flags.Af = ((Value & 0x0F) == 0x0F); } + else if (ModRegRm.Register == 6) + { + /* Push the value on to the stack */ + return Soft386StackPush(State, Value); + } if (ModRegRm.Register <= 1) { @@ -1551,7 +1561,7 @@ } } - if (ModRegRm.Register > 1) + if ((ModRegRm.Register > 1) && (ModRegRm.Register != 6)) { UNIMPLEMENTED; return FALSE; // NOT IMPLEMENTED

1 0

[aandrejevic] 60680: [SOFT386] Implement far returns (both versions in Soft386OpcodeRetFar).
by aandrejevic＠svn.reactos.org 15 Oct '13

15 Oct '13

Author: aandrejevic Date: Tue Oct 15 18:54:11 2013 New Revision: 60680 URL: http://svn.reactos.org/svn/reactos?rev=60680&view=rev Log: [SOFT386] Implement far returns (both versions in Soft386OpcodeRetFar). Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Tue Oct 15 18:54:11 2013 @@ -242,7 +242,7 @@ Soft386OpcodeGroupC7, Soft386OpcodeEnter, Soft386OpcodeLeave, - Soft386OpcodeRetFarImm, + Soft386OpcodeRetFar, Soft386OpcodeRetFar, Soft386OpcodeInt, Soft386OpcodeInt, @@ -5075,20 +5075,69 @@ } } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + ULONG Segment = 0; + ULONG Offset = 0; + USHORT BytesToPop = 0; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xCA); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Opcode == 0xCA) + { + /* Fetch the number of bytes to pop after the return */ + if (!Soft386FetchWord(State, &BytesToPop)) return FALSE; + } + + /* Pop the offset */ + if (!Soft386StackPop(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Pop the segment */ + if (!Soft386StackPop(State, &Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load new (E)IP, and if necessary, pop the parameters */ + if (Size) + { + State->InstPtr.Long = Offset; + State->GeneralRegs[SOFT386_REG_ESP].Long += BytesToPop; + } + else + { + State->InstPtr.LowWord = LOWORD(Offset); + State->GeneralRegs[SOFT386_REG_ESP].LowWord += BytesToPop; + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeInt)

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