Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[pschweitzer] 67614: [NTFS] NTFS doesn't need CdfsGetEntryName()
by pschweitzer＠svn.reactos.org 10 May '15

10 May '15

Author: pschweitzer Date: Sun May 10 10:02:53 2015 New Revision: 67614 URL: http://svn.reactos.org/svn/reactos?rev=67614&view=rev Log: [NTFS] NTFS doesn't need CdfsGetEntryName() Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun May 10 10:02:53 2015 @@ -34,96 +34,6 @@ /* FUNCTIONS ****************************************************************/ -#if 0 -static NTSTATUS -CdfsGetEntryName(PDEVICE_EXTENSION DeviceExt, - PVOID *Context, - PVOID *Block, - PLARGE_INTEGER StreamOffset, - ULONG DirLength, - PVOID *Ptr, - PWSTR Name, - PULONG pIndex, - PULONG pIndex2) -/* - * FUNCTION: Retrieves the file name, be it in short or long file name format - */ -{ - PDIR_RECORD Record; - NTSTATUS Status; - ULONG Index = 0; - ULONG Offset = 0; - ULONG BlockOffset = 0; - - Record = (PDIR_RECORD)*Block; - while(Index < *pIndex) - { - BlockOffset += Record->RecordLength; - Offset += Record->RecordLength; - - Record = (PDIR_RECORD)(*Block + BlockOffset); - if (BlockOffset >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(*Context); - StreamOffset->QuadPart += BLOCKSIZE; - Offset = ROUND_UP(Offset, BLOCKSIZE); - BlockOffset = 0; - - if (!CcMapData(DeviceExt->StreamFileObject, - StreamOffset, - BLOCKSIZE, TRUE, - Context, Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - Record = (PDIR_RECORD)(*Block + BlockOffset); - } - - if (Offset >= DirLength) - return(STATUS_NO_MORE_ENTRIES); - - Index++; - } - - DPRINT("Index %lu RecordLength %lu Offset %lu\n", - Index, Record->RecordLength, Offset); - - if (Record->FileIdLength == 1 && Record->FileId[0] == 0) - { - wcscpy(Name, L"."); - } - else if (Record->FileIdLength == 1 && Record->FileId[0] == 1) - { - wcscpy(Name, L".."); - } - else - { - if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } - else - { - CdfsSwapString(Name, Record->FileId, Record->FileIdLength); - } - } - - DPRINT("Name '%S'\n", Name); - - *Ptr = Record; - - *pIndex = Index; - - return(STATUS_SUCCESS); -} -#endif - static NTSTATUS NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt,

1 0

[aandrejevic] 67613: [NTVDM] Make sure the BOP doesn't repeat when the timeout expires in INT 15h, AH = 41h.
by aandrejevic＠svn.reactos.org 10 May '15

10 May '15

Author: aandrejevic Date: Sun May 10 02:10:19 2015 New Revision: 67613 URL: http://svn.reactos.org/svn/reactos?rev=67613&view=rev Log: [NTVDM] Make sure the BOP doesn't repeat when the timeout expires in INT 15h, AH = 41h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun May 10 02:10:19 2015 @@ -181,6 +181,7 @@ if (getBL() != 0 && (Bda->TickCounter - StartingCount) >= getBL()) { /* Timeout expired */ + setCF(0); break; }

1 0

[aandrejevic] 67612: [NTVDM] - Modify the int32 dispatch to clear the CF only on entry, so that we can track in our handlers whether it was the first time the BOP executed. - Implement INT 15h, AH ...
by aandrejevic＠svn.reactos.org 10 May '15

10 May '15

Author: aandrejevic Date: Sun May 10 01:42:39 2015 New Revision: 67612 URL: http://svn.reactos.org/svn/reactos?rev=67612&view=rev Log: [NTVDM] - Modify the int32 dispatch to clear the CF only on entry, so that we can track in our handlers whether it was the first time the BOP executed. - Implement INT 15h, AH = 41h (Wait On External Event). - Fix INT 15h, AX = E801h - modify the stack CF instead of the handler CF. - Make INT 16h AH = 00h clear CF when there is a character, so that the BOP doesn't repeat. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun May 10 01:42:39 2015 @@ -164,6 +164,89 @@ break; } + /* Wait On External Event */ + case 0x41: + { + BYTE Value; + BOOLEAN Return; + static DWORD StartingCount; + + /* Check if this is the first time this BOP occurred */ + if (!getCF()) + { + /* Set the starting count */ + StartingCount = Bda->TickCounter; + } + + if (getBL() != 0 && (Bda->TickCounter - StartingCount) >= getBL()) + { + /* Timeout expired */ + break; + } + + if (getAL() & (1 << 4)) + { + /* Read from the I/O port */ + Value = IOReadB(getDX()); + } + else + { + /* Read from the memory */ + Value = *(LPBYTE)SEG_OFF_TO_PTR(getES(), getDI()); + } + + switch (getAL() & 7) + { + /* Any external event */ + case 0: + { + /* Return if this is not the first time the BOP occurred */ + Return = getCF(); + break; + } + + /* Compare and return if equal */ + case 1: + { + Return = Value == getBH(); + break; + } + + /* Compare and return if not equal */ + case 2: + { + Return = Value != getBH(); + break; + } + + /* Test and return if not zero */ + case 3: + { + Return = (Value & getBH()) != 0; + break; + } + + /* Test and return if zero */ + case 4: + { + Return = (Value & getBH()) == 0; + break; + } + + default: + { + DPRINT1("INT 15h, AH = 41h - Unknown condition type: %u\n", getAL() & 7); + Return = TRUE; + break; + } + } + + /* Repeat the BOP if we shouldn't return */ + setCF(!Return); + + break; + } + /* Keyboard intercept */ case 0x4F: { @@ -303,11 +386,12 @@ /* The amount of memory above 16M, in 64K blocks */ ULONG Above16M = (MAX_ADDRESS > 0x01000000) ? (MAX_ADDRESS - 0x01000000) >> 16: 0; - setCF(0); setAX(Above1M); setBX(Above16M); setCX(Above1M); setDX(Above16M); + + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } else if (getAL() == 0x20 && getEDX() == 'SMAP') { Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sun May 10 01:42:39 2015 @@ -107,6 +107,7 @@ BiosKbdBufferPop(); setAX(Character); + setCF(0); break; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] Sun May 10 01:42:39 2015 @@ -40,9 +40,10 @@ /* Push the value of the interrupt to be called */ 0x6A, 0xFF, // push i (patchable to 0x6A, 0xIntNum) + 0xF8, // clc + /* The BOP Sequence */ // BOP_SEQ: - 0xF8, // clc BOP(BOP_CONTROL), // Control BOP BOP_CONTROL_INT32, // 32-bit Interrupt dispatcher @@ -52,7 +53,7 @@ 0xF4, // hlt - 0xEB, 0xF5, // jmp BOP_SEQ (offset -11) + 0xEB, 0xF6, // jmp BOP_SEQ (offset -10) // EXIT: 0x44, 0x44, // inc sp, inc sp

1 0

[aandrejevic] 67611: [NTVDM] - Implement XMS function 0x0E (Get Handle Information). - Fix INT 15h, AX = E820h - setCF can't be used inside an int32 callback for changing the return carry flag, bec...
by aandrejevic＠svn.reactos.org 10 May '15

10 May '15

Author: aandrejevic Date: Sun May 10 00:55:38 2015 New Revision: 67611 URL: http://svn.reactos.org/svn/reactos?rev=67611&view=rev Log: [NTVDM] - Implement XMS function 0x0E (Get Handle Information). - Fix INT 15h, AX = E820h - setCF can't be used inside an int32 callback for changing the return carry flag, because it has a different meaning there (it means that the BOP should be repeated). Instead, we must modify the CF that was pushed on the stack. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun May 10 00:55:38 2015 @@ -318,7 +318,7 @@ PBIOS_MEMORY_MAP Map = (PBIOS_MEMORY_MAP)SEG_OFF_TO_PTR(getES(), getDI()); /* Assume the buffer won't be large enough */ - setCF(0); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; while (BytesWritten < getECX() && (ULONG_PTR)Map < (MAX_ADDRESS - sizeof(BIOS_MEMORY_MAP))) { @@ -326,7 +326,7 @@ if (!MemQueryMemoryZone(Offset, &Length, &Hooked)) { /* No more memory blocks */ - setCF(1); + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; break; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sun May 10 00:55:38 2015 @@ -513,6 +513,35 @@ break; } + /* Get Handle Information */ + case 0x0E: + { + PXMS_HANDLE Entry = GetHandleRecord(getDX()); + + if (Entry) + { + INT i; + UCHAR Handles = 0; + + for (i = 0; i < XMS_MAX_HANDLES; i++) + { + if (HandleTable[i].Handle == 0) Handles++; + } + + setAX(1); + setBH(Entry->LockCount); + setBL(Handles); + setDX(Entry->Size); + } + else + { + setAX(0); + setBL(XMS_STATUS_INVALID_HANDLE); + } + + break; + } + default: { DPRINT1("XMS command AH = 0x%02X NOT IMPLEMENTED\n", getAH());

1 0

[aandrejevic] 67610: [NTVDM] Correct the byte order of the magic value: 'PAMS' -> 'SMAP'.
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 23:56:38 2015 New Revision: 67610 URL: http://svn.reactos.org/svn/reactos?rev=67610&view=rev Log: [NTVDM] Correct the byte order of the magic value: 'PAMS' -> 'SMAP'. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat May 9 23:56:38 2015 @@ -309,7 +309,7 @@ setCX(Above1M); setDX(Above16M); } - else if (getAL() == 0x20 && getEDX() == 'PAMS') + else if (getAL() == 0x20 && getEDX() == 'SMAP') { ULONG Offset = getEBX(); ULONG Length; @@ -340,7 +340,7 @@ BytesWritten += sizeof(BIOS_MEMORY_MAP); } - setEAX('PAMS'); + setEAX('SMAP'); setEBX(Offset); setECX(BytesWritten); }

1 0

[aandrejevic] 67609: [NTVDM] Implement BIOS INT 15h functions AX = E820 (Get Memory Map) and AX = E801 (Get Memory Size for >64M Configurations).
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 23:48:09 2015 New Revision: 67609 URL: http://svn.reactos.org/svn/reactos?rev=67609&view=rev Log: [NTVDM] Implement BIOS INT 15h functions AX = E820 (Get Memory Map) and AX = E801 (Get Memory Size for >64M Configurations). Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat May 9 23:48:09 2015 @@ -27,6 +27,7 @@ #include "vidbios32.h" #include "moubios32.h" +#include "memory.h" #include "io.h" #include "hardware/cmos.h" #include "hardware/pic.h" @@ -291,6 +292,68 @@ break; } + /* Get System Memory Map */ + case 0xE8: + { + if (getAL() == 0x01) + { + /* The amount of memory between 1M and 16M, in kilobytes */ + ULONG Above1M = (min(MAX_ADDRESS, 0x01000000) - 0x00100000) >> 10; + + /* The amount of memory above 16M, in 64K blocks */ + ULONG Above16M = (MAX_ADDRESS > 0x01000000) ? (MAX_ADDRESS - 0x01000000) >> 16: 0; + + setCF(0); + setAX(Above1M); + setBX(Above16M); + setCX(Above1M); + setDX(Above16M); + } + else if (getAL() == 0x20 && getEDX() == 'PAMS') + { + ULONG Offset = getEBX(); + ULONG Length; + ULONG BytesWritten = 0; + BOOLEAN Hooked; + PBIOS_MEMORY_MAP Map = (PBIOS_MEMORY_MAP)SEG_OFF_TO_PTR(getES(), getDI()); + + /* Assume the buffer won't be large enough */ + setCF(0); + + while (BytesWritten < getECX() && (ULONG_PTR)Map < (MAX_ADDRESS - sizeof(BIOS_MEMORY_MAP))) + { + /* Let's ask our memory controller */ + if (!MemQueryMemoryZone(Offset, &Length, &Hooked)) + { + /* No more memory blocks */ + setCF(1); + break; + } + + Map->BaseAddress = (ULONGLONG)Offset; + Map->Length = (ULONGLONG)Length; + Map->Type = Hooked ? BIOS_MEMORY_RESERVED : BIOS_MEMORY_AVAILABLE; + + /* Go to the next record */ + Map++; + Offset += Length; + BytesWritten += sizeof(BIOS_MEMORY_MAP); + } + + setEAX('PAMS'); + setEBX(Offset); + setECX(BytesWritten); + } + else + { + DPRINT1("BIOS Function INT 15h, AH = 0xE8 - unexpected AL = %02X, EDX = %08X\n", + getAL(), + getEDX()); + } + + break; + } + default: { DPRINT1("BIOS Function INT 15h, AH = 0x%02X NOT IMPLEMENTED\n", Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sat May 9 23:48:09 2015 @@ -15,6 +15,21 @@ /* DEFINES ********************************************************************/ +enum +{ + BIOS_MEMORY_AVAILABLE = 1, + BIOS_MEMORY_RESERVED = 2, + BIOS_MEMORY_ACPI_RECLAIMABLE = 3, + BIOS_MEMORY_ACPI_NVS = 4 +}; + +typedef struct +{ + ULONGLONG BaseAddress; + ULONGLONG Length; + ULONG Type; +} BIOS_MEMORY_MAP, *PBIOS_MEMORY_MAP; + // #define BIOS_EQUIPMENT_INTERRUPT 0x11 // #define BIOS_MEMORY_SIZE 0x12 // #define BIOS_MISC_INTERRUPT 0x15 Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Sat May 9 23:48:09 2015 @@ -283,7 +283,23 @@ return TRUE; } - +BOOLEAN +MemQueryMemoryZone(ULONG StartAddress, PULONG Length, PBOOLEAN Hooked) +{ + ULONG Page = StartAddress >> 12; + if (Page >= TOTAL_PAGES) return FALSE; + + *Length = 0; + *Hooked = PageTable[Page] != NULL; + + while (Page < TOTAL_PAGES && (PageTable[Page] != NULL) == *Hooked) + { + *Length += PAGE_SIZE; + Page++; + } + + return TRUE; +} PBYTE WINAPI Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Sat May 9 23:48:09 2015 @@ -67,6 +67,14 @@ ULONG Size ); +BOOLEAN +MemQueryMemoryZone +( + ULONG StartAddress, + PULONG Length, + PBOOLEAN Hooked +); + #endif // _MEMORY_H_ /* EOF */

1 0

[tfaber] 67608: [DDK] - Include <suppress.h> from wdm.h to satisfy __WARNING_MEMORY_NOT_ACQUIRED. Patch by Mark Jansen. CORE-9657 #resolve
by tfaber＠svn.reactos.org 09 May '15

09 May '15

Author: tfaber Date: Sat May 9 22:49:37 2015 New Revision: 67608 URL: http://svn.reactos.org/svn/reactos?rev=67608&view=rev Log: [DDK] - Include <suppress.h> from wdm.h to satisfy __WARNING_MEMORY_NOT_ACQUIRED. Patch by Mark Jansen. CORE-9657 #resolve Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/wdm.template.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6760… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat May 9 22:49:37 2015 @@ -43,6 +43,7 @@ #include <ntstatus.h> #include <kernelspecs.h> #include <ntiologc.h> +#include <suppress.h> #ifndef GUID_DEFINED #include <guiddef.h> Modified: trunk/reactos/include/xdk/wdm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wdm.template.h… ============================================================================== --- trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wdm.template.h [iso-8859-1] Sat May 9 22:49:37 2015 @@ -43,6 +43,7 @@ #include <ntstatus.h> #include <kernelspecs.h> #include <ntiologc.h> +#include <suppress.h> #ifndef GUID_DEFINED #include <guiddef.h>

1 0

[tfaber] 67607: [CMAKE] - Enable C4189 (local variable initialized but not referenced) on MSVC builds and make it an error. CORE-9676 #resolve
by tfaber＠svn.reactos.org 09 May '15

09 May '15

Author: tfaber Date: Sat May 9 22:44:52 2015 New Revision: 67607 URL: http://svn.reactos.org/svn/reactos?rev=67607&view=rev Log: [CMAKE] - Enable C4189 (local variable initialized but not referenced) on MSVC builds and make it an error. CORE-9676 #resolve Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=67607… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat May 9 22:44:52 2015 @@ -59,11 +59,12 @@ # - C4129: unrecognized escape sequence # - TODO: C4133: incompatible types # - C4163: 'identifier': not available as an intrinsic function +# - C4189: local variable initialized but not referenced # - C4229: modifiers on data are ignored # - C4700: uninitialized variable usage # - C4603: macro is not defined or definition is different after precompiled header use # - C4716: function must return a value -add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4229 /we4700 /we4603 /we4716") +add_compile_flags("/we4013 /we4020 /we4022 /we4047 /we4098 /we4113 /we4129 /we4163 /we4189 /we4229 /we4700 /we4603 /we4716") # Enable warnings above the default level, but don't treat them as errors: # - C4115: named type definition in parentheses Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Sat May 9 22:44:52 2015 @@ -30,6 +30,8 @@ add_library(mesa_swrast STATIC ${SOURCE}) add_pch(mesa_swrast precomp.h SOURCE) -if(NOT MSVC) +if(MSVC) + add_target_compile_flags(mesa_swrast "/wd4189") +else() add_target_compile_flags(mesa_swrast "-Wno-unused-variable") endif() Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Sat May 9 22:44:52 2015 @@ -67,6 +67,8 @@ add_pch(libxml2 libxml.h SOURCE) add_dependencies(libxml2 psdk) -if(NOT MSVC) +if(MSVC) + add_target_compile_flags(libxml2 "/wd4189") +else() add_target_compile_flags(libxml2 "-w") endif()

1 0

[aandrejevic] 67606: [FAST486] If the executable bit of a segment descriptor is set, it's never a grow-down segment.
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 21:56:40 2015 New Revision: 67606 URL: http://svn.reactos.org/svn/reactos?rev=67606&view=rev Log: [FAST486] If the executable bit of a segment descriptor is set, it's never a grow-down segment. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sat May 9 21:56:40 2015 @@ -47,7 +47,7 @@ /* Get the cached descriptor */ CachedDescriptor = &State->SegmentRegs[SegmentReg]; - if (InstFetch || !CachedDescriptor->DirConf) + if (InstFetch || CachedDescriptor->Executable || !CachedDescriptor->DirConf) { if ((Offset + Size - 1) > CachedDescriptor->Limit) { @@ -169,7 +169,7 @@ /* Get the cached descriptor */ CachedDescriptor = &State->SegmentRegs[SegmentReg]; - if (!CachedDescriptor->DirConf) + if (CachedDescriptor->Executable || !CachedDescriptor->DirConf) { if ((Offset + Size - 1) > CachedDescriptor->Limit) {

1 0

[aandrejevic] 67605: [NTVDM] Remove an accidentally committed temporary DPRINT1.
by aandrejevic＠svn.reactos.org 09 May '15

09 May '15

Author: aandrejevic Date: Sat May 9 03:15:11 2015 New Revision: 67605 URL: http://svn.reactos.org/svn/reactos?rev=67605&view=rev Log: [NTVDM] Remove an accidentally committed temporary DPRINT1. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 9 03:15:11 2015 @@ -934,8 +934,6 @@ setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); - DPRINT1("Terminate returning to %08X\n", PspBlock->TerminateAddress); - /* Are we returning to DOS code? */ if (HIWORD(PspBlock->TerminateAddress) == DOS_CODE_SEGMENT) {

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015