Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 69421: [NTVDM] - Add a basic boot sequence functionality (read from CMOS); will be improved in the future. - Print a "FATAL BOOT FAILURE" error message when INT 18h is called. - Fail sta...
by hbelusca＠svn.reactos.org 01 Oct '15

01 Oct '15

Author: hbelusca Date: Thu Oct 1 00:09:24 2015 New Revision: 69421 URL: http://svn.reactos.org/svn/reactos?rev=69421&view=rev Log: [NTVDM] - Add a basic boot sequence functionality (read from CMOS); will be improved in the future. - Print a "FATAL BOOT FAILURE" error message when INT 18h is called. - Fail startup if we cannot mount the available hard disk images. - Improve some diagnostic error messages. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.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] Thu Oct 1 00:09:24 2015 @@ -161,6 +161,31 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static VOID BiosCharPrint(CHAR Character) +{ + /* Save AX and BX */ + USHORT AX = getAX(); + USHORT BX = getBX(); + + /* + * Set the parameters: + * AL contains the character to print, + * BL contains the character attribute, + * BH contains the video page to use. + */ + setAL(Character); + setBL(DEFAULT_ATTRIBUTE); + setBH(Bda->VideoPage); + + /* Call the BIOS INT 10h, AH=0Eh "Teletype Output" */ + setAH(0x0E); + Int32Call(&BiosContext, BIOS_VIDEO_INTERRUPT); + + /* Restore AX and BX */ + setBX(BX); + setAX(AX); +} + static VOID WINAPI BiosException(LPWORD Stack) { /* Get the exception number and call the emulator API */ @@ -505,6 +530,8 @@ static VOID WINAPI BiosRomBasic(LPWORD Stack) { + PrintMessageAnsi(BiosCharPrint, "FATAL: INT18: BOOT FAILURE."); + /* ROM Basic is unsupported, display a message to the user */ DisplayMessage(L"NTVDM doesn't support ROM Basic. The VDM is closing."); @@ -518,79 +545,110 @@ static VOID WINAPI BiosBootstrapLoader(LPWORD Stack) { - /* - * In real BIOSes one loads the bootsector read from a diskette - * or from a disk, copy it to 0000:7C00 and then boot it. - * Since we are 32-bit VM and we hardcode our DOS at the moment, - * just call the DOS 32-bit initialization code. - */ - - DPRINT("BiosBootstrapLoader -->\n"); - + USHORT BootOrder; + + USHORT AX, BX, CX, DX, ES; + AX = getAX(); + BX = getBX(); + CX = getCX(); + DX = getDX(); + ES = getES(); + + /* + * Read the boot sequence order from the CMOS, old behaviour AMI-style. + * + * For more information, see: + * http://www.virtualbox.org/svn/vbox/trunk/src/VBox/Devices/PC/BIOS/orgs.asm + * http://www.virtualbox.org/svn/vbox/trunk/src/VBox/Devices/PC/BIOS/boot.c + * http://bochs.sourceforge.net/cgi-bin/lxr/source/iodev/cmos.cc + * https://web.archive.org/web/20111209041013/http://www-ivs.cs.uni-magdeburg.… + * http://www.bioscentral.com/misc/cmosmap.htm + */ + IOWriteB(CMOS_ADDRESS_PORT, CMOS_REG_SYSOP); + BootOrder = (IOReadB(CMOS_DATA_PORT) & 0x20) >> 5; + + /* + * BootOrder = + * 0: Hard Disk, then Floppy Disk + * 1: Floppy Disk, then Hard Disk + * In all cases, if booting from those devices failed, + * ROM DOS-32 is started. If it fails, INT 18h is called. + */ + + DPRINT("BiosBootstrapLoader (BootOrder = 0x%02X) -->\n", BootOrder); + + /* + * Format of the BootOrder command: + * 2 bytes. Each half-byte contains the ID of the drive to boot. + * Currently defined: + * 0x0: 1st Floppy disk + * 0x1: 1st Hard disk + * Other, or 0xF: Stop boot sequence. + */ + BootOrder = 0xFF00 | ((1 << (4 * BootOrder)) & 0xFF); + +Retry: + switch (BootOrder & 0x0F) { - USHORT i; - - USHORT AX, BX, CX, DX, ES; - AX = getAX(); - BX = getBX(); - CX = getCX(); - DX = getDX(); - ES = getES(); - - // i = 0; - i = 1; - do - { - if (i == 0) - { - /* Boot from 1st floppy drive */ - - setAH(0x02); // Read sectors - setAL(0x01); // Number of sectors - setDH(0x00); // First head - setCH(0x00); // First cylinder - setCL(0x01); // First sector - setDL(0x00); // First diskette drive (used by loader code, so should not be cleared) - setES(0x0000); // Place data in 0000:7C00 - setBX(0x7C00); - BiosDiskService(Stack); - if (!(Stack[STACK_FLAGS] & EMULATOR_FLAG_CF)) goto Quit; - DPRINT1("An error happened while loading the bootsector from floppy 0, error = %d\n", getAH()); - } - else if (i == 1) - { - /* Boot from 1st HDD drive */ - - setAH(0x02); // Read sectors - setAL(0x01); // Number of sectors - setDH(0x00); // First head - setCH(0x00); // First cylinder - setCL(0x01); // First sector - setDL(0x80); // First HDD drive (used by loader code, so should not be cleared) - setES(0x0000); // Place data in 0000:7C00 - setBX(0x7C00); - BiosDiskService(Stack); - if (!(Stack[STACK_FLAGS] & EMULATOR_FLAG_CF)) goto Quit; - DPRINT1("An error happened while loading the bootsector from HDD 0, error = %d\n", getAH()); - } - // } while (i++ < 1); - } while (i-- > 0); - - /* Clear everything, we are going to load DOS32 */ - setAX(AX); - setBX(BX); - setCX(CX); - setDX(DX); - setES(ES); - Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + /* Boot from 1st floppy drive */ + case 0: + { + setAH(0x02); // Read sectors + setAL(0x01); // Number of sectors + setDH(0x00); // Head 0 + setCH(0x00); // Cylinder 0 + setCL(0x01); // Sector 1 + setDL(0x00); // First diskette drive (used by loader code, so should not be cleared) + setES(0x0000); // Write data in 0000:7C00 + setBX(0x7C00); + BiosDiskService(Stack); + if (!(Stack[STACK_FLAGS] & EMULATOR_FLAG_CF)) goto Quit; + DPRINT1("An error happened while loading the bootsector from floppy 0, error = %d\n", getAH()); + + break; + } + + /* Boot from 1st HDD drive */ + case 1: + { + setAH(0x02); // Read sectors + setAL(0x01); // Number of sectors + setDH(0x00); // Head 0 + setCH(0x00); // Cylinder 0 + setCL(0x01); // Sector 1 + setDL(0x80); // First HDD drive (used by loader code, so should not be cleared) + setES(0x0000); // Write data in 0000:7C00 + setBX(0x7C00); + BiosDiskService(Stack); + if (!(Stack[STACK_FLAGS] & EMULATOR_FLAG_CF)) goto Quit; + DPRINT1("An error happened while loading the bootsector from HDD 0, error = %d\n", getAH()); + + break; + } + + default: + goto StartDos; } + + /* Go to next drive and invalidate the last half-byte. */ + BootOrder = (BootOrder >> 4) | 0xF000; + goto Retry; + +StartDos: + /* Clear everything, we are going to load DOS32 */ + setAX(AX); + setBX(BX); + setCX(CX); + setDX(DX); + setES(ES); + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; /* Load our DOS */ DosBootsectorInitialize(); Quit: /* - * Position CPU to 0000:7C00 to boot the OS. + * Jump to 0000:7C00 to boot the OS. * * Since we are called via the INT32 mechanism, we need to correctly set * CS:IP, not by changing the current one (otherwise the interrupt could Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -80,83 +80,6 @@ VOID DosCharPrint(CHAR Character) { DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); -} - -/* - * This function, derived from ntvdm.c!DisplayMessage, is used by the BIOS and - * the DOS to display messages to an output device. A printer function is given - * for printing the characters. - */ -static VOID -DisplayMessageAnsiV(IN CHAR_PRINT CharPrint, - IN LPCSTR Format, - IN va_list args) -{ - static CHAR CurChar = 0; - LPSTR str; - -#ifndef WIN2K_COMPLIANT - CHAR StaticBuffer[256]; - LPSTR Buffer = StaticBuffer; // Use the static buffer by default. -#else - CHAR Buffer[2048]; // Large enough. If not, increase it by hand. -#endif - size_t MsgLen; - -#ifndef WIN2K_COMPLIANT - /* - * Retrieve the message length and if it is too long, allocate - * an auxiliary buffer; otherwise use the static buffer. - * The string is built to be NULL-terminated. - */ - MsgLen = _vscprintf(Format, args); - if (MsgLen >= ARRAYSIZE(StaticBuffer)) - { - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(CHAR)); - if (Buffer == NULL) - { - /* Allocation failed, use the static buffer and display a suitable error message */ - Buffer = StaticBuffer; - Format = "DisplayMessageAnsi()\nOriginal message is too long and allocating an auxiliary buffer failed."; - MsgLen = strlen(Format); - } - } -#else - MsgLen = ARRAYSIZE(Buffer) - 1; -#endif - - RtlZeroMemory(Buffer, (MsgLen + 1) * sizeof(CHAR)); - _vsnprintf(Buffer, MsgLen, Format, args); - - /* Display the message */ - DPRINT1("\n\nNTVDM DOS32\n%s\n\n", Buffer); - - MsgLen = strlen(Buffer); - str = Buffer; - while (MsgLen--) - { - if (*str == '\n' && CurChar != '\r') - CharPrint('\r'); - - CurChar = *str++; - CharPrint(CurChar); - } - -#ifndef WIN2K_COMPLIANT - /* Free the buffer if needed */ - if (Buffer != StaticBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); -#endif -} - -VOID -DemDisplayMessage(IN CHAR_PRINT CharPrint, - IN LPCSTR Format, ...) -{ - va_list Parameters; - - va_start(Parameters, Format); - DisplayMessageAnsiV(CharPrint, Format, Parameters); - va_end(Parameters); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -29,18 +29,13 @@ /* FUNCTIONS ******************************************************************/ -typedef VOID (*CHAR_PRINT)(IN CHAR Character); VOID BiosCharPrint(CHAR Character); +#define BiosDisplayMessage(Format, ...) \ + PrintMessageAnsi(BiosCharPrint, (Format), ##__VA_ARGS__) + VOID DosCharPrint(CHAR Character); - -VOID DemDisplayMessage(IN CHAR_PRINT CharPrint, - IN LPCSTR Format, ...); - -#define BiosDisplayMessage(Format, ...) \ - DemDisplayMessage(BiosCharPrint, (Format), ##__VA_ARGS__) - #define DosDisplayMessage(Format, ...) \ - DemDisplayMessage(DosCharPrint, (Format), ##__VA_ARGS__) + PrintMessageAnsi(DosCharPrint, (Format), ##__VA_ARGS__) BOOLEAN DosShutdown(BOOLEAN Immediate); Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -564,14 +564,22 @@ } } - /* Mount the available hard disks */ + /* + * Mount the available hard disks. Contrary to floppies, failing + * mounting a hard disk is considered as an unrecoverable error. + */ for (i = 0; i < ARRAYSIZE(GlobalSettings.HardDisks); ++i) { if (GlobalSettings.HardDisks[i].Length != 0 && GlobalSettings.HardDisks[i].Buffer && GlobalSettings.HardDisks[i].Buffer != '\0') { - MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE); + if (!MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE)) + { + wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings); + EmulatorCleanup(); + return FALSE; + } } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -70,6 +70,7 @@ CMOS_REG_BASE_MEMORY_HIGH = 0x16, CMOS_REG_EXT_MEMORY_LOW = 0x17, CMOS_REG_EXT_MEMORY_HIGH = 0x18, + CMOS_REG_SYSOP = 0x2D, CMOS_REG_ACTUAL_EXT_MEMORY_LOW = 0x30, CMOS_REG_ACTUAL_EXT_MEMORY_HIGH = 0x31, CMOS_REG_CENTURY = 0x32, Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -199,7 +199,7 @@ if (FileSize == INVALID_FILE_SIZE && GetLastError() != ERROR_SUCCESS) { /* We failed, bail out */ - DisplayMessage(L"Error when retrieving file size, or size too large (%d).", FileSize); + DisplayMessage(L"MountFDI: Error when retrieving file size, or size too large (%d).", FileSize); return FALSE; } @@ -547,7 +547,11 @@ FileName, hFile != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); /* If we failed, bail out */ - if (hFile == INVALID_HANDLE_VALUE) return FALSE; + if (hFile == INVALID_HANDLE_VALUE) + { + DisplayMessage(L"MountDisk: Error when opening disk file '%S' (Error: %u).", FileName, GetLastError()); + return FALSE; + } /* OK, we have a handle to the file */ @@ -563,7 +567,7 @@ GetLastError() == ERROR_INVALID_FUNCTION) { /* Objects other than real files are not supported */ - DisplayMessage(L"'%S' is not a valid disk file.", FileName); + DisplayMessage(L"MountDisk: '%S' is not a valid disk file.", FileName); goto Quit; } SetLastError(0); @@ -571,7 +575,7 @@ GetLastError() == ERROR_INVALID_FUNCTION) { /* Objects other than real files are not supported */ - DisplayMessage(L"'%S' is not a valid disk file.", FileName); + DisplayMessage(L"MountDisk: '%S' is not a valid disk file.", FileName); goto Quit; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -562,9 +562,9 @@ WCHAR Buffer[2048]; // Large enough. If not, increase it by hand. #endif size_t MsgLen; - va_list Parameters; - - va_start(Parameters, Format); + va_list args; + + va_start(args, Format); #ifndef WIN2K_COMPLIANT /* @@ -572,7 +572,7 @@ * an auxiliary buffer; otherwise use the static buffer. * The string is built to be NULL-terminated. */ - MsgLen = _vscwprintf(Format, Parameters); + MsgLen = _vscwprintf(Format, args); if (MsgLen >= ARRAYSIZE(StaticBuffer)) { Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(WCHAR)); @@ -589,13 +589,83 @@ #endif RtlZeroMemory(Buffer, (MsgLen + 1) * sizeof(WCHAR)); - _vsnwprintf(Buffer, MsgLen, Format, Parameters); - - va_end(Parameters); + _vsnwprintf(Buffer, MsgLen, Format, args); + + va_end(args); /* Display the message */ DPRINT1("\n\nNTVDM Subsystem\n%S\n\n", Buffer); MessageBoxW(hConsoleWnd, Buffer, L"NTVDM Subsystem", MB_OK); + +#ifndef WIN2K_COMPLIANT + /* Free the buffer if needed */ + if (Buffer != StaticBuffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); +#endif +} + +/* + * This function, derived from DisplayMessage, is used by the BIOS and + * the DOS to display messages to an output device. A printer function + * is given for printing the characters. + */ +VOID +PrintMessageAnsi(IN CHAR_PRINT CharPrint, + IN LPCSTR Format, ...) +{ + static CHAR CurChar = 0; + LPSTR str; + +#ifndef WIN2K_COMPLIANT + CHAR StaticBuffer[256]; + LPSTR Buffer = StaticBuffer; // Use the static buffer by default. +#else + CHAR Buffer[2048]; // Large enough. If not, increase it by hand. +#endif + size_t MsgLen; + va_list args; + + va_start(args, Format); + +#ifndef WIN2K_COMPLIANT + /* + * Retrieve the message length and if it is too long, allocate + * an auxiliary buffer; otherwise use the static buffer. + * The string is built to be NULL-terminated. + */ + MsgLen = _vscprintf(Format, args); + if (MsgLen >= ARRAYSIZE(StaticBuffer)) + { + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, (MsgLen + 1) * sizeof(CHAR)); + if (Buffer == NULL) + { + /* Allocation failed, use the static buffer and display a suitable error message */ + Buffer = StaticBuffer; + Format = "DisplayMessageAnsi()\nOriginal message is too long and allocating an auxiliary buffer failed."; + MsgLen = strlen(Format); + } + } +#else + MsgLen = ARRAYSIZE(Buffer) - 1; +#endif + + RtlZeroMemory(Buffer, (MsgLen + 1) * sizeof(CHAR)); + _vsnprintf(Buffer, MsgLen, Format, args); + + va_end(args); + + /* Display the message */ + // DPRINT1("\n\nNTVDM DOS32\n%s\n\n", Buffer); + + MsgLen = strlen(Buffer); + str = Buffer; + while (MsgLen--) + { + if (*str == '\n' && CurChar != '\r') + CharPrint('\r'); + + CurChar = *str++; + CharPrint(CurChar); + } #ifndef WIN2K_COMPLIANT /* Free the buffer if needed */ @@ -877,7 +947,7 @@ } #endif - /* Load global VDM settings */ + /* Load the global VDM settings */ LoadGlobalSettings(&GlobalSettings); DPRINT1("\n\n\nNTVDM - Starting...\n\n\n"); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Thu Oct 1 00:09:24 2015 @@ -94,7 +94,10 @@ /* * Interface functions */ +typedef VOID (*CHAR_PRINT)(IN CHAR Character); VOID DisplayMessage(IN LPCWSTR Format, ...); +VOID PrintMessageAnsi(IN CHAR_PRINT CharPrint, + IN LPCSTR Format, ...); /*static*/ VOID CreateVdmMenu(HANDLE ConOutHandle);

1 0

[aandrejevic] 69420: [FAST486] - Don't forget to push the error code when the exception handler is a task gate. - Use SS0/ESP0, SS1/ESP1, or SS2/ESP2 for ring 0/1/2 code task CALLs.
by aandrejevic＠svn.reactos.org 30 Sep '15

30 Sep '15

Author: aandrejevic Date: Wed Sep 30 21:08:31 2015 New Revision: 69420 URL: http://svn.reactos.org/svn/reactos?rev=69420&view=rev Log: [FAST486] - Don't forget to push the error code when the exception handler is a task gate. - Use SS0/ESP0, SS1/ESP1, or SS2/ESP2 for ring 0/1/2 code task CALLs. 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] Wed Sep 30 21:08:31 2015 @@ -313,7 +313,13 @@ if (IdtEntry->Type == FAST486_TASK_GATE_SIGNATURE) { /* Task call */ - return Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector); + if (!Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector)) + { + /* Exception occurred */ + return FALSE; + } + + goto Finish; } /* Check if the interrupt handler is more privileged or if we're in V86 mode */ @@ -428,7 +434,7 @@ } /* Clear NT */ - State->Flags.Nt = FALSE; + State->Flags.Nt = FALSE; if (OldVm) { @@ -496,6 +502,8 @@ /* Push the instruction pointer */ if (!Fast486StackPushInternal(State, GateSize, OldEip)) return FALSE; + +Finish: if (PushErrorCode) { @@ -908,15 +916,45 @@ State->GeneralRegs[FAST486_REG_ECX].Long = NewTss.Ecx; State->GeneralRegs[FAST486_REG_EDX].Long = NewTss.Edx; State->GeneralRegs[FAST486_REG_EBX].Long = NewTss.Ebx; - State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp; State->GeneralRegs[FAST486_REG_EBP].Long = NewTss.Ebp; State->GeneralRegs[FAST486_REG_ESI].Long = NewTss.Esi; State->GeneralRegs[FAST486_REG_EDI].Long = NewTss.Edi; NewEs = NewTss.Es; NewCs = NewTss.Cs; - NewSs = NewTss.Ss; NewDs = NewTss.Ds; NewLdtr = NewTss.Ldtr; + + if (Type == FAST486_TASK_CALL && State->Cpl < 3) + { + switch (State->Cpl) + { + case 0: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp0; + NewSs = NewTss.Ss0; + break; + } + + case 1: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp1; + NewSs = NewTss.Ss1; + break; + } + + case 2: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp2; + NewSs = NewTss.Ss2; + break; + } + } + } + else + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp; + NewSs = NewTss.Ss; + } } else { @@ -926,15 +964,45 @@ State->GeneralRegs[FAST486_REG_ECX].LowWord = NewLegacyTss->Cx; State->GeneralRegs[FAST486_REG_EDX].LowWord = NewLegacyTss->Dx; State->GeneralRegs[FAST486_REG_EBX].LowWord = NewLegacyTss->Bx; - State->GeneralRegs[FAST486_REG_ESP].LowWord = NewLegacyTss->Sp; State->GeneralRegs[FAST486_REG_EBP].LowWord = NewLegacyTss->Bp; State->GeneralRegs[FAST486_REG_ESI].LowWord = NewLegacyTss->Si; State->GeneralRegs[FAST486_REG_EDI].LowWord = NewLegacyTss->Di; NewEs = NewLegacyTss->Es; NewCs = NewLegacyTss->Cs; - NewSs = NewLegacyTss->Ss; NewDs = NewLegacyTss->Ds; NewLdtr = NewLegacyTss->Ldtr; + + if (Type == FAST486_TASK_CALL && State->Cpl < 3) + { + switch (State->Cpl) + { + case 0: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp0; + NewSs = NewLegacyTss->Ss0; + break; + } + + case 1: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp1; + NewSs = NewLegacyTss->Ss1; + break; + } + + case 2: + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp2; + NewSs = NewLegacyTss->Ss2; + break; + } + } + } + else + { + State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp; + NewSs = NewLegacyTss->Ss; + } } /* Set the NT flag if nesting */

1 0

[gedmurphy] 69419: [DEVMGR] Add typedef for CStringAtlW. Fixes msvc build
by gedmurphy＠svn.reactos.org 30 Sep '15

30 Sep '15

Author: gedmurphy Date: Wed Sep 30 19:55:52 2015 New Revision: 69419 URL: http://svn.reactos.org/svn/reactos?rev=69419&view=rev Log: [DEVMGR] Add typedef for CStringAtlW. Fixes msvc build Modified: trunk/reactos/lib/atl/atlstr.h Modified: trunk/reactos/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlstr.h?rev=69419… ============================================================================== --- trunk/reactos/lib/atl/atlstr.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlstr.h [iso-8859-1] Wed Sep 30 19:55:52 2015 @@ -97,45 +97,26 @@ } }; -// -//template class <typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>> -//class StrTraitATL : -// public StringIterator -//{ -//public: -// static HINSTANCE FindStringResourceInstance(_In_ UINT nID) throw() -// { -// return AtlFindStringResourceInstance(nID); -// } -// -// static IAtlStringMgr* GetDefaultManager() throw() -// { -// return CAtlStringMgr::GetInstance(); -// } -//}; -// -// -//template< typename _CharType = wchar_t> -//class ChTraitsOS : -// public ChTraitsBase<_CharType> -//{ -//protected: -// -//public: -// -//}; -// -//#ifndef _ATL_CSTRING_NO_CRT -// typedef CStringT<wchar_t, StrTraitATL<wchar_t, ChTraitsCRT<wchar_t>>> CAtlStringW; -//#else -// typedef CStringT<wchar_t, StrTraitATL<wchar_t>> CAtlStringW; -//#endif -// -//#ifndef _AFX -// typedef CAtlStringW CStringW; -//#endif + +template <typename _BaseType = char, class StringIterator = ChTraitsOS<_BaseType>> +class StrTraitATL : + public StringIterator +{ +public: + static HINSTANCE FindStringResourceInstance(_In_ UINT nID) throw() + { + return AtlFindStringResourceInstance(nID); + } + + static IAtlStringMgr* GetDefaultManager() throw() + { + return CAtlStringMgr::GetInstance(); + } +}; -} //namespace ATL +typedef CStringT<wchar_t, StrTraitATL<wchar_t, ChTraitsCRT<wchar_t>>> CAtlStringW; + +} #endif

1 0

[pschweitzer] 69418: [CDROM] Properly implement support for IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GET_LENGTH_INFO in CdRomDe...
by pschweitzer＠svn.reactos.org 30 Sep '15

30 Sep '15

Author: pschweitzer Date: Wed Sep 30 16:29:07 2015 New Revision: 69418 URL: http://svn.reactos.org/svn/reactos?rev=69418&view=rev Log: [CDROM] Properly implement support for IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GET_LENGTH_INFO in CdRomDeviceControl CORE-10287 #resolve #comment Fixed with r69418 Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Wed Sep 30 16:29:07 2015 @@ -4727,12 +4727,48 @@ return STATUS_PENDING; } + case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { DebugPrint((2,"CdRomDeviceControl: Get drive geometry\n")); if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof( DISK_GEOMETRY ) ) { + + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject,Irp, NULL,NULL); + + return STATUS_PENDING; + } + + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: + case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: { + + DebugPrint((2,"CdRomDeviceControl: Get drive geometry ex\n")); + + if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof( DISK_GEOMETRY_EX ) ) { + + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject,Irp, NULL,NULL); + + return STATUS_PENDING; + } + + case IOCTL_DISK_GET_LENGTH_INFO: { + + DebugPrint((2,"CdRomDeviceControl: Get length info\n")); + + if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof( GET_LENGTH_INFORMATION ) ) { status = STATUS_INFO_LENGTH_MISMATCH; break;

1 0

[pschweitzer] 69417: [KMTESTS:IO] [KMTESTS:OB] Simplify kernel mode thread creation
by pschweitzer＠svn.reactos.org 29 Sep '15

29 Sep '15

Author: pschweitzer Date: Tue Sep 29 18:43:35 2015 New Revision: 69417 URL: http://svn.reactos.org/svn/reactos?rev=69417&view=rev Log: [KMTESTS:IO] [KMTESTS:OB] Simplify kernel mode thread creation Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c trunk/rostests/kmtests/ntos_ob/ObWait.c Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Tue Sep 29 18:43:35 2015 @@ -871,10 +871,7 @@ START_TEST(IoCreateFile) { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE ThreadHandle; - PVOID ThreadObject = NULL; + PKTHREAD ThreadHandle; TestSymlinks(); @@ -882,36 +879,6 @@ UserModeTest(); /* We've to be in kernel mode, so spawn a thread */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - OBJ_KERNEL_HANDLE, - NULL, - NULL); - Status = PsCreateSystemThread(&ThreadHandle, - SYNCHRONIZE, - &ObjectAttributes, - NULL, - NULL, - KernelModeTest, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - if (Status == STATUS_SUCCESS) - { - /* Then, just wait on our thread to finish */ - Status = ObReferenceObjectByHandle(ThreadHandle, - SYNCHRONIZE, - *PsThreadType, - KernelMode, - &ThreadObject, - NULL); - ObCloseHandle(ThreadHandle, KernelMode); - - Status = KeWaitForSingleObject(ThreadObject, - Executive, - KernelMode, - FALSE, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - ObDereferenceObject(ThreadObject); - } + ThreadHandle = KmtStartThread(KernelModeTest, NULL); + KmtFinishThread(ThreadHandle, NULL); } Modified: trunk/rostests/kmtests/ntos_ob/ObWait.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObWait.c?… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObWait.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ob/ObWait.c [iso-8859-1] Tue Sep 29 18:43:35 2015 @@ -23,42 +23,9 @@ START_TEST(ZwWaitForMultipleObjects) { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE ThreadHandle; - PVOID ThreadObject = NULL; + PKTHREAD ThreadHandle; /* We've to be in kernel mode, so spawn a thread */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - OBJ_KERNEL_HANDLE, - NULL, - NULL); - Status = PsCreateSystemThread(&ThreadHandle, - SYNCHRONIZE, - &ObjectAttributes, - NULL, - NULL, - KernelModeTest, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - if (Status == STATUS_SUCCESS) - { - /* Then, just wait on our thread to finish */ - Status = ObReferenceObjectByHandle(ThreadHandle, - SYNCHRONIZE, - *PsThreadType, - KernelMode, - &ThreadObject, - NULL); - ObCloseHandle(ThreadHandle, KernelMode); - - Status = KeWaitForSingleObject(ThreadObject, - Executive, - KernelMode, - FALSE, - NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - ObDereferenceObject(ThreadObject); - } + ThreadHandle = KmtStartThread(KernelModeTest, NULL); + KmtFinishThread(ThreadHandle, NULL); }

1 0

[sginsberg] 69416: Remove legacy _KeNumberProcessors hack. While we are at it fix its type (CCHAR not UCHAR) and remove it from the NDK as it is a public global provided by the DDK (where we proper...
by sginsberg＠svn.reactos.org 29 Sep '15

29 Sep '15

Author: sginsberg Date: Tue Sep 29 18:34:33 2015 New Revision: 69416 URL: http://svn.reactos.org/svn/reactos?rev=69416&view=rev Log: Remove legacy _KeNumberProcessors hack. While we are at it fix its type (CCHAR not UCHAR) and remove it from the NDK as it is a public global provided by the DDK (where we properly define it with the "__CREATE_NTOS_DATA_IMPORT_ALIAS" fix when needed. Also, the variable KeActiveProcessors is not even exported from NTOS so move it to an internal header. Fix missed fix in UDFS as well in uncompiled file. Modified: trunk/reactos/drivers/filesystems/udfs/dldetect.cpp trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/ke/amd64/kiinit.c trunk/reactos/ntoskrnl/ke/krnlinit.c trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/drivers/filesystems/udfs/dldetect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/dldetect.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/dldetect.cpp [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -50,7 +50,7 @@ /// Initialize deadlock detector VOID DLDInit(ULONG MaxThrdCount /// Maximum supported number of threads ) { - if (*KeNumberProcessors>1) { + if (KeNumberProcessors>1) { KdPrint(("Deadlock Detector is designed for uniprocessor machines only!\n")); BrutePoint(); } Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -324,7 +324,7 @@ NdisSystemProcessorCount( VOID) { - return (CCHAR)KeNumberProcessors; + return KeNumberProcessors; } Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -1480,17 +1480,6 @@ // // Exported Hardware Data // -extern KAFFINITY NTSYSAPI KeActiveProcessors; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) -extern volatile CCHAR NTSYSAPI KeNumberProcessors; -#else -#if (NTDDI_VERSION >= NTDDI_WINXP) -extern CCHAR NTSYSAPI KeNumberProcessors; -#else -//extern PCCHAR KeNumberProcessors; -extern NTSYSAPI CCHAR KeNumberProcessors; //FIXME: Note to Alex: I won't fix this atm, since I prefer to discuss this with you first. -#endif -#endif extern ULONG NTSYSAPI KiDmaIoCoherency; extern ULONG NTSYSAPI KeMaximumIncrement; extern ULONG NTSYSAPI KeMinimumIncrement; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -78,6 +78,7 @@ IN ULONG Length ); +extern KAFFINITY KeActiveProcessors; extern PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead; extern KSPIN_LOCK KiNmiCallbackListLock; extern PVOID KeUserApcDispatcher; Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -88,11 +88,6 @@ /* PNP GUIDs */ #include <umpnpmgr/sysguid.h> -// -// Define the internal versions of external and public global data -// -#define KeNumberProcessors _KeNumberProcessors -extern UCHAR _KeNumberProcessors; #define ExRaiseStatus RtlRaiseStatus // Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -385,7 +385,7 @@ KeLoaderBlock = LoaderBlock; /* Get the current CPU number */ - Cpu = (CCHAR)KeNumberProcessors++; // FIXME + Cpu = KeNumberProcessors++; // FIXME /* LoaderBlock initialization for Cpu 0 */ if (Cpu == 0) Modified: trunk/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/krnlinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/krnlinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/krnlinit.c [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -32,7 +32,7 @@ PKPRCB KiProcessorBlock[MAXIMUM_PROCESSORS]; /* Number of processors */ -UCHAR KeNumberProcessors = 0; +CCHAR KeNumberProcessors = 0; /* NUMA Node Support */ KNODE KiNode0; Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Tue Sep 29 18:34:33 2015 @@ -631,7 +631,7 @@ @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ extern KeLoaderBlock @ cdecl -arch=x86_64 -private KeLowerIrql(long) -@ extern KeNumberProcessors _KeNumberProcessors +@ extern KeNumberProcessors @ stdcall -arch=i386,arm KeProfileInterrupt(ptr) @ stdcall KeProfileInterruptWithSource(ptr long) @ stdcall KePulseEvent(ptr long long)

1 0

[pschweitzer] 69415: [MOUNTMGR] Remove last hack
by pschweitzer＠svn.reactos.org 29 Sep '15

29 Sep '15

Author: pschweitzer Date: Tue Sep 29 18:22:38 2015 New Revision: 69415 URL: http://svn.reactos.org/svn/reactos?rev=69415&view=rev Log: [MOUNTMGR] Remove last hack Modified: trunk/reactos/drivers/filters/mountmgr/database.c trunk/reactos/drivers/filters/mountmgr/mntmgr.h Modified: trunk/reactos/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/database.c [iso-8859-1] Tue Sep 29 18:22:38 2015 @@ -1714,7 +1714,7 @@ Status = IoCreateFile(&Database, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | - FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | + FILE_READ_ATTRIBUTES | FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, &ObjectAttributes, &IoStatusBlock, @@ -1852,7 +1852,7 @@ Status = IoCreateFile(&Database, SYNCHRONIZE | READ_CONTROL | FILE_WRITE_ATTRIBUTES | - FILE_READ_ATTRIBUTES | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | + FILE_READ_ATTRIBUTES | FILE_WRITE_EA | FILE_READ_EA | FILE_APPEND_DATA | FILE_WRITE_DATA | FILE_READ_DATA, &ObjectAttributes, &IoStatusBlock, Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Tue Sep 29 18:22:38 2015 @@ -14,11 +14,6 @@ #else #define INIT_SECTION /* Done via alloc_text for MSC */ #endif - -/* Enter FIXME */ -#define FILE_READ_PROPERTIES 0x00000008 -#define FILE_WRITE_PROPERTIES 0x00000010 -/* Leave FIXME */ typedef struct _DEVICE_EXTENSION {

1 0

[pschweitzer] 69414: [MOUNTMGR] Get rid of a hack, thanks to r69413
by pschweitzer＠svn.reactos.org 29 Sep '15

29 Sep '15

Author: pschweitzer Date: Tue Sep 29 17:30:54 2015 New Revision: 69414 URL: http://svn.reactos.org/svn/reactos?rev=69414&view=rev Log: [MOUNTMGR] Get rid of a hack, thanks to r69413 Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt trunk/reactos/drivers/filters/mountmgr/mntmgr.h Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/C… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Tue Sep 29 17:30:54 2015 @@ -10,7 +10,7 @@ mntmgr.h) add_library(mountmgr SHARED ${SOURCE} mountmgr.rc) -target_link_libraries(mountmgr wdmguid ioevent) +target_link_libraries(mountmgr wdmguid ioevent memcmp) set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) add_pch(mountmgr mntmgr.h SOURCE) Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Tue Sep 29 17:30:54 2015 @@ -16,12 +16,6 @@ #endif /* Enter FIXME */ -#ifdef IsEqualGUID -#undef IsEqualGUID -#endif - -#define IsEqualGUID(rguid1, rguid2) (RtlCompareMemory(rguid1, rguid2, sizeof(GUID)) == sizeof(GUID)) - #define FILE_READ_PROPERTIES 0x00000008 #define FILE_WRITE_PROPERTIES 0x00000010 /* Leave FIXME */

1 0

[tfaber] 69413: [CRT] - Add "memcmp" library that is used by kernel drivers to get memcmp/RtlEqualMemory CORE-10285 #resolve
by tfaber＠svn.reactos.org 29 Sep '15

29 Sep '15

Author: tfaber Date: Tue Sep 29 17:24:48 2015 New Revision: 69413 URL: http://svn.reactos.org/svn/reactos?rev=69413&view=rev Log: [CRT] - Add "memcmp" library that is used by kernel drivers to get memcmp/RtlEqualMemory CORE-10285 #resolve Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/rtl/RtlMemory.c Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Tue Sep 29 17:24:48 2015 @@ -49,6 +49,9 @@ add_dependencies(user32_wsprintf psdk) add_target_compile_definitions(user32_wsprintf _USER32_WSPRINTF) +add_library(memcmp mem/memcmp.c) +add_dependencies(memcmp psdk) + add_library(getopt misc/getopt.c) add_target_compile_definitions(getopt _DLL __USE_CRTIMP) add_dependencies(getopt psdk) Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Sep 29 17:24:48 2015 @@ -85,7 +85,7 @@ add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) set_module_type(kmtest_drv kernelmodedriver) -target_link_libraries(kmtest_drv kmtest_printf chkstk ${PSEH_LIB}) +target_link_libraries(kmtest_drv kmtest_printf chkstk memcmp ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) add_dependencies(kmtest_drv bugcodes xdk) add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) Modified: trunk/rostests/kmtests/rtl/RtlMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlMemory.c?r… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlMemory.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlMemory.c [iso-8859-1] Tue Sep 29 17:24:48 2015 @@ -287,7 +287,19 @@ KeRaiseIrql(HIGH_LEVEL, &Irql); /* RtlEqualMemory */ - /* TODO: where is memcmp? */ + MakePattern(Buffer, 8, HalfSize / 8 - 1, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, + 1, 1, 0x12, + 8, HalfSize / 8, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0, + 1, 7, 0x12, 0); + + ok_bool_true(RtlEqualMemory((PVOID)1, (PVOID)2, 0), + "RtlEqualMemory returned"); + ok_bool_true(RtlEqualMemory(Buffer, Buffer + HalfSize - 7, HalfSize - 8), + "RtlEqualMemory returned"); + ok_bool_true(RtlEqualMemory(Buffer, Buffer + HalfSize - 7, HalfSize - 8 + 1), + "RtlEqualMemory returned"); + ok_bool_false(RtlEqualMemory(Buffer, Buffer + HalfSize - 7, HalfSize - 8 + 2), + "RtlEqualMemory returned"); /* RtlCompareMemory */ MakePattern(Buffer, 8, HalfSize / 8 - 1, 0x12, 0x34, 0x56, 0x78, 0x9A, 0xBC, 0xDE, 0xF0,

1 0

[pschweitzer] 69412: [NTOSKRNL] Don't bugcheck on unimplemented FsRtlOplockFsctrl(), FsRtlCurrentBatchOplock(), FsRtlCheckOplock() Properly implement FsRtlInitializeOplock() (which is no-op on Wind...
by pschweitzer＠svn.reactos.org 29 Sep '15

29 Sep '15

Author: pschweitzer Date: Tue Sep 29 16:28:59 2015 New Revision: 69412 URL: http://svn.reactos.org/svn/reactos?rev=69412&view=rev Log: [NTOSKRNL] Don't bugcheck on unimplemented FsRtlOplockFsctrl(), FsRtlCurrentBatchOplock(), FsRtlCheckOplock() Properly implement FsRtlInitializeOplock() (which is no-op on Windows 2k3) CORE-10284 #resolve #comment Resolved with r69412 Modified: trunk/reactos/ntoskrnl/fsrtl/oplock.c Modified: trunk/reactos/ntoskrnl/fsrtl/oplock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/oplock.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/oplock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/oplock.c [iso-8859-1] Tue Sep 29 16:28:59 2015 @@ -49,7 +49,7 @@ IN POPLOCK_FS_PREPOST_IRP PostIrpRoutine OPTIONAL) { /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -72,13 +72,13 @@ FsRtlCurrentBatchOplock(IN POPLOCK Oplock) { /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return FALSE; } /*++ * @name FsRtlInitializeOplock - * @unimplemented + * @implemented * * FILLME * @@ -94,7 +94,7 @@ NTAPI FsRtlInitializeOplock(IN OUT POPLOCK Oplock) { - UNIMPLEMENTED; + PAGED_CODE(); } /*++ @@ -124,7 +124,7 @@ IN ULONG OpenCount) { /* Unimplemented */ - KeBugCheck(FILE_SYSTEM); + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

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