Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[aandrejevic] 68127: [NTOS|MM] Addendum to 68126. The loader should return STATUS_INVALID_IMAGE_PROTECT if e_lfanew is 0, or if the DOS stub appears too large due to a bad e_lfanew. (Note: All plai...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Jun 14 04:07:11 2015 New Revision: 68127 URL: http://svn.reactos.org/svn/reactos?rev=68127&view=rev Log: [NTOS|MM] Addendum to 68126. The loader should return STATUS_INVALID_IMAGE_PROTECT if e_lfanew is 0, or if the DOS stub appears too large due to a bad e_lfanew. (Note: All plain MZ executables have an invalid e_lfanew) Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Jun 14 04:07:11 2015 @@ -241,12 +241,12 @@ if(pidhDosHeader->e_magic != IMAGE_DOS_SIGNATURE) DIE(("No MZ signature found, e_magic is %hX\n", pidhDosHeader->e_magic)); + /* NT HEADER */ + nStatus = STATUS_INVALID_IMAGE_PROTECT; + /* not a Windows executable */ if(pidhDosHeader->e_lfanew <= 0) DIE(("Not a Windows executable, e_lfanew is %d\n", pidhDosHeader->e_lfanew)); - - /* NT HEADER */ - nStatus = STATUS_INVALID_IMAGE_FORMAT; if(!Intsafe_AddULong32(&cbFileHeaderOffsetSize, pidhDosHeader->e_lfanew, RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader))) DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew)); @@ -336,10 +336,10 @@ if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE) DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature)); - nStatus = STATUS_INVALID_IMAGE_FORMAT; - if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, pidhDosHeader->e_lfanew, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader))) DIE(("The DOS stub is too large, e_lfanew is %X\n", pidhDosHeader->e_lfanew)); + + nStatus = STATUS_INVALID_IMAGE_FORMAT; if(!Intsafe_AddULong32(&cbOptHeaderOffsetSize, cbOptHeaderOffsetSize, pinhNtHeader->FileHeader.SizeOfOptionalHeader)) DIE(("The NT header is too large, SizeOfOptionalHeader is %X\n", pinhNtHeader->FileHeader.SizeOfOptionalHeader));

9 years, 4 months

[aandrejevic] 68126: [NTOS|MM] Return STATUS_INVALID_IMAGE_PROTECT if the NT header can't be read from the file.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Jun 14 01:37:56 2015 New Revision: 68126 URL: http://svn.reactos.org/svn/reactos?rev=68126&view=rev Log: [NTOS|MM] Return STATUS_INVALID_IMAGE_PROTECT if the NT header can't be read from the file. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Jun 14 01:37:56 2015 @@ -286,7 +286,7 @@ NTSTATUS ReturnedStatus = nStatus; /* If it attempted to read past the end of the file, it means e_lfanew is invalid */ - if (ReturnedStatus == STATUS_END_OF_FILE) nStatus = STATUS_ROS_EXEFMT_UNKNOWN_FORMAT; + if (ReturnedStatus == STATUS_END_OF_FILE) nStatus = STATUS_INVALID_IMAGE_PROTECT; DIE(("ReadFile failed, status %08X\n", ReturnedStatus)); }

9 years, 4 months

[aandrejevic] 68125: [FAST486] FPU exceptions are delayed until the next non-control FPU instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Jun 13 23:12:55 2015 New Revision: 68125 URL: http://svn.reactos.org/svn/reactos?rev=68125&view=rev Log: [FAST486] FPU exceptions are delayed until the next non-control FPU instruction. Modified: trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Jun 13 23:12:55 2015 @@ -1604,17 +1604,26 @@ FORCEINLINE VOID FASTCALL -Fast486FpuException(PFAST486_STATE State) -{ - if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_NE) - { - /* Call the #MF handler */ - Fast486Exception(State, FAST486_EXCEPTION_MF); - } - else - { - /* Use the external interrupt */ - State->FpuCallback(State); +Fast486FpuExceptionCheck(PFAST486_STATE State) +{ + /* Check if an unmasked exception occurred */ + if ((State->FpuStatus.Ie && !State->FpuControl.Im) + || (State->FpuStatus.De && !State->FpuControl.Dm) + || (State->FpuStatus.Ze && !State->FpuControl.Zm) + || (State->FpuStatus.Oe && !State->FpuControl.Om) + || (State->FpuStatus.Ue && !State->FpuControl.Um) + || (State->FpuStatus.Pe && !State->FpuControl.Pm)) + { + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_NE) + { + /* Call the #MF handler */ + Fast486Exception(State, FAST486_EXCEPTION_MF); + } + else + { + /* Use the external interrupt */ + State->FpuCallback(State); + } } } @@ -1654,7 +1663,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -1695,7 +1703,6 @@ /* Set the C1 condition code bit (stack overflow) */ State->FpuStatus.Code1 = TRUE; - if (!State->FpuControl.Im) Fast486FpuException(State); return FALSE; } } @@ -1720,7 +1727,6 @@ /* Clear the C1 condition code bit (stack underflow) */ State->FpuStatus.Code1 = FALSE; - if (!State->FpuControl.Im) Fast486FpuException(State); return FALSE; } } Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6812… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jun 13 23:12:55 2015 @@ -490,7 +490,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -589,7 +588,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -608,7 +606,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -688,7 +685,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -707,7 +703,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -803,7 +798,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); return FALSE; } } @@ -897,7 +891,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -1049,7 +1042,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); return FALSE; } } @@ -1072,7 +1064,6 @@ if (!State->FpuControl.Um) { - Fast486FpuException(State); return FALSE; } @@ -1090,7 +1081,6 @@ if (!State->FpuControl.Om) { - Fast486FpuException(State); return FALSE; } @@ -1139,7 +1129,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -1159,7 +1148,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -1299,7 +1287,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -1315,7 +1302,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); return FALSE; } @@ -1590,7 +1576,6 @@ } else { - Fast486FpuException(State); return FALSE; } } @@ -1842,6 +1827,7 @@ #ifndef FAST486_NO_FPU + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) @@ -1858,7 +1844,6 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else Fast486FpuException(State); return; } @@ -1895,7 +1880,6 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else Fast486FpuException(State); return; } @@ -1940,6 +1924,7 @@ ULONG Value; FAST486_FPU_DATA_REG MemoryData; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); FPU_SAVE_LAST_OPERAND(); @@ -1962,6 +1947,7 @@ { ULONG Value = FPU_REAL4_INDEFINITE; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); FPU_SAVE_LAST_OPERAND(); @@ -1972,7 +1958,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -2050,6 +2035,9 @@ case 0x06: case 0x07: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { /* Raise the invalid operation exception */ @@ -2057,7 +2045,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -2078,12 +2065,13 @@ { FAST486_FPU_DATA_REG Temp; + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2115,6 +2103,9 @@ case 0x1E: case 0x1F: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + FPU_ST(ModRegRm.SecondRegister) = FPU_ST(0); FPU_UPDATE_TAG(ModRegRm.SecondRegister); @@ -2125,11 +2116,12 @@ /* FCHS */ case 0x20: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2142,11 +2134,12 @@ /* FABS */ case 0x21: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2159,6 +2152,9 @@ /* FTST */ case 0x24: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + Fast486FpuCompare(State, &FPU_ST(0), &FpuZero); break; } @@ -2166,6 +2162,9 @@ /* FXAM */ case 0x25: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + /* The sign bit goes in C1, even if the register's empty */ State->FpuStatus.Code1 = FPU_ST(0).Sign; @@ -2241,6 +2240,9 @@ &FpuZero }; + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + Fast486FpuPush(State, Constants[ModRegRm.SecondRegister]); break; } @@ -2248,13 +2250,12 @@ /* F2XM1 */ case 0x30: { + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2264,7 +2265,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); break; } } @@ -2280,11 +2280,12 @@ { FAST486_FPU_DATA_REG Logarithm; + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2313,6 +2314,9 @@ FAST486_FPU_DATA_REG Sine; FAST486_FPU_DATA_REG Cosine; ULONGLONG Quadrant; + + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); /* Compute the sine */ if (!Fast486FpuCalculateSine(State, &FPU_ST(0), &Sine)) break; @@ -2351,6 +2355,9 @@ /* FPATAN */ case 0x33: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (!Fast486FpuCalculateArcTangent(State, &FPU_ST(1), &FPU_ST(0), @@ -2370,12 +2377,13 @@ { FAST486_FPU_DATA_REG Value = FPU_ST(0); + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_IS_INDEFINITE(&Value)) { State->FpuStatus.Ie = TRUE; if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) State->FpuStatus.Sf = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2411,11 +2419,12 @@ /* FPREM1 */ case 0x35: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2442,11 +2451,12 @@ /* FPREM */ case 0x38: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2461,11 +2471,12 @@ { FAST486_FPU_DATA_REG Value, Logarithm; + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2497,6 +2508,9 @@ /* FSQRT */ case 0x3A: { + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + Fast486FpuCalculateSquareRoot(State, &FPU_ST(0), &FPU_ST(0)); FPU_UPDATE_TAG(0); @@ -2507,13 +2521,13 @@ case 0x3B: { FAST486_FPU_DATA_REG Number = FPU_ST(0); + + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2523,7 +2537,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); break; } } @@ -2544,11 +2557,12 @@ { LONGLONG Result = 0LL; + Fast486FpuExceptionCheck(State); + FPU_SAVE_LAST_INST(); + if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2558,7 +2572,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); break; } } @@ -2571,8 +2584,6 @@ Fast486FpuFromInteger(State, Result, &FPU_ST(0)); State->FpuStatus.Pe = TRUE; - if (!State->FpuControl.Pm) Fast486FpuException(State); - break; } @@ -2583,13 +2594,12 @@ LONGLONG UnbiasedExp = (LONGLONG)((SHORT)FPU_ST(0).Exponent) - FPU_REAL10_BIAS; INT OldRoundingMode = State->FpuControl.Rc; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY || FPU_GET_TAG(1) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2599,7 +2609,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); break; } } @@ -2629,10 +2638,6 @@ /* Make the result zero */ FPU_ST(0) = FpuZero; FPU_UPDATE_TAG(0); - } - else - { - Fast486FpuException(State); } break; @@ -2651,10 +2656,6 @@ FPU_ST(0).Exponent = FPU_MAX_EXPONENT + 1; FPU_UPDATE_TAG(0); } - else - { - Fast486FpuException(State); - } break; } @@ -2668,13 +2669,12 @@ /* FSIN */ case 0x3E: { + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2684,7 +2684,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); break; } } @@ -2698,13 +2697,12 @@ /* FCOS */ case 0x3F: { + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (FPU_GET_TAG(0) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -2714,7 +2712,6 @@ if (!State->FpuControl.Dm) { - Fast486FpuException(State); break; } } @@ -2759,6 +2756,7 @@ #ifndef FAST486_NO_FPU + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (!ModRegRm.Memory) @@ -2774,8 +2772,6 @@ { /* Raise the invalid operation exception*/ State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); return; } @@ -2812,7 +2808,6 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else Fast486FpuException(State); return; } @@ -2845,6 +2840,7 @@ if (ModRegRm.Memory) { + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); FPU_SAVE_LAST_OPERAND(); @@ -2882,7 +2878,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -2904,7 +2899,6 @@ } else { - Fast486FpuException(State); return; } } @@ -2973,7 +2967,6 @@ } else { - Fast486FpuException(State); return; } } @@ -3081,6 +3074,7 @@ #ifndef FAST486_NO_FPU + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); if (ModRegRm.Memory) @@ -3101,7 +3095,6 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else Fast486FpuException(State); return; } @@ -3144,7 +3137,6 @@ FPU_SET_TAG(ModRegRm.SecondRegister, FPU_TAG_SPECIAL); } - else Fast486FpuException(State); return; } @@ -3186,6 +3178,7 @@ ULONGLONG Value; FAST486_FPU_DATA_REG MemoryData; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); FPU_SAVE_LAST_OPERAND(); @@ -3214,6 +3207,7 @@ { ULONGLONG Value = FPU_REAL8_INDEFINITE; + Fast486FpuExceptionCheck(State); FPU_SAVE_LAST_INST(); FPU_SAVE_LAST_OPERAND(); @@ -3224,7 +3218,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -3352,8 +3345,6 @@ } else { - FPU_SAVE_LAST_INST(); - switch (ModRegRm.Register) { /* FFREE */ @@ -3368,12 +3359,13 @@ { FAST486_FPU_DATA_REG Temp; + FPU_SAVE_LAST_INST(); + Fast486FpuExceptionCheck(State); + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } @@ -3393,6 +3385,9 @@ /* FSTP */ case 3: { + FPU_SAVE_LAST_INST(); + Fast486FpuExceptionCheck(State); + FPU_ST(ModRegRm.SecondRegister) = FPU_ST(0); FPU_UPDATE_TAG(ModRegRm.SecondRegister); @@ -3405,12 +3400,13 @@ /* FUCOMP */ case 5: { + FPU_SAVE_LAST_INST(); + Fast486FpuExceptionCheck(State); + if ((FPU_GET_TAG(0) == FPU_TAG_EMPTY) || (FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY)) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); return; } @@ -3454,6 +3450,7 @@ #ifndef FAST486_NO_FPU FPU_SAVE_LAST_INST(); + Fast486FpuExceptionCheck(State); if (ModRegRm.Memory) { @@ -3473,7 +3470,6 @@ FPU_SET_TAG(0, FPU_TAG_SPECIAL); } - else Fast486FpuException(State); return; } @@ -3508,8 +3504,6 @@ { /* Raise the invalid operation exception, if unmasked */ State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); return; } } @@ -3540,6 +3534,7 @@ #ifndef FAST486_NO_FPU FPU_SAVE_LAST_INST(); + Fast486FpuExceptionCheck(State); if (ModRegRm.Memory) { @@ -3579,7 +3574,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -3602,7 +3596,6 @@ } else { - Fast486FpuException(State); return; } } @@ -3682,7 +3675,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -3719,7 +3711,6 @@ if (!State->FpuControl.Im) { - Fast486FpuException(State); return; } } @@ -3776,8 +3767,6 @@ || FPU_GET_TAG(ModRegRm.SecondRegister) == FPU_TAG_EMPTY) { State->FpuStatus.Ie = TRUE; - - if (!State->FpuControl.Im) Fast486FpuException(State); break; } 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] Sat Jun 13 23:12:55 2015 @@ -3974,17 +3974,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeWait) { #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)) - { - Fast486FpuException(State); - } - + Fast486FpuExceptionCheck(State); #endif }

9 years, 4 months

[ekohl] 68124: [USETUP] AssignDriveLetters: Fix the code that assigns drive letters to logical partitions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 13 23:11:57 2015 New Revision: 68124 URL: http://svn.reactos.org/svn/reactos?rev=68124&view=rev Log: [USETUP] AssignDriveLetters: Fix the code that assigns drive letters to logical partitions. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 13 23:11:57 2015 @@ -166,46 +166,37 @@ } /* Assign drive letters to logical drives */ -#if 0 Entry1 = List->DiskListHead.Flink; while (Entry1 != &List->DiskListHead) { DiskEntry = CONTAINING_RECORD(Entry1, DISKENTRY, ListEntry); - Entry2 = DiskEntry->PartListHead.Flink; - if (Entry2 != &DiskEntry->PartListHead) - { - Entry2 = Entry2->Flink; - while (Entry2 != &DiskEntry->PartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, - PARTENTRY, - ListEntry); - - PartEntry->DriveLetter = 0; - - if (PartEntry->Unpartitioned == FALSE && - !IsContainerPartition(PartEntry->PartInfo[0].PartitionType)) + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + + PartEntry->DriveLetter = 0; + + if (PartEntry->IsPartitioned) + { + if (IsRecognizedPartition(PartEntry->PartitionType) || + (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED && + PartEntry->SectorCount.QuadPart != 0LL)) { - if (IsRecognizedPartition(PartEntry->PartInfo[0].PartitionType) || - (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED && - PartEntry->PartInfo[0].PartitionLength.QuadPart != 0LL)) + if (Letter <= 'Z') { - if (Letter <= 'Z') - { - PartEntry->DriveLetter = Letter; - Letter++; - } + PartEntry->DriveLetter = Letter; + Letter++; } } - - Entry2 = Entry2->Flink; - } + } + + Entry2 = Entry2->Flink; } Entry1 = Entry1->Flink; } -#endif } @@ -1151,7 +1142,7 @@ InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); - /* Allocate a layout buffer for 4 partition entries first */ + /* Allocate a layout buffer with 4 partition entries first */ LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); DiskEntry->LayoutBuffer = RtlAllocateHeap(ProcessHeap,

9 years, 4 months

[tkreuzer] 68123: [NTOSKRNL] - Set VadType = VadImageMap for image section mappings - Rewrite MmGetFileNameForAddress and NtAreMappedFilesTheSame. Take into account that the first address must be a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jun 13 19:18:25 2015 New Revision: 68123 URL: http://svn.reactos.org/svn/reactos?rev=68123&view=rev Log: [NTOSKRNL] - Set VadType = VadImageMap for image section mappings - Rewrite MmGetFileNameForAddress and NtAreMappedFilesTheSame. Take into account that the first address must be an image section mapping - Fixes a few kernel32_winetest:virtual tests CORE-9736 #resolve Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Jun 13 19:18:25 2015 @@ -1686,6 +1686,59 @@ return ((PROS_SECTION_OBJECT)SectionObject)->FileObject; } +static +PFILE_OBJECT +MiGetFileObjectForVad( + _In_ PMMVAD Vad) +{ + PCONTROL_AREA ControlArea; + PFILE_OBJECT FileObject; + + /* Check if this is a RosMm memory area */ + if (Vad->u.VadFlags.Spare != 0) + { + PMEMORY_AREA MemoryArea = (PMEMORY_AREA)Vad; + PROS_SECTION_OBJECT Section; + + /* Check if it's a section view (RosMm section) */ + if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + /* Get the section pointer to the SECTION_OBJECT */ + Section = MemoryArea->Data.SectionData.Section; + FileObject = Section->FileObject; + } + else + { + ASSERT(MemoryArea->Type == MEMORY_AREA_CACHE); + DPRINT1("VAD is a cache section!\n"); + return NULL; + } + } + else + { + /* Make sure it's not a VM VAD */ + if (Vad->u.VadFlags.PrivateMemory == 1) + { + DPRINT1("VAD is not a section\n"); + return NULL; + } + + /* Get the control area */ + ControlArea = Vad->ControlArea; + if ((ControlArea == NULL) || !ControlArea->u.Flags.Image) + { + DPRINT1("Address is not a section\n"); + return NULL; + } + + /* Get the file object */ + FileObject = ControlArea->FilePointer; + } + + /* Return the file object */ + return FileObject; +} + VOID NTAPI MmGetImageInformation (OUT PSECTION_IMAGE_INFORMATION ImageInformation) @@ -1771,19 +1824,30 @@ POBJECT_NAME_INFORMATION ModuleNameInformation; PVOID AddressSpace; NTSTATUS Status; + PMMVAD Vad; PFILE_OBJECT FileObject = NULL; /* Lock address space */ AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); - /* Get the file object pointer for the address */ - Status = MiGetFileObjectForSectionAddress(Address, &FileObject); - if (!NT_SUCCESS(Status)) + /* Get the VAD */ + Vad = MiLocateAddress(Address); + if (Vad == NULL) + { + /* Fail, the address does not exist */ + DPRINT1("No VAD at address %p\n", Address); + MmUnlockAddressSpace(AddressSpace); + return STATUS_INVALID_ADDRESS; + } + + /* Get the file object pointer for the VAD */ + FileObject = MiGetFileObjectForVad(Vad); + if (FileObject == NULL) { DPRINT1("Failed to get file object for Address %p\n", Address); MmUnlockAddressSpace(AddressSpace); - return Status; + return STATUS_SECTION_NOT_IMAGE; } /* Reference the file object */ @@ -3099,6 +3163,7 @@ IN PVOID File2MappedAsFile) { PVOID AddressSpace; + PMMVAD Vad1, Vad2; PFILE_OBJECT FileObject1, FileObject2; NTSTATUS Status; @@ -3106,34 +3171,66 @@ AddressSpace = MmGetCurrentAddressSpace(); MmLockAddressSpace(AddressSpace); - /* Get the file object pointer for address 1 */ - Status = MiGetFileObjectForSectionAddress(File1MappedAsAnImage, &FileObject1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object for Address %p\n", File1MappedAsAnImage); - MmUnlockAddressSpace(AddressSpace); - return Status; - } - - /* Get the file object pointer for address 2 */ - Status = MiGetFileObjectForSectionAddress(File2MappedAsFile, &FileObject2); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object for Address %p\n", File1MappedAsAnImage); - MmUnlockAddressSpace(AddressSpace); - return Status; + /* Get the VAD for Address 1 */ + Vad1 = MiLocateAddress(File1MappedAsAnImage); + if (Vad1 == NULL) + { + /* Fail, the address does not exist */ + DPRINT1("No VAD at address 1 %p\n", File1MappedAsAnImage); + Status = STATUS_INVALID_ADDRESS; + goto Exit; + } + + /* Get the VAD for Address 2 */ + Vad2 = MiLocateAddress(File2MappedAsFile); + if (Vad2 == NULL) + { + /* Fail, the address does not exist */ + DPRINT1("No VAD at address 2 %p\n", File2MappedAsFile); + Status = STATUS_INVALID_ADDRESS; + goto Exit; + } + + /* Get the file object pointer for VAD 1 */ + FileObject1 = MiGetFileObjectForVad(Vad1); + if (FileObject1 == NULL) + { + DPRINT1("Failed to get file object for Address 1 %p\n", File1MappedAsAnImage); + Status = STATUS_CONFLICTING_ADDRESSES; + goto Exit; + } + + /* Get the file object pointer for VAD 2 */ + FileObject2 = MiGetFileObjectForVad(Vad2); + if (FileObject2 == NULL) + { + DPRINT1("Failed to get file object for Address 2 %p\n", File2MappedAsFile); + Status = STATUS_CONFLICTING_ADDRESSES; + goto Exit; + } + + /* Make sure Vad1 is an image mapping */ + if (Vad1->u.VadFlags.VadType != VadImageMap) + { + DPRINT1("Address 1 (%p) is not an image mapping\n", File1MappedAsAnImage); + Status = STATUS_NOT_SAME_DEVICE; + goto Exit; } /* SectionObjectPointer is equal if the files are equal */ - if (FileObject1->SectionObjectPointer != FileObject2->SectionObjectPointer) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_NOT_SAME_DEVICE; - } - + if (FileObject1->SectionObjectPointer == FileObject2->SectionObjectPointer) + { + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_NOT_SAME_DEVICE; + } + +Exit: /* Unlock address space */ MmUnlockAddressSpace(AddressSpace); - return STATUS_SUCCESS; + return Status; } /* Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Jun 13 19:18:25 2015 @@ -3979,6 +3979,11 @@ MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; MArea->Data.SectionData.ViewOffset.QuadPart = ViewOffset; + if (Section->AllocationAttributes & SEC_IMAGE) + { + MArea->VadNode.u.VadFlags.VadType = VadImageMap; + } + MmInitializeRegion(&MArea->Data.SectionData.RegionListHead, ViewSize, 0, Protect);

9 years, 4 months

[ekohl] 68122: [USETUP] Allocate a disk layout buffer that is large enough to keep all partitions of the disk. CORE-5818 resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 13 12:46:42 2015 New Revision: 68122 URL: http://svn.reactos.org/svn/reactos?rev=68122&view=rev Log: [USETUP] Allocate a disk layout buffer that is large enough to keep all partitions of the disk. CORE-5818 resolve Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 13 12:46:42 2015 @@ -1151,12 +1151,9 @@ InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); - /* - * Allocate a buffer for 26 logical drives (2 entries each == 52) - * plus the main partiton table (4 entries). Total 56 entries. - */ + /* Allocate a layout buffer for 4 partition entries first */ LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + - ((56 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + ((4 - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); DiskEntry->LayoutBuffer = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, LayoutBufferSize); @@ -1175,6 +1172,36 @@ 0, DiskEntry->LayoutBuffer, LayoutBufferSize); + DPRINT("Status: 0x%08lx\n", Status); + DPRINT("PartitionCount: %lu\n", DiskEntry->LayoutBuffer->PartitionCount); + + /* If we need more than 4 partition entries, reallocte the buffer and + retrieve the disk layout again */ + if (!NT_SUCCESS(Status) && DiskEntry->LayoutBuffer->PartitionCount > 4) + { + LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) + + ((DiskEntry->LayoutBuffer->PartitionCount - ANYSIZE_ARRAY) * sizeof(PARTITION_INFORMATION)); + DiskEntry->LayoutBuffer = RtlReAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + if (DiskEntry->LayoutBuffer == NULL) + { + return; + } + + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_LAYOUT, + NULL, + 0, + DiskEntry->LayoutBuffer, + LayoutBufferSize); + } + if (NT_SUCCESS(Status)) { #ifdef DUMP_PARTITION_TABLE

9 years, 4 months

[tfaber] 68121: [AFD] - Probe for read access only in TdiSend/TdiSendDatagram CORE-9807 resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 13 12:30:33 2015 New Revision: 68121 URL: http://svn.reactos.org/svn/reactos?rev=68121&view=rev Log: [AFD] - Probe for read access only in TdiSend/TdiSendDatagram CORE-9807 resolve Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sat Jun 13 12:30:33 2015 @@ -935,7 +935,7 @@ } _SEH2_TRY { - MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoReadAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); @@ -1202,7 +1202,7 @@ } _SEH2_TRY { - MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoModifyAccess); + MmProbeAndLockPages(Mdl, (*Irp)->RequestorMode, IoReadAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl);

9 years, 4 months

[tfaber] 68120: [WS2_32_APITEST] - Add a test for send/sendto with a read-only buffer CORE-9807

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jun 13 12:29:07 2015 New Revision: 68120 URL: http://svn.reactos.org/svn/reactos?rev=68120&view=rev Log: [WS2_32_APITEST] - Add a test for send/sendto with a read-only buffer CORE-9807 Added: trunk/rostests/apitests/ws2_32/send.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Sat Jun 13 12:29:07 2015 @@ -5,6 +5,7 @@ ioctlsocket.c nostartup.c recv.c + send.c WSAStartup.c testlist.c) Added: trunk/rostests/apitests/ws2_32/send.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/send.c?re… ============================================================================== --- trunk/rostests/apitests/ws2_32/send.c (added) +++ trunk/rostests/apitests/ws2_32/send.c [iso-8859-1] Sat Jun 13 12:29:07 2015 @@ -0,0 +1,185 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for send/sendto + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <winsock2.h> + +#define WIN32_NO_STATUS +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +static +PVOID +AllocateReadOnly( + _In_ SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested); + PVOID VirtualMemory = NULL; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READONLY); + if (!NT_SUCCESS(Status)) + return NULL; + + return VirtualMemory; +} + +static +VOID +FreeReadOnly( + _In_ PVOID VirtualMemory) +{ + NTSTATUS Status; + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +static +VOID +test_send(void) +{ + SOCKET sock; + int ret; + int error; + PVOID buffer; + ULONG bufferSize; + struct sockaddr_in addr; + + bufferSize = 32; + buffer = AllocateReadOnly(bufferSize); + ok(buffer != NULL, "AllocateReadOnly failed\n"); + if (!buffer) + { + skip("No memory\n"); + return; + } + + ret = send(0, NULL, 0, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + ret = send(0, buffer, bufferSize, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(sock != INVALID_SOCKET, "socket failed\n"); + if (sock == INVALID_SOCKET) + { + skip("No socket\n"); + FreeReadOnly(buffer); + return; + } + + ret = send(sock, NULL, 0, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTCONN, "error = %d\n", error); + + ret = send(sock, buffer, bufferSize, 0); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "send returned %d\n", ret); + ok(error == WSAENOTCONN, "error = %d\n", error); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("8.8.8.8"); + addr.sin_port = htons(53); + ret = connect(sock, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == 0, "connect returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + ret = send(sock, NULL, 0, 0); + error = WSAGetLastError(); + ok(ret == 0, "send returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + ret = send(sock, buffer, bufferSize, 0); + error = WSAGetLastError(); + ok(ret == bufferSize, "send returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + closesocket(sock); + + FreeReadOnly(buffer); +} + +static +VOID +test_sendto(void) +{ + SOCKET sock; + int ret; + int error; + PVOID buffer; + ULONG bufferSize; + struct sockaddr_in addr; + + bufferSize = 32; + buffer = AllocateReadOnly(bufferSize); + ok(buffer != NULL, "AllocateReadOnly failed\n"); + if (!buffer) + { + skip("No memory\n"); + return; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("8.8.8.8"); + addr.sin_port = htons(53); + + ret = sendto(0, NULL, 0, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "sendto returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + ret = sendto(0, buffer, bufferSize, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == SOCKET_ERROR, "sendto returned %d\n", ret); + ok(error == WSAENOTSOCK, "error = %d\n", error); + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ok(sock != INVALID_SOCKET, "socket failed\n"); + if (sock == INVALID_SOCKET) + { + skip("No socket\n"); + FreeReadOnly(buffer); + return; + } + + ret = sendto(sock, NULL, 0, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == 0, "sendto returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + ret = sendto(sock, buffer, bufferSize, 0, (const struct sockaddr *)&addr, sizeof(addr)); + error = WSAGetLastError(); + ok(ret == bufferSize, "sendto returned %d\n", ret); + ok(error == 0, "error = %d\n", error); + + closesocket(sock); + + FreeReadOnly(buffer); +} + +START_TEST(send) +{ + int ret; + WSADATA wsad; + + ret = WSAStartup(MAKEWORD(2, 2), &wsad); + ok(ret == 0, "WSAStartup failed with %d\n", ret); + test_send(); + test_sendto(); + WSACleanup(); +} Propchange: trunk/rostests/apitests/ws2_32/send.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Sat Jun 13 12:29:07 2015 @@ -6,6 +6,7 @@ extern void func_getaddrinfo(void); extern void func_ioctlsocket(void); extern void func_recv(void); +extern void func_send(void); extern void func_WSAStartup(void); extern void func_nostartup(void); @@ -15,6 +16,7 @@ { "ioctlsocket", func_ioctlsocket }, { "nostartup", func_nostartup }, { "recv", func_recv }, + { "send", func_send }, { "WSAStartup", func_WSAStartup }, { 0, 0 } };

9 years, 4 months

[akhaldi] 68119: [SERVMAN] Use a glob mechanism as resource files lists do not change often. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 13 11:41:32 2015 New Revision: 68119 URL: http://svn.reactos.org/svn/reactos?rev=68119&view=rev Log: [SERVMAN] Use a glob mechanism as resource files lists do not change often. CORE-9806 Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sat Jun 13 11:41:32 2015 @@ -21,20 +21,7 @@ stop_dependencies.c precomp.h) -list(APPEND servman_rc_deps - ${CMAKE_CURRENT_SOURCE_DIR}/res/create.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/delete.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/driver.ico - ${CMAKE_CURRENT_SOURCE_DIR}/res/export.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/nodepends.ico - ${CMAKE_CURRENT_SOURCE_DIR}/res/pause.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/properties.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/refresh.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/restart.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/start.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/stop.bmp - ${CMAKE_CURRENT_SOURCE_DIR}/res/system.ico) - +file(GLOB servman_rc_deps res/*.*) add_rc_deps(servman.rc ${servman_rc_deps}) add_executable(servman ${SOURCE} servman.rc) set_module_type(servman win32gui UNICODE)

9 years, 4 months

[akhaldi] 68118: [SERVMAN] Properly track resource file dependencies. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 13 11:12:48 2015 New Revision: 68118 URL: http://svn.reactos.org/svn/reactos?rev=68118&view=rev Log: [SERVMAN] Properly track resource file dependencies. CORE-9806 Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sat Jun 13 11:12:48 2015 @@ -21,6 +21,21 @@ stop_dependencies.c precomp.h) +list(APPEND servman_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/res/create.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/delete.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/driver.ico + ${CMAKE_CURRENT_SOURCE_DIR}/res/export.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/nodepends.ico + ${CMAKE_CURRENT_SOURCE_DIR}/res/pause.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/properties.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/refresh.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/restart.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/start.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/stop.bmp + ${CMAKE_CURRENT_SOURCE_DIR}/res/system.ico) + +add_rc_deps(servman.rc ${servman_rc_deps}) add_executable(servman ${SOURCE} servman.rc) set_module_type(servman win32gui UNICODE) add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)

9 years, 4 months

← Newer
1
...
18
19
20
21
22
23
24
...
35
Older →

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 June 2015