Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 68141: [NTOSKRNL] Stub out NtSetSystemInformation - SystemLoadGdiDriverInSystemSpaceInformation Stub out NtQuerySystemInformation - SystemNumaProcessorMap
by pschweitzer＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: pschweitzer Date: Sun Jun 14 19:27:19 2015 New Revision: 68141 URL: http://svn.reactos.org/svn/reactos?rev=68141&view=rev Log: [NTOSKRNL] Stub out NtSetSystemInformation - SystemLoadGdiDriverInSystemSpaceInformation Stub out NtQuerySystemInformation - SystemNumaProcessorMap Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jun 14 19:27:19 2015 @@ -2152,6 +2152,24 @@ { /* FIXME */ DPRINT1("NtQuerySystemInformation - SystemSessionProcessInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 54 - Load & map in system space */ +SSI_DEF(SystemLoadGdiDriverInSystemSpaceInformation) +{ + /* FIXME */ + DPRINT1("NtSetSystemInformation - SystemLoadGdiDriverInSystemSpaceInformation not implemented\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* Class 55 - NUMA processor information */ +QSI_DEF(SystemNumaProcessorMap) +{ + /* FIXME */ + DPRINT1("NtQuerySystemInformation - SystemNumaProcessorMap not implemented\n"); return STATUS_NOT_IMPLEMENTED; } @@ -2232,7 +2250,9 @@ SI_QX(SystemRangeStartInformation), SI_QS(SystemVerifierInformation), SI_XS(SystemAddVerifier), - SI_QX(SystemSessionProcessesInformation) + SI_QX(SystemSessionProcessesInformation), + SI_XS(SystemLoadGdiDriverInSystemSpaceInformation), + SI_QX(SystemNumaProcessorMap) }; C_ASSERT(SystemBasicInformation == 0);

1 0

[pschweitzer] 68140: [KERNEL32] Fix stupidness, spotted by Thomas
by pschweitzer＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: pschweitzer Date: Sun Jun 14 18:54:57 2015 New Revision: 68140 URL: http://svn.reactos.org/svn/reactos?rev=68140&view=rev Log: [KERNEL32] Fix stupidness, spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Sun Jun 14 18:54:57 2015 @@ -314,7 +314,7 @@ /* Find ourselves */ Node = 0; - Proc = (1ULL << Processor) >> MAXIMUM_PROCESSORS; + Proc = 1ULL << Processor; while ((Proc & NumaInformation.ActiveProcessorsAffinityMask[Node]) == 0ULL) { ++Node;

1 0

[hbelusca] 68139: [TOOLS] Improve bin2c by saving in a #define the size of the generated array, and specify this size in the declaration of the array so that doing sizeof(...) becomes possible. Use...
by hbelusca＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: hbelusca Date: Sun Jun 14 18:13:50 2015 New Revision: 68139 URL: http://svn.reactos.org/svn/reactos?rev=68139&view=rev Log: [TOOLS] Improve bin2c by saving in a #define the size of the generated array, and specify this size in the declaration of the array so that doing sizeof(...) becomes possible. Use "unsigned char" as the (portable) type of the contents of the array. [HAL] Add PCHAR casts where needed to take into account the previous modifications. Modified: trunk/reactos/hal/halx86/legacy/bussupp.c trunk/reactos/tools/bin2c.c Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Sun Jun 14 18:13:50 2015 @@ -715,7 +715,7 @@ /* Isolate the class name */ sprintf(LookupString, "C %02x ", PciData->BaseClass); - ClassName = strstr(ClassTable, LookupString); + ClassName = strstr((PCHAR)ClassTable, LookupString); if (ClassName) { /* Isolate the subclass name */ @@ -736,7 +736,7 @@ /* Isolate the vendor name */ sprintf(LookupString, "\r\n%04x ", PciData->VendorID); - VendorName = strstr(VendorTable, LookupString); + VendorName = strstr((PCHAR)VendorTable, LookupString); if (VendorName) { /* Copy the vendor name into our buffer */ Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=68139&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Jun 14 18:13:50 2015 @@ -13,8 +13,8 @@ FILE* inFile; FILE* outCFile; FILE* outHFile; + size_t bufLen; unsigned char ch; - unsigned char cnt; /* Validate the arguments */ if (argc < 5) @@ -46,14 +46,6 @@ return -1; } - /* Generate the header file and close it */ - fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); - fprintf(outHFile, "#ifndef CHAR\n" - "#define CHAR char\n" - "#endif\n\n"); - fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); - fclose(outHFile); - /* Generate the source file and close it */ fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); if (argc >= 7) @@ -69,25 +61,29 @@ /* Add the array attribute */ fprintf(outCFile, "%s ", argv[5]); } - fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); + fprintf(outCFile, "unsigned char %s[] =\n{", argv[4]); - cnt = 0; - ch = fgetc(inFile); + bufLen = 0; + ch = fgetc(inFile); while (!feof(inFile)) { - if ((cnt % 16) == 0) - { + if ((bufLen % 16) == 0) fprintf(outCFile, "\n "); - cnt = 0; - } + fprintf(outCFile, " 0x%02x,", (unsigned int)ch); - ++cnt; + ++bufLen; ch = fgetc(inFile); } /* Put a final NULL terminator */ - fprintf(outCFile, "\n 0x00"); + fprintf(outCFile, "\n 0x00"); ++bufLen; fprintf(outCFile, "\n};\n"); fclose(outCFile); + + /* Generate the header file and close it */ + fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); + fprintf(outHFile, "#define %s_SIZE %Iu\n" , argv[4], bufLen); + fprintf(outHFile, "extern unsigned char %s[%Iu];\n", argv[4], bufLen); + fclose(outHFile); /* Close the input file */ fclose(inFile);

1 0

[hbelusca] 68138: [NTVDM]: Allocate a dedicated block of memory for the mouse driver, in which we write all the needed info (instead of putting them in the BIOS space). The INT32 stubs go in this r...
by hbelusca＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: hbelusca Date: Sun Jun 14 16:40:45 2015 New Revision: 68138 URL: http://svn.reactos.org/svn/reactos?rev=68138&view=rev Log: [NTVDM]: Allocate a dedicated block of memory for the mouse driver, in which we write all the needed info (instead of putting them in the BIOS space). The INT32 stubs go in this region, too. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sun Jun 14 16:40:45 2015 @@ -27,18 +27,27 @@ #include "memory.h" #include "io.h" #include "dos32krnl/dos.h" +#include "dos32krnl/memory.h" /* PRIVATE VARIABLES **********************************************************/ -// FIXME: Because I don't know a better place to store the string -// I temporarily put it in BIOS space. This need to be moved to a -// proper place when this driver is interfaced correctly with DOS. -#define COPYRIGHT_POINTER MAKELONG(0xE100, 0xF000) -static const CHAR MouseCopyright[] = "ROS PS/2 16/32-bit Mouse Driver Compatible MS-MOUSE 6.26 Copyright (C) ReactOS Team 1996-2015"; - -// See FIXME from above. -#define VERSION_POINTER MAKELONG(0xE160, 0xF000) -static PWORD Version; +static const CHAR MouseCopyright[] = "ROS PS/2 16/32-bit Mouse Driver Compatible MS-MOUSE 6.26 Copyright (C) ReactOS Team 1996-2015\0"; + +#pragma pack(push, 1) + +typedef struct _MOUSE_DRIVER +{ + CHAR Copyright[sizeof(MouseCopyright)]; + WORD Version; + BYTE MouseDosInt16Stub[Int16To32StubSize]; + BYTE MouseIrqInt16Stub[Int16To32StubSize]; +} MOUSE_DRIVER, *PMOUSE_DRIVER; + +#pragma pack(pop) + +/* Global data contained in guest memory */ +WORD MouseDataSegment; +PMOUSE_DRIVER MouseData; #define MICKEYS_PER_CELL_HORIZ 8 #define MICKEYS_PER_CELL_VERT 16 @@ -876,8 +885,8 @@ /* Return Pointer to Copyright String */ case 0x4D: { - setES(HIWORD(COPYRIGHT_POINTER)); - setDI(LOWORD(COPYRIGHT_POINTER)); + setES(MouseDataSegment); + setDI(FIELD_OFFSET(MOUSE_DRIVER, Copyright)); break; } @@ -890,8 +899,8 @@ * 00h BYTE major version * 01h BYTE minor version (BCD) */ - setES(HIWORD(VERSION_POINTER)); - setDI(LOWORD(VERSION_POINTER)); + setES(MouseDataSegment); + setDI(FIELD_OFFSET(MOUSE_DRIVER, Version)); break; } @@ -914,7 +923,8 @@ OldIrqHandler = ((PDWORD)BaseAddress)[MOUSE_IRQ_INT]; /* Set the IRQ handler */ - RegisterDosInt32(MOUSE_IRQ_INT, DosMouseIrq); + RegisterInt32(MAKELONG(FIELD_OFFSET(MOUSE_DRIVER, MouseIrqInt16Stub), MouseDataSegment), + MOUSE_IRQ_INT, DosMouseIrq, NULL); } } @@ -986,21 +996,26 @@ BOOLEAN DosMouseInitialize(VOID) { + /* Initialize some memory for storing our data that should be available to DOS */ + MouseDataSegment = DosAllocateMemory(sizeof(MOUSE_DRIVER), NULL); + if (MouseDataSegment == 0) return FALSE; + MouseData = (PMOUSE_DRIVER)SEG_OFF_TO_PTR(MouseDataSegment, 0x0000); + /* Clear the state */ RtlZeroMemory(&DriverState, sizeof(DriverState)); - /* Setup the version variable in BCD format, compatible MS-MOUSE */ - Version = (PWORD)FAR_POINTER(VERSION_POINTER); - *Version = MAKEWORD(MOUSE_VERSION/0x0100, MOUSE_VERSION%0x0100); - /* Mouse Driver Copyright */ - RtlCopyMemory(FAR_POINTER(COPYRIGHT_POINTER), MouseCopyright, sizeof(MouseCopyright)-1); + RtlCopyMemory(MouseData->Copyright, MouseCopyright, sizeof(MouseCopyright)-1); + + /* Mouse Driver Version in BCD format, compatible MS-MOUSE */ + MouseData->Version = MAKEWORD(MOUSE_VERSION/0x0100, MOUSE_VERSION%0x0100); /* Get the old mouse service interrupt handler */ OldIntHandler = ((PDWORD)BaseAddress)[DOS_MOUSE_INTERRUPT]; /* Initialize the interrupt handler */ - RegisterDosInt32(DOS_MOUSE_INTERRUPT, DosMouseService); + RegisterInt32(MAKELONG(FIELD_OFFSET(MOUSE_DRIVER, MouseDosInt16Stub), MouseDataSegment), + DOS_MOUSE_INTERRUPT, DosMouseService, NULL); DosMouseEnable(); return TRUE; @@ -1014,3 +1029,5 @@ if (DriverState.ShowCount > 0) EraseMouseCursor(); DosMouseDisable(); } + +/* EOF */ 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 Jun 14 16:40:45 2015 @@ -59,7 +59,7 @@ 0x44, 0x44, // inc sp, inc sp 0xCF, // iret }; -const ULONG Int16To32StubSize = sizeof(Int16To32); +C_ASSERT(sizeof(Int16To32) == Int16To32StubSize); /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] Sun Jun 14 16:40:45 2015 @@ -34,7 +34,8 @@ #define STACK_CS 2 #define STACK_FLAGS 3 -extern const ULONG Int16To32StubSize; +// To be adjusted with the Int16To32 handler code in int32.c +#define Int16To32StubSize 17 /* FUNCTIONS ******************************************************************/

1 0

[pschweitzer] 68137: [KERNEL32] Addendum to r68136: use appropriate define. Spotted by Thomas
by pschweitzer＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: pschweitzer Date: Sun Jun 14 16:00:27 2015 New Revision: 68137 URL: http://svn.reactos.org/svn/reactos?rev=68137&view=rev Log: [KERNEL32] Addendum to r68136: use appropriate define. Spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Sun Jun 14 16:00:27 2015 @@ -293,7 +293,7 @@ ULONGLONG Proc; /* Can't handle processor number >= 32 */ - if (Processor >= 0x20) + if (Processor >= MAXIMUM_PROCESSORS) { *NodeNumber = -1; SetLastError(ERROR_INVALID_PARAMETER); @@ -314,7 +314,7 @@ /* Find ourselves */ Node = 0; - Proc = (1ULL << Processor) >> 0x20; + Proc = (1ULL << Processor) >> MAXIMUM_PROCESSORS; while ((Proc & NumaInformation.ActiveProcessorsAffinityMask[Node]) == 0ULL) { ++Node;

1 0

[pschweitzer] 68136: [KERNEL32] Implement GetNumaHighestNodeNumber() Implement GetNumaNodeProcessorMask() Implement GetNumaProcessorNode() Implement GetNumaAvailableMemoryNode() They won't work yet...
by pschweitzer＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: pschweitzer Date: Sun Jun 14 15:52:28 2015 New Revision: 68136 URL: http://svn.reactos.org/svn/reactos?rev=68136&view=rev Log: [KERNEL32] Implement GetNumaHighestNodeNumber() Implement GetNumaNodeProcessorMask() Implement GetNumaProcessorNode() Implement GetNumaAvailableMemoryNode() They won't work yet though, given that the kernel mode counterpart is still unimplemented. CORE-9680 Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Sun Jun 14 15:52:28 2015 @@ -211,50 +211,160 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI GetNumaHighestNodeNumber(OUT PULONG HighestNodeNumber) { - STUB; - return 0; -} - -/* - * @unimplemented + NTSTATUS Status; + ULONG Length; + ULONG PartialInfo[2]; // First two members of SYSTEM_NUMA_INFORMATION + + /* Query partial NUMA info */ + Status = NtQuerySystemInformation(SystemNumaProcessorMap, + PartialInfo, + sizeof(PartialInfo), + &Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + if (Length < sizeof(ULONG)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* First member of the struct is the highest node number */ + *HighestNodeNumber = PartialInfo[0]; + return TRUE; +} + +/* + * @implemented */ BOOL WINAPI GetNumaNodeProcessorMask(IN UCHAR Node, OUT PULONGLONG ProcessorMask) { - STUB; - return 0; -} - -/* - * @unimplemented + NTSTATUS Status; + SYSTEM_NUMA_INFORMATION NumaInformation; + ULONG Length; + + /* Query NUMA information */ + Status = NtQuerySystemInformation(SystemNumaProcessorMap, + &NumaInformation, + sizeof(NumaInformation), + &Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* Validate input node number */ + if (Node > NumaInformation.HighestNodeNumber) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Return mask for that node */ + *ProcessorMask = NumaInformation.ActiveProcessorsAffinityMask[Node]; + return TRUE; +} + +/* + * @implemented */ BOOL WINAPI GetNumaProcessorNode(IN UCHAR Processor, OUT PUCHAR NodeNumber) { - STUB; - return 0; -} - -/* - * @unimplemented + NTSTATUS Status; + SYSTEM_NUMA_INFORMATION NumaInformation; + ULONG Length; + ULONG Node; + ULONGLONG Proc; + + /* Can't handle processor number >= 32 */ + if (Processor >= 0x20) + { + *NodeNumber = -1; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Query NUMA information */ + Status = NtQuerySystemInformation(SystemNumaProcessorMap, + &NumaInformation, + sizeof(NumaInformation), + &Length); + if (!NT_SUCCESS(Status)) + { + *NodeNumber = -1; + BaseSetLastNTError(Status); + return FALSE; + } + + /* Find ourselves */ + Node = 0; + Proc = (1ULL << Processor) >> 0x20; + while ((Proc & NumaInformation.ActiveProcessorsAffinityMask[Node]) == 0ULL) + { + ++Node; + /* Out of options */ + if (Node > NumaInformation.HighestNodeNumber) + { + *NodeNumber = -1; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + + /* Return found node */ + *NodeNumber = Node; + return TRUE; +} + +/* + * @implemented */ BOOL WINAPI GetNumaAvailableMemoryNode(IN UCHAR Node, OUT PULONGLONG AvailableBytes) { - STUB; - return FALSE; + NTSTATUS Status; + SYSTEM_NUMA_INFORMATION NumaInformation; + ULONG Length; + + /* Query NUMA information */ + Status = NtQuerySystemInformation(SystemNumaAvailableMemory, + &NumaInformation, + sizeof(NumaInformation), + &Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* Validate input node number */ + if (Node > NumaInformation.HighestNodeNumber) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Return available memory for that node */ + *AvailableBytes = NumaInformation.AvailableMemory[Node]; + return TRUE; } /*

1 0

[pschweitzer] 68135: [NDK] Add definition for SYSTEM_NUMA_INFORMATION Source: http://fy5388.blog.163.com/blog/static/564995372009112711571197/
by pschweitzer＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: pschweitzer Date: Sun Jun 14 15:49:39 2015 New Revision: 68135 URL: http://svn.reactos.org/svn/reactos?rev=68135&view=rev Log: [NDK] Add definition for SYSTEM_NUMA_INFORMATION Source: http://fy5388.blog.163.com/blog/static/564995372009112711571197/ Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Jun 14 15:49:39 2015 @@ -1369,7 +1369,22 @@ PVOID Buffer; // Same format as in SystemProcessInformation } SYSTEM_SESSION_PROCESS_INFORMATION, *PSYSTEM_SESSION_PROCESS_INFORMATION; -// FIXME: Class 54-97 +// FIXME: Class 54 + +// Class 55 +#define MAXIMUM_NUMA_NODES 16 +typedef struct _SYSTEM_NUMA_INFORMATION +{ + ULONG HighestNodeNumber; + ULONG Reserved; + union + { + ULONGLONG ActiveProcessorsAffinityMask[MAXIMUM_NUMA_NODES]; + ULONGLONG AvailableMemory[MAXIMUM_NUMA_NODES]; + }; +} SYSTEM_NUMA_INFORMATION, *PSYSTEM_NUMA_INFORMATION; + +// FIXME: Class 56-97 // // Hotpatch flags

1 0

[hbelusca] 68134: [NTVDM] - Stubplement the font generator functions for text-mode. - Store in plane 2+ the font ONLY in text mode (guilty r68085). Fixes spurious graphics corruption in gfx modes. ...
by hbelusca＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: hbelusca Date: Sun Jun 14 15:35:38 2015 New Revision: 68134 URL: http://svn.reactos.org/svn/reactos?rev=68134&view=rev Log: [NTVDM] - Stubplement the font generator functions for text-mode. - Store in plane 2+ the font ONLY in text mode (guilty r68085). Fixes spurious graphics corruption in gfx modes. CORE-9791 CORE-9794 #resolve #comment Should be fixed in r68134. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun Jun 14 15:35:38 2015 @@ -2491,25 +2491,30 @@ switch (Bda->CharacterHeight) { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer - * to the character range 00h-...) + * Write the default font to the VGA font plane for text-modes only. + * Update the BIOS INT 43h vector (far pointer to the character range 00h-...). */ case 8: { - VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + if (ModeNumber <= 3) + VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); break; } case 14: { - VgaWriteFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + if (ModeNumber <= 3) + VgaWriteTextModeFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); break; } case 16: { - VgaWriteFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); + if (ModeNumber <= 3) + VgaWriteTextModeFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); break; } @@ -3371,6 +3376,58 @@ { // FIXME: At the moment we support only graphics-mode functions! + /* Load User-specified Patterns (Character Set) for Text Mode */ + case 0x00: + case 0x10: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + // VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + + /* Load ROM Monochrome 8x14 Patterns (Character Set) for Text Mode */ + case 0x01: + case 0x11: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + VgaWriteTextModeFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + + /* Load ROM 8x8 Double-dot Patterns (Character Set) for Text Mode */ + case 0x02: + case 0x12: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + + /* Load ROM 8x16 Character Set for Text Mode */ + case 0x04: + case 0x14: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + VgaWriteTextModeFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + /* Set User 8x8 Graphics Chars (Setup INT 1Fh Vector) */ case 0x20: { @@ -3383,10 +3440,10 @@ /* Set User Graphics Characters */ case 0x21: { - // /* Write the font to the VGA font plane */ - // VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); - - /* Update the BIOS INT 43h vector */ + /* + * Update the BIOS INT 43h vector (far pointer + * to the character range 00h-...) + */ ((PULONG)BaseAddress)[0x43] = MAKELONG(getBP(), getES()); /* Update BDA */ @@ -3407,11 +3464,9 @@ case 0x22: { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer + * Update the BIOS INT 43h vector (far pointer * to the character range 00h-...) */ - VgaWriteFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); /* Update BDA */ @@ -3432,11 +3487,9 @@ case 0x23: { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer + * Update the BIOS INT 43h vector (far pointer * to the character range 00h-...) */ - VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); /* Update BDA */ @@ -3457,11 +3510,9 @@ case 0x24: { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer - * to the character range 00h-...) + * Update the BIOS INT 43h vector (far pointer + * to the character range 00h-...). */ - VgaWriteFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); /* Update BDA */ @@ -3715,7 +3766,6 @@ VOID VidBiosAttachToConsole(VOID) { - // VgaRefreshDisplay(); if (!Attached) { VgaAttachToConsole(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Sun Jun 14 15:35:38 2015 @@ -22,7 +22,7 @@ /* PRIVATE VARIABLES **********************************************************/ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; -static CONST DWORD MemorySize[] = { 0x20000, 0x10000, 0x8000, 0x8000 }; +static CONST DWORD MemorySize[] = { 0x20000, 0x10000, 0x08000, 0x08000 }; /* * Activate this line if you want to use the real @@ -2086,7 +2086,7 @@ RtlZeroMemory(VgaMemory, sizeof(VgaMemory)); } -VOID VgaWriteFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) +VOID VgaWriteTextModeFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) { UINT i, j; PUCHAR FontMemory = (PUCHAR)&VgaMemory[VGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)]; Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] Sun Jun 14 15:35:38 2015 @@ -258,7 +258,7 @@ VOID VgaRefreshDisplay(VOID); VOID FASTCALL VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size); BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size); -VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); +VOID VgaWriteTextModeFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaClearMemory(VOID); BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical);

1 0

[tfaber] 68133: [MC] - Add missing status codes STATUS_SMARTCARD_CERT_EXPIRED through STATUS_NO_S4U_PROT_SUPPORT. CORE-8373
by tfaber＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: tfaber Date: Sun Jun 14 11:19:02 2015 New Revision: 68133 URL: http://svn.reactos.org/svn/reactos?rev=68133&view=rev Log: [MC] - Add missing status codes STATUS_SMARTCARD_CERT_EXPIRED through STATUS_NO_S4U_PROT_SUPPORT. CORE-8373 Modified: trunk/reactos/include/reactos/mc/ntstatus.mc Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Sun Jun 14 11:19:02 2015 @@ -4251,6 +4251,113 @@ contact your system administrator. . +MessageId=0x38d +Severity=Error +Facility=System +SymbolicName=STATUS_SMARTCARD_CERT_EXPIRED +Language=English +The smartcard certificate used for authentication has expired. Please +contact your system administrator. + +. +MessageId=0x38e +Severity=Error +Facility=System +SymbolicName=STATUS_DRIVER_FAILED_PRIOR_UNLOAD +Language=English +The driver could not be installed because a previous version is still loaded. + +. +MessageId=0x38f +Severity=Error +Facility=System +SymbolicName=STATUS_SMARTCARD_SILENT_CONTEXT +Language=English +The smartcard operation requires user interaction but the context was acquired as silent. + +. +MessageId=0x401 +Severity=Error +Facility=System +SymbolicName=STATUS_PER_USER_TRUST_QUOTA_EXCEEDED +Language=English +The quota for delegated trust creation was exceeded for the current user. + +. +MessageId=0x402 +Severity=Error +Facility=System +SymbolicName=STATUS_ALL_USER_TRUST_QUOTA_EXCEEDED +Language=English +The overall quota for delegated trust creation was exceeded. + +. +MessageId=0x403 +Severity=Error +Facility=System +SymbolicName=STATUS_USER_DELETE_TRUST_QUOTA_EXCEEDED +Language=English +The quota for delegated trust deletion was exceeded for the current user. + +. +MessageId=0x404 +Severity=Error +Facility=System +SymbolicName=STATUS_DS_NAME_NOT_UNIQUE +Language=English +The specified Directory Services name already exists. + +. +MessageId=0x405 +Severity=Error +Facility=System +SymbolicName=STATUS_DS_DUPLICATE_ID_FOUND +Language=English +The requested object could not be retrieved because the specified identifier is not unique. + +. +MessageId=0x406 +Severity=Error +Facility=System +SymbolicName=STATUS_DS_GROUP_CONVERSION_ERROR +Language=English +The Directory Services group cannot be converted. + +. +MessageId=0x407 +Severity=Error +Facility=System +SymbolicName=STATUS_VOLSNAP_PREPARE_HIBERNATE +Language=English +{Volume Shadow Copy Service} +The volume %hs is busy because it is being prepared for hibernation. + +. +MessageId=0x408 +Severity=Error +Facility=System +SymbolicName=STATUS_USER2USER_REQUIRED +Language=English +The Kerberos User to User protocol is required. + +. +MessageId=0x409 +Severity=Error +Facility=System +SymbolicName=STATUS_STACK_BUFFER_OVERRUN +Language=English +An out-of-bounds access to a stack buffer was detected. This indicates an +error in the application that could be exploited by a malicious user. + +. +MessageId=0x40a +Severity=Error +Facility=System +SymbolicName=STATUS_NO_S4U_PROT_SUPPORT +Language=English +The domain controller does not support the Kerberos Service for User protocol. + +. MessageId=0x9898 Severity=Error Facility=System @@ -4259,7 +4366,7 @@ WOW Assertion Error. . -MessageId=0xA000 +MessageId=0xa000 Severity=Error Facility=System SymbolicName=STATUS_INVALID_SIGNATURE @@ -4267,7 +4374,7 @@ The cryptographic signature is invalid. . -MessageId=0xA001 +MessageId=0xa001 Severity=Error Facility=System SymbolicName=STATUS_HMAC_NOT_SUPPORTED @@ -4275,7 +4382,7 @@ Keyed-hash message authentication code (HMAC) is not supported. . -MessageId=0xA010 +MessageId=0xa010 Severity=Error Facility=System SymbolicName=STATUS_IPSEC_QUEUE_OVERFLOW @@ -4283,7 +4390,7 @@ An overflow of the IPSec queue was encountered. . -MessageId=0xA011 +MessageId=0xa011 Severity=Error Facility=System SymbolicName=STATUS_ND_QUEUE_OVERFLOW @@ -4291,7 +4398,7 @@ An overflow of the Neighbor Discovery (NDP) queue was encountered. . -MessageId=0xA012 +MessageId=0xa012 Severity=Error Facility=System SymbolicName=STATUS_HOPLIMIT_EXCEEDED @@ -4299,7 +4406,7 @@ An ICMP "Time Exceeded" error message was received. . -MessageId=0xA013 +MessageId=0xa013 Severity=Error Facility=System SymbolicName=STATUS_PROTOCOL_NOT_SUPPORTED

1 0

[tfaber] 68132: [MSAFD] - Fix error mapping for STATUS_INVALID_CONNECTION CORE-9810 CORE-9807 #resolve
by tfaber＠svn.reactos.org 14 Jun '15

14 Jun '15

Author: tfaber Date: Sun Jun 14 08:03:15 2015 New Revision: 68132 URL: http://svn.reactos.org/svn/reactos?rev=68132&view=rev Log: [MSAFD] - Fix error mapping for STATUS_INVALID_CONNECTION CORE-9810 CORE-9807 #resolve Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Jun 14 08:03:15 2015 @@ -341,6 +341,9 @@ return WSAENOBUFS; case STATUS_INVALID_CONNECTION: + return WSAENOTCONN; + + case STATUS_PROTOCOL_NOT_SUPPORTED: return WSAEAFNOSUPPORT; case STATUS_INVALID_ADDRESS: @@ -1375,7 +1378,7 @@ { NtClose(SockEvent); WSPCloseSocket( AcceptSocket, lpErrno ); - MsafdReturnWithErrno( STATUS_INVALID_CONNECTION, lpErrno, 0, NULL ); + MsafdReturnWithErrno( STATUS_PROTOCOL_NOT_SUPPORTED, lpErrno, 0, NULL ); return INVALID_SOCKET; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs