Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[hbelusca] 65944: Remove unneeded .cvsignore files.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 2 23:44:04 2015 New Revision: 65944 URL: http://svn.reactos.org/svn/reactos?rev=65944&view=rev Log: Remove unneeded .cvsignore files. Removed: trunk/reactos/boot/freeldr/tools/.cvsignore trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore Removed: trunk/reactos/boot/freeldr/tools/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/tools/.cvsign… ============================================================================== --- trunk/reactos/boot/freeldr/tools/.cvsignore [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/tools/.cvsignore (removed) @@ -1,7 +0,0 @@ -bin2c -deptool -hosttype -rcopy -rdel -rmkdir -rrmdir Removed: trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/mkdo… ============================================================================== --- trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/mkdosfs/.cvsignore (removed) @@ -1 +0,0 @@ -mkdosfs

9 years, 8 months

[hbelusca] 65943: Fix member size in the SETUP_LOADER_BLOCK structure.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 2 23:10:44 2015 New Revision: 65943 URL: http://svn.reactos.org/svn/reactos?rev=65943&view=rev Log: Fix member size in the SETUP_LOADER_BLOCK structure. Modified: trunk/reactos/include/reactos/arc/setupblk.h Modified: trunk/reactos/include/reactos/arc/setupblk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/setupb… ============================================================================== --- trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/setupblk.h [iso-8859-1] Fri Jan 2 23:10:44 2015 @@ -149,7 +149,7 @@ PCHAR MachineDirectoryPath; PCHAR NetBootSifPath; PVOID NetBootSecret; - CHAR NetBootIMirrorFilePath[26]; + CHAR NetBootIMirrorFilePath[260]; PCHAR ASRPnPSifFile; ULONG ASRPnPSifFileLength; CHAR NetBootAdministratorPassword[64];

9 years, 8 months

[aandrejevic] 65942: [FAST486] Implement the FWAIT instruction. Fix FPU exception handling. Implement exception masking. Fix several other bugs and wrong definitions.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Jan 2 21:19:31 2015 New Revision: 65942 URL: http://svn.reactos.org/svn/reactos?rev=65942&view=rev Log: [FAST486] Implement the FWAIT instruction. Fix FPU exception handling. Implement exception masking. Fix several other bugs and wrong definitions. Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri Jan 2 21:19:31 2015 @@ -107,8 +107,16 @@ if (FPU_IS_NAN(Value) || !FPU_IS_NORMALIZED(Value) || (UnbiasedExp < 0) || (UnbiasedExp > 63)) { - State->FpuStatus.Ie = TRUE; - return FALSE; + if (State->FpuControl.Im) + { + *Result = 0LL; + return TRUE; + } + else + { + State->FpuStatus.Ie = TRUE; + return FALSE; + } } Bits = 63 - UnbiasedExp; @@ -223,22 +231,42 @@ if (FPU_IS_NAN(Value)) { - *Result |= 0x3FF0000000000000ULL; + *Result |= 0x7FFULL << 52; goto SetSign; } /* Check for underflow */ if (!FPU_IS_NORMALIZED(Value) || (UnbiasedExp < -1023)) { - State->FpuStatus.Ue = TRUE; - return FALSE; + if (State->FpuControl.Um) + { + /* The result is zero due to underflow */ + *Result = 0ULL; + return TRUE; + } + else + { + /* Raise the underflow exception */ + State->FpuStatus.Ue = TRUE; + return FALSE; + } } /* Check for overflow */ if (UnbiasedExp > 1023) { - State->FpuStatus.Oe = TRUE; - return FALSE; + if (State->FpuControl.Om) + { + /* The result is infinity due to overflow */ + *Result = FPU_REAL8_INFINITY; + goto SetSign; + } + else + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + return FALSE; + } } /* Calculate the remainder */ @@ -291,7 +319,7 @@ return TRUE; } -static inline BOOLEAN FASTCALL +static inline VOID FASTCALL Fast486FpuFromPackedBcd(PFAST486_STATE State, PUCHAR Value, PFAST486_FPU_DATA_REG Result) @@ -301,13 +329,6 @@ for (i = 8; i >= 0; i--) { - if (((Value[i] & 0x0F) > 9) || ((Value[i] >> 4) > 9)) - { - /* Invalid BCD */ - State->FpuStatus.Ie = TRUE; - return FALSE; - } - IntVal *= 100LL; IntVal += (Value[i] >> 4) * 10 + (Value[i] & 0x0F); } @@ -317,7 +338,6 @@ /* Now convert the integer to FP80 */ Fast486FpuFromInteger(State, IntVal, Result); - return TRUE; } static inline BOOLEAN FASTCALL @@ -356,10 +376,12 @@ FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; FAST486_FPU_DATA_REG TempResult; - if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) - { - /* Denormalized */ + if (!State->FpuControl.Dm + && (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) + { + /* Raise the denormalized exception */ State->FpuStatus.De = TRUE; + return; } /* Find the largest exponent */ @@ -405,12 +427,18 @@ { if (TempResult.Exponent == FPU_MAX_EXPONENT) { - /* Total overflow, return infinity */ - TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; - TempResult.Exponent = FPU_MAX_EXPONENT + 1; - - /* Update flags */ - State->FpuStatus.Oe = TRUE; + if (State->FpuControl.Om) + { + /* Total overflow, return infinity */ + TempResult.Mantissa = FPU_MANTISSA_HIGH_BIT; + TempResult.Exponent = FPU_MAX_EXPONENT + 1; + } + else + { + /* Raise the overflow exception */ + State->FpuStatus.Oe = TRUE; + return; + } } else { @@ -438,7 +466,7 @@ NegativeSecondOperand.Sign = !NegativeSecondOperand.Sign; /* And perform an addition instead */ - Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); + Fast486FpuAdd(State, FirstOperand, &NegativeSecondOperand, Result); } static inline VOID FASTCALL @@ -502,10 +530,12 @@ { FAST486_FPU_DATA_REG TempResult; - if (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand)) - { - /* Denormalized */ + if (!State->FpuControl.Dm + && (!FPU_IS_NORMALIZED(FirstOperand) || !FPU_IS_NORMALIZED(SecondOperand))) + { + /* Raise the denormalized exception */ State->FpuStatus.De = TRUE; + return; } UnsignedMult128(FirstOperand->Mantissa, @@ -530,9 +560,19 @@ if (FPU_IS_ZERO(SecondOperand)) { - /* Division by zero */ - State->FpuStatus.Ze = TRUE; - return; + if (State->FpuControl.Zm) + { + /* Return infinity */ + Result->Sign = FirstOperand->Sign; + Result->Exponent = FPU_MAX_EXPONENT + 1; + Result->Mantissa = FPU_MANTISSA_HIGH_BIT; + } + else + { + /* Raise the division by zero exception */ + State->FpuStatus.Ze = TRUE; + return; + } } TempResult.Exponent = FirstOperand->Exponent - SecondOperand->Exponent; @@ -631,10 +671,26 @@ #ifndef FAST486_NO_FPU + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + return; } @@ -651,24 +707,31 @@ Fast486FpuFromSingleReal(State, Value, &MemoryData); SourceOperand = &MemoryData; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } else { if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + return; } /* Load the source operand from an FPU register */ SourceOperand = &FPU_ST(ModRegRm.SecondRegister); - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } /* Perform the requested operation */ @@ -695,18 +758,34 @@ #ifndef FAST486_NO_FPU - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - if (ModRegRm.Memory) { + ULONGLONG Value; + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + /* Load the source operand from memory */ - ULONGLONG Value; - if (!Fast486ReadMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) ? State->SegmentOverride : FAST486_REG_DS, @@ -721,24 +800,35 @@ Fast486FpuFromDoubleReal(State, Value, &MemoryData); SourceOperand = &MemoryData; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } else { - if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - /* The source operand is ST0 */ SourceOperand = &FPU_ST(0); /* Load the destination operand from an FPU register */ DestOperand = &FPU_ST(ModRegRm.SecondRegister); + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } } /* Perform the requested operation */ @@ -800,8 +890,8 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(1) == FPU_TAG_EMPTY)) { - /* FPU Exception */ - State->FpuStatus.Ie = TRUE; + /* Raise the invalid operation exception, if unmasked */ + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; return; } @@ -822,22 +912,35 @@ return; } + /* The destination operand is always ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); SourceOperand = &MemoryData; - /* The destination operand is always ST0 */ - DestOperand = &FPU_ST(0); - - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - /* Perform the requested operation */ Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); - + #endif } @@ -884,16 +987,18 @@ /* FISTP */ case 3: { - LONGLONG Temp; + LONGLONG Temp = 0; if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -952,15 +1057,26 @@ { UCHAR Buffer[10]; - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - *((PULONGLONG)Buffer) = FPU_ST(0).Mantissa; - *((PUSHORT)&Buffer[sizeof(ULONGLONG)]) = FPU_ST(0).Exponent | (FPU_ST(0).Sign ? 0x8000 : 0); + if (FPU_GET_TAG(0) != FPU_TAG_EMPTY) + { + *((PULONGLONG)Buffer) = FPU_ST(0).Mantissa; + *((PUSHORT)&Buffer[sizeof(ULONGLONG)]) = FPU_ST(0).Exponent + | (FPU_ST(0).Sign ? 0x8000 : 0); + } + else + { + if (State->FpuControl.Im) + { + *((PULONGLONG)Buffer) = FPU_INDEFINITE_MANTISSA; + *((PUSHORT)&Buffer[sizeof(ULONGLONG)]) = 0x8000 | (FPU_MAX_EXPONENT + 1); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } if (!Fast486WriteMemory(State, (State->PrefixFlags & FAST486_PREFIX_SEG) @@ -981,6 +1097,7 @@ default: { Fast486Exception(State, FAST486_EXCEPTION_UD); + return; } } } @@ -1030,6 +1147,7 @@ default: { Fast486Exception(State, FAST486_EXCEPTION_UD); + return; } } } @@ -1086,16 +1204,18 @@ /* FSTP */ case 3: { - ULONGLONG Value; + ULONGLONG Value = FPU_REAL8_INDEFINITE; if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToDoubleReal(State, &FPU_ST(0), &Value)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToDoubleReal(State, &FPU_ST(0), &Value)) { /* Exception occurred */ return; @@ -1167,7 +1287,7 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; break; } @@ -1202,7 +1322,7 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) { - State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; return; } @@ -1228,7 +1348,6 @@ FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; PFAST486_FPU_DATA_REG SourceOperand, DestOperand; - BOOLEAN PopStack = FALSE; /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -1241,18 +1360,34 @@ #ifndef FAST486_NO_FPU - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; - } - if (ModRegRm.Memory) { SHORT Value; FAST486_FPU_DATA_REG MemoryData; + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + if (State->FpuControl.Im) + { + /* Return the indefinite NaN */ + DestOperand->Sign = TRUE; + DestOperand->Exponent = FPU_MAX_EXPONENT + 1; + DestOperand->Mantissa = FPU_INDEFINITE_MANTISSA; + + FPU_SET_TAG(0, FPU_TAG_SPECIAL); + } + else + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + } + + return; + } + /* Load the source operand from memory */ if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, (PUSHORT)&Value)) { @@ -1262,9 +1397,6 @@ Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); SourceOperand = &MemoryData; - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); } else { @@ -1282,19 +1414,19 @@ /* Load the destination operand from a register */ DestOperand = &FPU_ST(ModRegRm.SecondRegister); - if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) + { + /* Raise the invalid operation exception, if unmasked */ + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; + return; } - - PopStack = TRUE; } /* Perform the requested operation */ Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); - if (PopStack) Fast486FpuPop(State); + if (!ModRegRm.Memory) Fast486FpuPop(State); #endif } @@ -1342,16 +1474,18 @@ /* FISTP */ case 3: { - LONGLONG Temp; + LONGLONG Temp = 0LL; if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -1397,13 +1531,9 @@ return; } - if (!Fast486FpuFromPackedBcd(State, Buffer, &Value)) - { - /* Exception occurred */ - return; - } - - Fast486FpuPush(State, &Value); + Fast486FpuFromPackedBcd(State, Buffer, &Value); + Fast486FpuPush(State, &Value); + break; } @@ -1434,16 +1564,18 @@ /* FBSTP */ case 6: { - UCHAR Buffer[10]; + UCHAR Buffer[10] = {0}; if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToPackedBcd(State, &FPU_ST(0), Buffer)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToPackedBcd(State, &FPU_ST(0), Buffer)) { /* Exception occurred */ return; @@ -1467,16 +1599,18 @@ /* FISTP (64-bit int) */ case 7: { - LONGLONG Temp; + LONGLONG Temp = 0LL; if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) { - /* Fail */ - State->FpuStatus.Ie = TRUE; - return; - } - - if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + if (!State->FpuControl.Im) + { + /* Raise the invalid operation exception */ + State->FpuStatus.Ie = TRUE; + return; + } + } + else if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) { /* Exception occurred */ return; @@ -1527,7 +1661,7 @@ if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { - State->FpuStatus.Ie = TRUE; + if (!State->FpuControl.Im) State->FpuStatus.Ie = TRUE; break; } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Fri Jan 2 21:19:31 2015 @@ -42,18 +42,23 @@ } #define FPU_UPDATE_TAG(i) FPU_SET_TAG((i), Fast486GetValueTag(&FPU_ST(i))) -#define FPU_REAL4_BIAS 0x7F -#define FPU_REAL8_BIAS 0x3FF -#define FPU_REAL10_BIAS 0x3FFF -#define FPU_MAX_EXPONENT 0x7FFE -#define FPU_MANTISSA_HIGH_BIT 0x8000000000000000ULL +#define FPU_REAL4_BIAS 0x7F +#define FPU_REAL8_BIAS 0x3FF +#define FPU_REAL10_BIAS 0x3FFF +#define FPU_MAX_EXPONENT 0x7FFE +#define FPU_MANTISSA_HIGH_BIT 0x8000000000000000ULL +#define FPU_INDEFINITE_MANTISSA 0xC000000000000000ULL +#define FPU_REAL4_INFINITY 0x7F800000 +#define FPU_REAL4_INDEFINITE 0xFFC00000 +#define FPU_REAL8_INFINITY 0x7FF0000000000000ULL +#define FPU_REAL8_INDEFINITE 0xFFF8000000000000ULL -#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) -#define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) -#define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) -#define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && (x)->Mantissa & FPU_MANTISSA_HIGH_BIT) -#define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) -#define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) +#define FPU_IS_NORMALIZED(x) (!FPU_IS_ZERO(x) && (((x)->Mantissa & FPU_MANTISSA_HIGH_BIT) != 0ULL)) +#define FPU_IS_ZERO(x) ((x)->Mantissa == 0ULL) +#define FPU_IS_NAN(x) ((x)->Exponent == (FPU_MAX_EXPONENT + 1)) +#define FPU_IS_INFINITY(x) (FPU_IS_NAN(x) && ((x)->Mantissa == FPU_MANTISSA_HIGH_BIT)) +#define FPU_IS_POS_INF(x) (FPU_IS_INFINITY(x) && !(x)->Sign) +#define FPU_IS_NEG_INF(x) (FPU_IS_INFINITY(x) && (x)->Sign) enum { Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Fri Jan 2 21:19:31 2015 @@ -4116,8 +4116,20 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeWait) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; +#ifndef FAST486_NO_FPU + + if ((!State->FpuControl.Pm && State->FpuStatus.Pe) + || (!State->FpuControl.Um && State->FpuStatus.Ue) + || (!State->FpuControl.Om && State->FpuStatus.Oe) + || (!State->FpuControl.Zm && State->FpuStatus.Ze) + || (!State->FpuControl.Dm && State->FpuStatus.De) + || (!State->FpuControl.Im && State->FpuStatus.Ie)) + { + /* Call the #MF handler */ + Fast486Exception(State, FAST486_EXCEPTION_MF); + } + +#endif } FAST486_OPCODE_HANDLER(Fast486OpcodePushFlags)

9 years, 8 months

[hbelusca] 65941: [CONSRV]: We can return the real NTSTATUS code instead of a STATUS_UNSUCCESSFUL. Noticed by Thomas some time ago. I kept the STATUS_UNSUCCESSFUL first because I didn't want to cha...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jan 2 20:32:44 2015 New Revision: 65941 URL: http://svn.reactos.org/svn/reactos?rev=65941&view=rev Log: [CONSRV]: We can return the real NTSTATUS code instead of a STATUS_UNSUCCESSFUL. Noticed by Thomas some time ago. I kept the STATUS_UNSUCCESSFUL first because I didn't want to change the returned status code as it was before the changes of r65449. But I changed my mind since then! d8^) Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Fri Jan 2 20:32:44 2015 @@ -212,10 +212,7 @@ Status = NtCreateEvent(&Console->InputBuffer.ActiveEvent, EVENT_ALL_ACCESS, &ObjectAttributes, NotificationEvent, FALSE); if (!NT_SUCCESS(Status)) - { - return STATUS_UNSUCCESSFUL; - // return Status; - } + return Status; Console->InputBuffer.InputBufferSize = InputBufferSize; InitializeListHead(&Console->InputBuffer.InputEvents);

9 years, 8 months

[aandrejevic] 65940: [FAST486] Split the D8/DC opcode handler into two handlers to eliminate the extra branch. Implement opcode DF (New instructions: FBLD and FBSTP).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Jan 2 18:29:30 2015 New Revision: 65940 URL: http://svn.reactos.org/svn/reactos?rev=65940&view=rev Log: [FAST486] Split the D8/DC opcode handler into two handlers to eliminate the extra branch. Implement opcode DF (New instructions: FBLD and FBSTP). Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Fri Jan 2 18:29:30 2015 @@ -291,6 +291,61 @@ return TRUE; } +static inline BOOLEAN FASTCALL +Fast486FpuFromPackedBcd(PFAST486_STATE State, + PUCHAR Value, + PFAST486_FPU_DATA_REG Result) +{ + INT i; + LONGLONG IntVal = 0LL; + + for (i = 8; i >= 0; i--) + { + if (((Value[i] & 0x0F) > 9) || ((Value[i] >> 4) > 9)) + { + /* Invalid BCD */ + State->FpuStatus.Ie = TRUE; + return FALSE; + } + + IntVal *= 100LL; + IntVal += (Value[i] >> 4) * 10 + (Value[i] & 0x0F); + } + + /* Apply the sign */ + if (Value[9] & 0x80) IntVal = -IntVal; + + /* Now convert the integer to FP80 */ + Fast486FpuFromInteger(State, IntVal, Result); + return TRUE; +} + +static inline BOOLEAN FASTCALL +Fast486FpuToPackedBcd(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Value, + PUCHAR Result) +{ + INT i; + LONGLONG IntVal; + + /* Convert it to an integer first */ + if (!Fast486FpuToInteger(State, Value, &IntVal)) return FALSE; + + if (IntVal < 0LL) + { + IntVal = -IntVal; + Result[9] = 0x80; + } + + for (i = 0; i < 9; i++) + { + Result[i] = (UCHAR)((IntVal % 10) + (((IntVal / 10) % 10) << 4)); + IntVal /= 100LL; + } + + return TRUE; +} + static inline VOID FASTCALL Fast486FpuAdd(PFAST486_STATE State, PFAST486_FPU_DATA_REG FirstOperand, @@ -558,7 +613,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8DC) +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8) { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; @@ -586,38 +641,15 @@ if (ModRegRm.Memory) { /* Load the source operand from memory */ - - if (Opcode == 0xDC) - { - ULONGLONG Value; - - if (!Fast486ReadMemory(State, - (State->PrefixFlags & FAST486_PREFIX_SEG) - ? State->SegmentOverride : FAST486_REG_DS, - ModRegRm.MemoryAddress, - FALSE, - &Value, - sizeof(ULONGLONG))) - { - /* Exception occurred */ - return; - } - - Fast486FpuFromDoubleReal(State, Value, &MemoryData); - } - else - { - ULONG Value; - - if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) - { - /* Exception occurred */ - return; - } - - Fast486FpuFromSingleReal(State, Value, &MemoryData); - } - + ULONG Value; + + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, NULL, &Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromSingleReal(State, Value, &MemoryData); SourceOperand = &MemoryData; /* The destination operand is ST0 */ @@ -632,22 +664,11 @@ return; } - if (Opcode == 0xDC) - { - /* The source operand is ST0 */ - SourceOperand = &FPU_ST(0); - - /* Load the destination operand from an FPU register */ - DestOperand = &FPU_ST(ModRegRm.SecondRegister); - } - else - { - /* Load the source operand from an FPU register */ - SourceOperand = &FPU_ST(ModRegRm.SecondRegister); - - /* The destination operand is ST0 */ - DestOperand = &FPU_ST(0); - } + /* Load the source operand from an FPU register */ + SourceOperand = &FPU_ST(ModRegRm.SecondRegister); + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); } /* Perform the requested operation */ @@ -655,6 +676,77 @@ #endif } + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + FAST486_FPU_DATA_REG MemoryData; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return; + } + + if (ModRegRm.Memory) + { + /* Load the source operand from memory */ + ULONGLONG Value; + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + &Value, + sizeof(ULONGLONG))) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromDoubleReal(State, Value, &MemoryData); + SourceOperand = &MemoryData; + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + } + else + { + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return; + } + + /* The source operand is ST0 */ + SourceOperand = &FPU_ST(0); + + /* Load the destination operand from an FPU register */ + DestOperand = &FPU_ST(ModRegRm.SecondRegister); + } + + /* Perform the requested operation */ + Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); + +#endif +} + FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9) { @@ -1222,10 +1314,270 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; -#else - /* Do nothing */ + + if (ModRegRm.Memory) + { + switch (ModRegRm.Register) + { + /* FILD */ + case 0: + { + SHORT Value; + FAST486_FPU_DATA_REG Temp; + + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, (PUSHORT)&Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromInteger(State, (LONGLONG)Value, &Temp); + Fast486FpuPush(State, &Temp); + + break; + } + + /* FIST */ + case 2: + /* FISTP */ + case 3: + { + LONGLONG Temp; + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) + { + /* Fail */ + State->FpuStatus.Ie = TRUE; + return; + } + + if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + { + /* Exception occurred */ + return; + } + + /* Check if it can fit in a signed 16-bit integer */ + if ((((ULONGLONG)Temp >> 15) + 1ULL) > 1ULL) + { + State->FpuStatus.Ie = TRUE; + return; + } + + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, (USHORT)((SHORT)Temp))) + { + /* Exception occurred */ + return; + } + + if (ModRegRm.Register == 3) + { + /* Pop the FPU stack too */ + Fast486FpuPop(State); + } + + break; + } + + /* FBLD */ + case 4: + { + FAST486_FPU_DATA_REG Value; + UCHAR Buffer[10]; + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + Buffer, + sizeof(Buffer))) + { + /* Exception occurred */ + return; + } + + if (!Fast486FpuFromPackedBcd(State, Buffer, &Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuPush(State, &Value); + break; + } + + /* FILD (64-bit int) */ + case 5: + { + LONGLONG Value; + FAST486_FPU_DATA_REG Temp; + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + &Value, + sizeof(LONGLONG))) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromInteger(State, (LONGLONG)Value, &Temp); + Fast486FpuPush(State, &Temp); + + break; + } + + /* FBSTP */ + case 6: + { + UCHAR Buffer[10]; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Fail */ + State->FpuStatus.Ie = TRUE; + return; + } + + if (!Fast486FpuToPackedBcd(State, &FPU_ST(0), Buffer)) + { + /* Exception occurred */ + return; + } + + if (!Fast486WriteMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + Buffer, + sizeof(Buffer))) + { + /* Exception occurred */ + return; + } + + Fast486FpuPop(State); + break; + } + + /* FISTP (64-bit int) */ + case 7: + { + LONGLONG Temp; + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) + { + /* Fail */ + State->FpuStatus.Ie = TRUE; + return; + } + + if (!Fast486FpuToInteger(State, &FPU_ST(0), &Temp)) + { + /* Exception occurred */ + return; + } + + if (!Fast486WriteMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + &Temp, + sizeof(LONGLONG))) + { + /* Exception occurred */ + return; + } + + /* Pop the FPU stack too */ + Fast486FpuPop(State); + + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + } + } + else + { + switch (ModRegRm.Register) + { + /* FFREEP */ + case 0: + { + FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_EMPTY); + Fast486FpuPop(State); + + break; + } + + /* FXCH */ + case 1: + { + FAST486_FPU_DATA_REG Temp; + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + break; + } + + /* Exchange */ + Temp = FPU_ST(0); + FPU_ST(0) = FPU_ST(ModRegRm.SecondRegister); + FPU_ST(ModRegRm.SecondRegister) = Temp; + + FPU_UPDATE_TAG(0); + FPU_UPDATE_TAG(ModRegRm.SecondRegister); + + break; + } + + /* FSTP */ + case 2: + case 3: + { + FPU_ST(ModRegRm.SecondRegister) = FPU_ST(0); + FPU_UPDATE_TAG(ModRegRm.SecondRegister); + Fast486FpuPop(State); + + break; + } + + /* FSTSW */ + case 4: + { + if (ModRegRm.SecondRegister != 0) + { + /* Invalid */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + + /* Store the status word in AX */ + State->GeneralRegs[FAST486_REG_EAX].LowWord = State->FpuStatus.Value; + + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + } + } + #endif } Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6594… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Fri Jan 2 18:29:30 2015 @@ -78,10 +78,11 @@ FPU_ROUND_TRUNCATE = 3 }; -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8DC); +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD8); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeD9); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDA); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDB); +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDC); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDD); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDE); FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF); Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Fri Jan 2 18:29:30 2015 @@ -254,11 +254,11 @@ Fast486OpcodeAad, /* 0xD5 */ Fast486OpcodeSalc, /* 0xD6 */ Fast486OpcodeXlat, /* 0xD7 */ - Fast486FpuOpcodeD8DC, /* 0xD8 - 0xDF */ + Fast486FpuOpcodeD8, /* 0xD8 - 0xDF */ Fast486FpuOpcodeD9, Fast486FpuOpcodeDA, Fast486FpuOpcodeDB, - Fast486FpuOpcodeD8DC, + Fast486FpuOpcodeDC, Fast486FpuOpcodeDD, Fast486FpuOpcodeDE, Fast486FpuOpcodeDF,

9 years, 8 months

[akhaldi] 65939: [CRYPT32] Remove redundant code_page pragma. Remove redundant cryptres.h inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 2 14:14:17 2015 New Revision: 65939 URL: http://svn.reactos.org/svn/reactos?rev=65939&view=rev Log: [CRYPT32] Remove redundant code_page pragma. Remove redundant cryptres.h inclusion. Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Sq.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc Modified: trunk/reactos/dll/win32/crypt32/crypt32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -40,6 +40,8 @@ #endif /* UTF-8 */ +#pragma code_page(65001) + #ifdef LANGUAGE_DE_DE #include "lang/crypt32_De.rc" #endif Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_De.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -20,8 +20,6 @@ */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) STRINGTABLE { Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Fr.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Hu.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -17,9 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* UTF-8 */ -#pragma code_page(65001) LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_It.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -17,9 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/*UTF-8*/ -#pragma code_page(65001) LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Lt.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -17,9 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* UTF-8 */ -#pragma code_page(65001) LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Nl.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#pragma code_page(65001) LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_No.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#pragma code_page(65001) LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Pt.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#pragma code_page(65001) LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Ro.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -18,9 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* UTF-8 */ -#pragma code_page(65001) LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Sq.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -18,8 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "cryptres.h" LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Sv.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -17,8 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#pragma code_page(65001) LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/lang/crypt32_Uk.rc [iso-8859-1] Fri Jan 2 14:14:17 2015 @@ -20,9 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* UTF-8 */ -#pragma code_page(65001) LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

9 years, 8 months

[bfreisen] 65938: [MSPAINT] partially apply patch by swyter (bugfixes only). See CORE-5644

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Fri Jan 2 13:58:25 2015 New Revision: 65938 URL: http://svn.reactos.org/svn/reactos?rev=65938&view=rev Log: [MSPAINT] partially apply patch by swyter (bugfixes only). See CORE-5644 Modified: trunk/reactos/base/applications/mspaint/drawing.c trunk/reactos/base/applications/mspaint/drawing.h trunk/reactos/base/applications/mspaint/mouse.c trunk/reactos/base/applications/mspaint/selection.c trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.c [iso-8859-1] Fri Jan 2 13:58:25 2015 @@ -67,11 +67,16 @@ } void -Poly(HDC hdc, POINT * lpPoints, int nCount, COLORREF fg, COLORREF bg, int thickness, int style, BOOL closed) -{ - LOGBRUSH logbrush; - HBRUSH oldBrush; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); +Poly(HDC hdc, POINT * lpPoints, int nCount, COLORREF fg, COLORREF bg, int thickness, int style, BOOL closed, BOOL inverted) +{ + LOGBRUSH logbrush; + HBRUSH oldBrush; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, fg)); + UINT oldRop = GetROP2(hdc); + + if (inverted) + SetROP2(hdc, R2_NOTXORPEN); + logbrush.lbStyle = (style == 0) ? BS_HOLLOW : BS_SOLID; logbrush.lbColor = (style == 2) ? fg : bg; logbrush.lbHatch = 0; @@ -82,6 +87,8 @@ Polyline(hdc, lpPoints, nCount); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); + + SetROP2(hdc, oldRop); } void @@ -223,6 +230,10 @@ HBRUSH oldBrush; LOGBRUSH logbrush; HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000)); + UINT oldRop = GetROP2(hdc); + + SetROP2(hdc, R2_NOTXORPEN); + logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = 0; logbrush.lbHatch = 0; @@ -230,23 +241,26 @@ Rectangle(hdc, x1, y1, x2, y2); DeleteObject(SelectObject(hdc, oldBrush)); DeleteObject(SelectObject(hdc, oldPen)); -} - -void -SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2) -{ - HBRUSH oldBrush; - LOGBRUSH logbrush; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, 0x00000000)); + + SetROP2(hdc, oldRop); +} + +void +SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, DWORD system_selection_color) +{ + HBRUSH oldBrush; + LOGBRUSH logbrush; + HPEN oldPen = SelectObject(hdc, CreatePen(PS_DOT, 1, system_selection_color)); + logbrush.lbStyle = BS_HOLLOW; logbrush.lbColor = 0; logbrush.lbHatch = 0; oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); - Rectangle(hdc, x1, y1, x2, y2); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); - oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, 0x00000000)); - oldBrush = SelectObject(hdc, CreateSolidBrush(0x00000000)); + Rectangle(hdc, x1, y1, x2, y2); /* SEL BOX FRAME */ + DeleteObject(SelectObject(hdc, oldBrush)); + DeleteObject(SelectObject(hdc, oldPen)); + oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 1, system_selection_color)); + oldBrush = SelectObject(hdc, CreateSolidBrush(system_selection_color)); Rectangle(hdc, x1 - 1, y1 - 1, x1 + 2, y1 + 2); Rectangle(hdc, x2 - 2, y1 - 1, x2 + 2, y1 + 2); Rectangle(hdc, x1 - 1, y2 - 2, x1 + 2, y2 + 1); Modified: trunk/reactos/base/applications/mspaint/drawing.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/drawing.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/drawing.h [iso-8859-1] Fri Jan 2 13:58:25 2015 @@ -14,7 +14,7 @@ void RRect(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, int thickness, int style); -void Poly(HDC hdc, POINT *lpPoints, int nCount, COLORREF fg, COLORREF bg, int thickness, int style, BOOL closed); +void Poly(HDC hdc, POINT *lpPoints, int nCount, COLORREF fg, COLORREF bg, int thickness, int style, BOOL closed, BOOL inverted); void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, COLORREF color, int thickness); @@ -30,6 +30,6 @@ void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); -void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); +void SelectionFrame(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, DWORD system_selection_color); void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); Modified: trunk/reactos/base/applications/mspaint/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/mouse.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/mouse.c [iso-8859-1] Fri Jan 2 13:58:25 2015 @@ -118,7 +118,7 @@ pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE); + Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE, FALSE); if (pointSP == 0) { newReversible(); @@ -142,7 +142,7 @@ ptStack[ptSP].x = max(0, min(x, imgXRes)); ptStack[ptSP].y = max(0, min(y, imgYRes)); resetToU1(); - Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); + Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); /* draw the freehand selection inverted/xored */ break; case TOOL_RECTSEL: case TOOL_TEXT: @@ -208,7 +208,7 @@ roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, &pointStack[pointSP].x, &pointStack[pointSP].y); if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE); + Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE, FALSE); break; case TOOL_ELLIPSE: resetToU1(); @@ -267,13 +267,13 @@ ptStackCopy[i].x = ptStack[i].x - rectSel_src.left; ptStackCopy[i].y = ptStack[i].y - rectSel_src.top; } - Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE); + Poly(hSelDC, ptStackCopy, ptSP + 1, 0x00ffffff, 0x00ffffff, 1, 2, TRUE, FALSE); HeapFree(GetProcessHeap(), 0, ptStackCopy); SelectObject(hSelDC, hSelBm = CreateDIBWithProperties(RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src))); resetToU1(); MaskBlt(hSelDC, 0, 0, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hDrawingDC, rectSel_src.left, rectSel_src.top, hSelMask, 0, 0, MAKEROP4(SRCCOPY, WHITENESS)); - Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE); + Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE, FALSE); newReversible(); MaskBlt(hDrawingDC, rectSel_src.left, rectSel_src.top, RECT_WIDTH(rectSel_src), RECT_HEIGHT(rectSel_src), hSelDC, 0, @@ -362,12 +362,12 @@ if ((pointStack[0].x - x) * (pointStack[0].x - x) + (pointStack[0].y - y) * (pointStack[0].y - y) <= lineWidth * lineWidth + 1) { - Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, TRUE); + Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, TRUE, FALSE); pointSP = 0; } else { - Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, FALSE); + Poly(hdc, pointStack, pointSP, fg, bg, lineWidth, shapeStyle, FALSE, FALSE); } } if (pointSP == 255) @@ -438,7 +438,7 @@ pointStack[pointSP].x = x; pointStack[pointSP].y = y; if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE); + Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE, FALSE); if (pointSP == 0) { newReversible(); @@ -503,7 +503,7 @@ roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, &pointStack[pointSP].x, &pointStack[pointSP].y); if (pointSP + 1 >= 2) - Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE); + Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE, FALSE); break; case TOOL_ELLIPSE: resetToU1(); @@ -565,12 +565,12 @@ if ((pointStack[0].x - x) * (pointStack[0].x - x) + (pointStack[0].y - y) * (pointStack[0].y - y) <= lineWidth * lineWidth + 1) { - Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, TRUE); + Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, TRUE, FALSE); pointSP = 0; } else { - Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, FALSE); + Poly(hdc, pointStack, pointSP, bg, fg, lineWidth, shapeStyle, FALSE, FALSE); } } if (pointSP == 255) Modified: trunk/reactos/base/applications/mspaint/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/selection.c [iso-8859-1] Fri Jan 2 13:58:25 2015 @@ -37,6 +37,7 @@ POINTS pos; POINTS frac; POINT delta; +DWORD system_selection_color; void RegisterWclSelection() @@ -95,8 +96,8 @@ if (IsWindowVisible(hSelection)) { SendMessage(hSelection, WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); - SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); + SendMessage(hSelection, WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); + SendMessage(hSelection, WM_LBUTTONUP, 0, MAKELPARAM(0, 0)); } } @@ -143,12 +144,22 @@ HDC hDC = GetDC(hwnd); DefWindowProc(hwnd, message, wParam, lParam); SelectionFrame(hDC, 1, 1, RECT_WIDTH(rectSel_dest) * zoom / 1000 + 5, - RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 5); + RECT_HEIGHT(rectSel_dest) * zoom / 1000 + 5, + system_selection_color); ReleaseDC(hwnd, hDC); } break; } + case WM_CREATE: + case WM_SYSCOLORCHANGE: + { + /* update the system selection color */ + system_selection_color = GetSysColor(COLOR_HIGHLIGHT); + SendMessage(hwnd, WM_PAINT, 0, MAKELPARAM(0, 0)); + break; + } case WM_LBUTTONDOWN: + { pos.x = GET_X_LPARAM(lParam); pos.y = GET_Y_LPARAM(lParam); delta.x = 0; @@ -159,6 +170,7 @@ moving = TRUE; InvalidateRect(hScrlClient, NULL, TRUE); break; + } case WM_MOUSEMOVE: if (moving) { Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri Jan 2 13:58:25 2015 @@ -806,7 +806,7 @@ if (activeTool == TOOL_FREESEL) { newReversible(); - Poly(hDrawingDC, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); + Poly(hDrawingDC, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE, TRUE); } break; }

9 years, 8 months

[akhaldi] 65936: [MSGINA] Remember the previous choice in the shutdown dialog. Brought to you by Ricardo Hanke. CORE-8992

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jan 2 11:20:35 2015 New Revision: 65936 URL: http://svn.reactos.org/svn/reactos?rev=65936&view=rev Log: [MSGINA] Remember the previous choice in the shutdown dialog. Brought to you by Ricardo Hanke. CORE-8992 Modified: trunk/reactos/dll/win32/msgina/shutdown.c Modified: trunk/reactos/dll/win32/msgina/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/shutdown.… ============================================================================== --- trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/shutdown.c [iso-8859-1] Fri Jan 2 11:20:35 2015 @@ -10,10 +10,95 @@ #include <powrprof.h> #include <strsafe.h> #include <wingdi.h> +#include <winreg.h> #include <stdlib.h> int g_shutdownCode = 0; BOOL g_logoffHideState = FALSE; + +int LoadShutdownSelState(void) +{ + HKEY hKey; + DWORD dwValue, dwTemp, dwSize; + + + /* default to shutdown */ + dwValue = 1; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + { + return dwValue; + } + + dwSize = sizeof(dwTemp); + if (RegQueryValueExW(hKey, L"Shutdown Setting", NULL, NULL, (LPBYTE)&dwTemp, &dwSize) == ERROR_SUCCESS) + { + switch(dwTemp) + { + case 0x01: /* Log off */ + dwValue = 0; + break; + + case 0x02: /* Shut down */ + dwValue = 1; + break; + + case 0x04: /* Reboot */ + dwValue = 2; + break; + + case 0x10: /* Sleep */ + dwValue = 3; + break; + + case 0x40: /* Hibernate */ + dwValue = 4; + break; + } + } + + RegCloseKey(hKey); + + return dwValue; +} + +VOID SaveShutdownSelState(int ShutdownCode) +{ + HKEY hKey; + DWORD dwValue = 0; + + + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) + { + return; + } + + switch(ShutdownCode) + { + case 0: /* Log off */ + dwValue = 0x01; + break; + + case 1: /* Shut down */ + dwValue = 0x02; + break; + + case 2: /* Reboot */ + dwValue = 0x04; + break; + + case 3: /* Sleep */ + dwValue = 0x10; + break; + + case 4: /* Hibernate */ + dwValue = 0x40; + break; + } + + RegSetValueExW(hKey, L"Shutdown Setting", 0, REG_DWORD, (const BYTE*)&dwValue, sizeof(dwValue)); + RegCloseKey(hKey); +} VOID UpdateShutdownShellDesc(HWND hwnd) { @@ -109,6 +194,7 @@ case WM_INITDIALOG: { int defSelect = 0; + int tmpSelect, lastState; WCHAR userBuffer[256]; DWORD userBufferSize = _countof(userBuffer); WCHAR tmpBuffer[256]; @@ -125,35 +211,57 @@ /* Clears the content before it's used */ SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_RESETCONTENT, 0, 0); + lastState = LoadShutdownSelState(); + if(!g_logoffHideState) { /* Log off */ LoadStringW(hDllInstance, IDS_SHUTDOWN_LOGOFF, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); GetUserNameW(userBuffer, &userBufferSize); StringCchPrintfW(tmpBuffer2, 512, tmpBuffer, userBuffer); - SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer2); + tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer2); + if (lastState == 0) + { + defSelect = tmpSelect; + } } /* Shut down - DEFAULT */ LoadStringW(hDllInstance, IDS_SHUTDOWN_SHUTDOWN, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - defSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + if (lastState == 1) + { + defSelect = tmpSelect; + } /* Restart */ LoadStringW(hDllInstance, IDS_SHUTDOWN_RESTART, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + if (lastState == 2) + { + defSelect = tmpSelect; + } /* Sleep */ if (IsPwrSuspendAllowed()) { LoadStringW(hDllInstance, IDS_SHUTDOWN_SLEEP, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + if (lastState == 3) + { + defSelect = tmpSelect; + } } /* Hibernate */ if (IsPwrHibernateAllowed()) { LoadStringW(hDllInstance, IDS_SHUTDOWN_HIBERNATE, tmpBuffer, sizeof(tmpBuffer)/sizeof(WCHAR)); - SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + tmpSelect = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_ADDSTRING, 0, (LPARAM)tmpBuffer); + if (lastState == 4) + { + defSelect = tmpSelect; + } } /* Sets the default shut down selection */ @@ -192,6 +300,7 @@ { case IDOK: g_shutdownCode = SendDlgItemMessageW(hwnd, IDC_SHUTDOWN_LIST, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + SaveShutdownSelState(g_shutdownCode); EndDialog(hwnd, IDOK); break; case IDCANCEL:

9 years, 8 months

[aandrejevic] 65935: [FAST486] Fix several serious bugs in Fast486FpuToInteger. Halfplement opcode 0xDD (everything except FRSTOR and FSAVE). Cleanup the code a little bit.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Jan 1 22:51:21 2015 New Revision: 65935 URL: http://svn.reactos.org/svn/reactos?rev=65935&view=rev Log: [FAST486] Fix several serious bugs in Fast486FpuToInteger. Halfplement opcode 0xDD (everything except FRSTOR and FSAVE). Cleanup the code a little bit. Modified: trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/fpu.h Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6593… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Thu Jan 1 22:51:21 2015 @@ -66,7 +66,7 @@ return LowProduct; } -static VOID +static inline VOID FASTCALL Fast486FpuFromInteger(PFAST486_STATE State, LONGLONG Value, PFAST486_FPU_DATA_REG Result) @@ -89,7 +89,7 @@ Result->Exponent = FPU_REAL10_BIAS + 63 - ZeroCount; } -static BOOLEAN +static inline BOOLEAN FASTCALL Fast486FpuToInteger(PFAST486_STATE State, PFAST486_FPU_DATA_REG Value, PLONGLONG Result) @@ -100,7 +100,7 @@ if (FPU_IS_ZERO(Value)) { - Result = 0LL; + *Result = 0LL; return TRUE; } @@ -127,7 +127,7 @@ /* Check if the highest bit of the remainder is set */ if (Remainder & (1 << (Bits - 1))) { - *Result++; + (*Result)++; /* Check if all the other bits are clear */ if (!(Remainder & ((1 << (Bits - 1)) - 1))) @@ -142,13 +142,13 @@ case FPU_ROUND_DOWN: { - if ((Remainder != 0ULL) && Value->Sign) *Result++; + if ((Remainder != 0ULL) && Value->Sign) (*Result)++; break; } case FPU_ROUND_UP: { - if ((Remainder != 0ULL) && !Value->Sign) *Result++; + if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; break; } @@ -162,7 +162,7 @@ return TRUE; } -static VOID +static inline VOID FASTCALL Fast486FpuFromSingleReal(PFAST486_STATE State, ULONG Value, PFAST486_FPU_DATA_REG Result) @@ -183,7 +183,7 @@ } } -static VOID +static inline VOID FASTCALL Fast486FpuFromDoubleReal(PFAST486_STATE State, ULONGLONG Value, PFAST486_FPU_DATA_REG Result) @@ -204,7 +204,94 @@ } } -static VOID +static inline BOOLEAN FASTCALL +Fast486FpuToDoubleReal(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Value, + PULONGLONG Result) +{ + ULONGLONG Remainder; + SHORT UnbiasedExp = (SHORT)Value->Exponent - FPU_REAL10_BIAS; + + if (FPU_IS_ZERO(Value)) + { + *Result = 0LL; + return TRUE; + } + + /* Calculate the mantissa */ + *Result = (Value->Mantissa >> 11) & ((1ULL << 52) - 1); + + if (FPU_IS_NAN(Value)) + { + *Result |= 0x3FF0000000000000ULL; + goto SetSign; + } + + /* Check for underflow */ + if (!FPU_IS_NORMALIZED(Value) || (UnbiasedExp < -1023)) + { + State->FpuStatus.Ue = TRUE; + return FALSE; + } + + /* Check for overflow */ + if (UnbiasedExp > 1023) + { + State->FpuStatus.Oe = TRUE; + return FALSE; + } + + /* Calculate the remainder */ + Remainder = Value->Mantissa & ((1 << 11) - 1); + + switch (State->FpuControl.Rc) + { + case FPU_ROUND_NEAREST: + { + /* Check if the highest bit of the remainder is set */ + if (Remainder & (1 << 10)) + { + (*Result)++; + + /* Check if all the other bits are clear */ + if (!(Remainder & ((1 << 10) - 1))) + { + /* Round to even */ + *Result &= ~1; + } + } + + break; + } + + case FPU_ROUND_DOWN: + { + if ((Remainder != 0ULL) && Value->Sign) (*Result)++; + break; + } + + case FPU_ROUND_UP: + { + if ((Remainder != 0ULL) && !Value->Sign) (*Result)++; + break; + } + + default: + { + /* Leave it truncated */ + } + } + + /* Store the biased exponent */ + *Result |= (ULONGLONG)(UnbiasedExp + FPU_REAL8_BIAS) << 52; + +SetSign: + + if (Value->Sign) *Result |= 1ULL << 63; + return TRUE; +} + +static inline VOID FASTCALL Fast486FpuAdd(PFAST486_STATE State, PFAST486_FPU_DATA_REG FirstOperand, PFAST486_FPU_DATA_REG SecondOperand, @@ -284,7 +371,7 @@ *Result = TempResult; } -static VOID +static inline VOID FASTCALL Fast486FpuSubtract(PFAST486_STATE State, PFAST486_FPU_DATA_REG FirstOperand, PFAST486_FPU_DATA_REG SecondOperand, @@ -299,7 +386,7 @@ Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); } -static VOID +static inline VOID FASTCALL Fast486FpuCompare(PFAST486_STATE State, PFAST486_FPU_DATA_REG FirstOperand, PFAST486_FPU_DATA_REG SecondOperand) @@ -352,7 +439,7 @@ } } -static VOID +static inline VOID FASTCALL Fast486FpuMultiply(PFAST486_STATE State, PFAST486_FPU_DATA_REG FirstOperand, PFAST486_FPU_DATA_REG SecondOperand, @@ -378,7 +465,7 @@ *Result = TempResult; } -static VOID +static inline VOID FASTCALL Fast486FpuDivide(PFAST486_STATE State, PFAST486_FPU_DATA_REG FirstOperand, PFAST486_FPU_DATA_REG SecondOperand, @@ -399,6 +486,72 @@ // TODO: NOT IMPLEMENTED UNREFERENCED_PARAMETER(TempResult); UNIMPLEMENTED; +} + +static inline VOID FASTCALL +Fast486FpuArithmeticOperation(PFAST486_STATE State, + INT Operation, + PFAST486_FPU_DATA_REG SourceOperand, + PFAST486_FPU_DATA_REG DestOperand) +{ + ASSERT(!(Operation & ~7)); + + /* Check the operation */ + switch (Operation) + { + /* FADD */ + case 0: + { + Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FMUL */ + case 1: + { + Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FCOM */ + case 2: + /* FCOMP */ + case 3: + { + Fast486FpuCompare(State, DestOperand, SourceOperand); + if (Operation == 3) Fast486FpuPop(State); + + break; + } + + /* FSUB */ + case 4: + { + Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FSUBR */ + case 5: + { + Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); + break; + } + + /* FDIV */ + case 6: + { + Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FDIVR */ + case 7: + { + Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + break; + } + } } #endif @@ -497,62 +650,8 @@ } } - /* Check the operation */ - switch (ModRegRm.Register) - { - /* FADD */ - case 0: - { - Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FMUL */ - case 1: - { - Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FCOM */ - case 2: - /* FCOMP */ - case 3: - { - Fast486FpuCompare(State, DestOperand, SourceOperand); - if (ModRegRm.Register == 3) Fast486FpuPop(State); - - break; - } - - /* FSUB */ - case 4: - { - Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FSUBR */ - case 5: - { - Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); - break; - } - - /* FDIV */ - case 6: - { - Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FDIVR */ - case 7: - { - Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); - break; - } - } + /* Perform the requested operation */ + Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); #endif } @@ -644,62 +743,8 @@ return; } - /* Check the operation */ - switch (ModRegRm.Register) - { - /* FIADD */ - case 0: - { - Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FIMUL */ - case 1: - { - Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FICOM */ - case 2: - /* FICOMP */ - case 3: - { - Fast486FpuCompare(State, DestOperand, SourceOperand); - if (ModRegRm.Register == 3) Fast486FpuPop(State); - - break; - } - - /* FISUB */ - case 4: - { - Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FISUBR */ - case 5: - { - Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); - break; - } - - /* FIDIV */ - case 6: - { - Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FIDIVR */ - case 7: - { - Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); - break; - } - } + /* Perform the requested operation */ + Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); #endif } @@ -815,7 +860,7 @@ { UCHAR Buffer[10]; - if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(0) == FPU_TAG_SPECIAL)) + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { /* Fail */ State->FpuStatus.Ie = TRUE; @@ -915,10 +960,174 @@ FPU_CHECK(); #ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; -#else - /* Do nothing */ + + if (ModRegRm.Memory) + { + switch (ModRegRm.Register) + { + /* FLD */ + case 0: + { + ULONGLONG Value; + FAST486_FPU_DATA_REG MemoryData; + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + &Value, + sizeof(ULONGLONG))) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromDoubleReal(State, Value, &MemoryData); + Fast486FpuPush(State, &MemoryData); + + break; + } + + /* FST */ + case 2: + /* FSTP */ + case 3: + { + ULONGLONG Value; + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Fail */ + State->FpuStatus.Ie = TRUE; + return; + } + + if (!Fast486FpuToDoubleReal(State, &FPU_ST(0), &Value)) + { + /* Exception occurred */ + return; + } + + if (!Fast486WriteMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + &Value, + sizeof(ULONGLONG))) + { + /* Exception occurred */ + return; + } + + if (ModRegRm.Register == 3) Fast486FpuPop(State); + break; + } + + /* FRSTOR */ + case 4: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSAVE */ + case 6: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + /* FSTSW */ + case 7: + { + Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, State->FpuStatus.Value); + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + } + } + else + { + switch (ModRegRm.Register) + { + /* FFREE */ + case 0: + { + FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_EMPTY); + break; + } + + /* FXCH */ + case 1: + { + FAST486_FPU_DATA_REG Temp; + + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + State->FpuStatus.Ie = TRUE; + break; + } + + /* Exchange */ + Temp = FPU_ST(0); + FPU_ST(0) = FPU_ST(ModRegRm.SecondRegister); + FPU_ST(ModRegRm.SecondRegister) = Temp; + + FPU_UPDATE_TAG(0); + FPU_UPDATE_TAG(ModRegRm.SecondRegister); + + break; + } + + /* FST */ + case 2: + /* FSTP */ + case 3: + { + FPU_ST(ModRegRm.SecondRegister) = FPU_ST(0); + FPU_UPDATE_TAG(ModRegRm.SecondRegister); + + if (ModRegRm.Register == 3) Fast486FpuPop(State); + break; + } + + /* FUCOM */ + case 4: + /* FUCOMP */ + case 5: + { + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) + || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) + { + State->FpuStatus.Ie = TRUE; + return; + } + + Fast486FpuCompare(State, &FPU_ST(0), &FPU_ST(ModRegRm.SecondRegister)); + if (ModRegRm.Register == 5) Fast486FpuPop(State); + + break; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + } + } + #endif } @@ -991,63 +1200,8 @@ PopStack = TRUE; } - /* Check the operation */ - switch (ModRegRm.Register) - { - /* FIADD / FADDP */ - case 0: - { - Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FIMUL / FMULP */ - case 1: - { - Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FICOM / FCOMP */ - case 2: - /* FICOMP / FCOMPP */ - case 3: - { - Fast486FpuCompare(State, DestOperand, SourceOperand); - if (ModRegRm.Register == 3) Fast486FpuPop(State); - - break; - } - - /* FISUB / FSUBRP */ - case 4: - { - Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FISUBR / FSUBP */ - case 5: - { - Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); - break; - } - - /* FIDIV / FDIVRP */ - case 6: - { - Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); - break; - } - - /* FIDIVR / FDIVP */ - case 7: - { - Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); - break; - } - } - + /* Perform the requested operation */ + Fast486FpuArithmeticOperation(State, ModRegRm.Register, SourceOperand, DestOperand); if (PopStack) Fast486FpuPop(State); #endif Modified: trunk/reactos/lib/fast486/fpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.h?rev=6593… ============================================================================== --- trunk/reactos/lib/fast486/fpu.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.h [iso-8859-1] Thu Jan 1 22:51:21 2015 @@ -34,11 +34,13 @@ return; \ } #define FPU_ST(i) State->FpuRegisters[(State->FpuStatus.Top + (i)) % FAST486_NUM_FPU_REGS] -#define FPU_GET_TAG(i) ((State->FpuTag >> ((i) * 2)) & 3) + +#define FPU_GET_TAG(i) ((State->FpuTag >> ((i) * 2)) & 3) #define FPU_SET_TAG(i, t) { \ State->FpuTag &= ~((1 << ((i) * 2)) | (1 << (((i) * 2) + 1))); \ State->FpuTag |= ((t) & 3) << ((i) * 2); \ } +#define FPU_UPDATE_TAG(i) FPU_SET_TAG((i), Fast486GetValueTag(&FPU_ST(i))) #define FPU_REAL4_BIAS 0x7F #define FPU_REAL8_BIAS 0x3FF

9 years, 8 months

[aandrejevic] 65934: [FAST486] Implement opcode 0xDE (New instructions: FADDP, FMULP, FCOMPP, FSUBRP, FSUBP, FDIVRP and FDIVP). Fix a bug in the 0xD8/0xDC opcode handler.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Jan 1 19:20:44 2015 New Revision: 65934 URL: http://svn.reactos.org/svn/reactos?rev=65934&view=rev Log: [FAST486] Implement opcode 0xDE (New instructions: FADDP, FMULP, FCOMPP, FSUBRP, FSUBP, FDIVRP and FDIVP). Fix a bug in the 0xD8/0xDC opcode handler. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6593… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Thu Jan 1 19:20:44 2015 @@ -423,6 +423,13 @@ #ifndef FAST486_NO_FPU + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return; + } + if (ModRegRm.Memory) { /* Load the source operand from memory */ @@ -459,28 +466,35 @@ } SourceOperand = &MemoryData; + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); } else { - /* Load the source operand from an FPU register */ - SourceOperand = &FPU_ST(ModRegRm.SecondRegister); - if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { /* Invalid operation */ State->FpuStatus.Ie = TRUE; return; } - } - - /* The destination operand is always ST0 */ - DestOperand = &FPU_ST(0); - - if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) - { - /* Invalid operation */ - State->FpuStatus.Ie = TRUE; - return; + + if (Opcode == 0xDC) + { + /* The source operand is ST0 */ + SourceOperand = &FPU_ST(0); + + /* Load the destination operand from an FPU register */ + DestOperand = &FPU_ST(ModRegRm.SecondRegister); + } + else + { + /* Load the source operand from an FPU register */ + SourceOperand = &FPU_ST(ModRegRm.SecondRegister); + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + } } /* Check the operation */ @@ -912,6 +926,137 @@ { FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + PFAST486_FPU_DATA_REG SourceOperand, DestOperand; + BOOLEAN PopStack = FALSE; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return; + } + + FPU_CHECK(); + +#ifndef FAST486_NO_FPU + + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return; + } + + if (ModRegRm.Memory) + { + SHORT Value; + FAST486_FPU_DATA_REG MemoryData; + + /* Load the source operand from memory */ + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, NULL, (PUSHORT)&Value)) + { + /* Exception occurred */ + return; + } + + Fast486FpuFromInteger(State, (LONGLONG)Value, &MemoryData); + SourceOperand = &MemoryData; + + /* The destination operand is ST0 */ + DestOperand = &FPU_ST(0); + } + else + { + /* FCOMPP check */ + if ((ModRegRm.Register == 3) && (ModRegRm.SecondRegister != 1)) + { + /* Invalid */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return; + } + + /* The source operand is ST0 */ + SourceOperand = &FPU_ST(0); + + /* Load the destination operand from a register */ + DestOperand = &FPU_ST(ModRegRm.SecondRegister); + + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) + { + /* Invalid operation */ + State->FpuStatus.Ie = TRUE; + return; + } + + PopStack = TRUE; + } + + /* Check the operation */ + switch (ModRegRm.Register) + { + /* FIADD / FADDP */ + case 0: + { + Fast486FpuAdd(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FIMUL / FMULP */ + case 1: + { + Fast486FpuMultiply(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FICOM / FCOMP */ + case 2: + /* FICOMP / FCOMPP */ + case 3: + { + Fast486FpuCompare(State, DestOperand, SourceOperand); + if (ModRegRm.Register == 3) Fast486FpuPop(State); + + break; + } + + /* FISUB / FSUBRP */ + case 4: + { + Fast486FpuSubtract(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FISUBR / FSUBP */ + case 5: + { + Fast486FpuSubtract(State, SourceOperand, DestOperand, DestOperand); + break; + } + + /* FIDIV / FDIVRP */ + case 6: + { + Fast486FpuDivide(State, DestOperand, SourceOperand, DestOperand); + break; + } + + /* FIDIVR / FDIVP */ + case 7: + { + Fast486FpuDivide(State, SourceOperand, DestOperand, DestOperand); + break; + } + } + + if (PopStack) Fast486FpuPop(State); + +#endif +} + +FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF) +{ + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -930,26 +1075,4 @@ #endif } -FAST486_OPCODE_HANDLER(Fast486FpuOpcodeDF) -{ - FAST486_MOD_REG_RM ModRegRm; - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - - /* Get the operands */ - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return; - } - - FPU_CHECK(); - -#ifndef FAST486_NO_FPU - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; -#else - /* Do nothing */ -#endif -} - /* EOF */

9 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015