Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[ion] 59912: [CPORT]: We shouldn't be DPRINT1'ing from the library designed to DPRINT...
by ion＠svn.reactos.org 31 Aug '13

31 Aug '13

Author: ion Date: Sat Aug 31 02:16:04 2013 New Revision: 59912 URL: http://svn.reactos.org/svn/reactos?rev=59912&view=rev Log: [CPORT]: We shouldn't be DPRINT1'ing from the library designed to DPRINT... Modified: trunk/reactos/lib/cportlib/cport.c Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Sat Aug 31 02:16:04 2013 @@ -288,7 +288,7 @@ if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) { /* Not implemented yet */ - DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + //DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); } /* Byte was read */ @@ -311,7 +311,7 @@ if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) // To be removed when this becomes implemented. { /* Not implemented yet */ - DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); + //DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); } /* Wait for LSR to say we can go ahead */

1 0

[aandrejevic] 59911: [SOFT386] Implement port I/O instructions.
by aandrejevic＠svn.reactos.org 31 Aug '13

31 Aug '13

Author: aandrejevic Date: Sat Aug 31 02:13:58 2013 New Revision: 59911 URL: http://svn.reactos.org/svn/reactos?rev=59911&view=rev Log: [SOFT386] Implement port I/O instructions. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Aug 31 02:13:58 2013 @@ -252,18 +252,18 @@ NULL, // TODO: OPCODE 0xE1 NOT SUPPORTED NULL, // TODO: OPCODE 0xE2 NOT SUPPORTED NULL, // TODO: OPCODE 0xE3 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE5 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xE7 NOT SUPPORTED + Soft386OpcodeInByte, + Soft386OpcodeIn, + Soft386OpcodeOutByte, + Soft386OpcodeOut, NULL, // TODO: OPCODE 0xE8 NOT SUPPORTED NULL, // TODO: OPCODE 0xE9 NOT SUPPORTED NULL, // TODO: OPCODE 0xEA NOT SUPPORTED NULL, // TODO: OPCODE 0xEB NOT SUPPORTED - NULL, // TODO: OPCODE 0xEC NOT SUPPORTED - NULL, // TODO: OPCODE 0xED NOT SUPPORTED - NULL, // TODO: OPCODE 0xEE NOT SUPPORTED - NULL, // TODO: OPCODE 0xEF NOT SUPPORTED + Soft386OpcodeInByte, + Soft386OpcodeIn, + Soft386OpcodeOutByte, + Soft386OpcodeOut, Soft386OpcodePrefix, NULL, // Invalid Soft386OpcodePrefix, @@ -944,3 +944,205 @@ /* Return success */ return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeInByte(PSOFT386_STATE State, UCHAR Opcode) +{ + UCHAR Data; + ULONG Port; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF7) == 0xE4); + + if (Opcode == 0xE4) + { + /* Fetch the parameter */ + if (!Soft386FetchByte(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the port number to the parameter */ + Port = Data; + } + else + { + /* The port number is in DX */ + Port = State->GeneralRegs[SOFT386_REG_EDX].LowWord; + } + + /* Read a byte from the I/O port */ + State->IoReadCallback(State, Port, &Data, sizeof(UCHAR)); + + /* Store the result in AL */ + State->GeneralRegs[SOFT386_REG_EAX].LowByte = Data; + + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeIn(PSOFT386_STATE State, UCHAR Opcode) +{ + ULONG Port; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF7) == 0xE5); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Opcode == 0xE5) + { + UCHAR Data; + + /* Fetch the parameter */ + if (!Soft386FetchByte(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the port number to the parameter */ + Port = Data; + } + else + { + /* The port number is in DX */ + Port = State->GeneralRegs[SOFT386_REG_EDX].LowWord; + } + + if (Size) + { + ULONG Data; + + /* Read a dword from the I/O port */ + State->IoReadCallback(State, Port, &Data, sizeof(ULONG)); + + /* Store the value in EAX */ + State->GeneralRegs[SOFT386_REG_EAX].Long = Data; + } + else + { + USHORT Data; + + /* Read a word from the I/O port */ + State->IoReadCallback(State, Port, &Data, sizeof(USHORT)); + + /* Store the value in AX */ + State->GeneralRegs[SOFT386_REG_EAX].LowWord = Data; + } + + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeOutByte(PSOFT386_STATE State, UCHAR Opcode) +{ + UCHAR Data; + ULONG Port; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF7) == 0xE6); + + if (Opcode == 0xE6) + { + /* Fetch the parameter */ + if (!Soft386FetchByte(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the port number to the parameter */ + Port = Data; + } + else + { + /* The port number is in DX */ + Port = State->GeneralRegs[SOFT386_REG_EDX].LowWord; + } + + /* Read the value from AL */ + Data = State->GeneralRegs[SOFT386_REG_EAX].LowByte; + + /* Write the byte to the I/O port */ + State->IoWriteCallback(State, Port, &Data, sizeof(UCHAR)); + + return TRUE; +} + +BOOLEAN +FASTCALL +Soft386OpcodeOut(PSOFT386_STATE State, UCHAR Opcode) +{ + ULONG Port; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF7) == 0xE7); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Opcode == 0xE7) + { + UCHAR Data; + + /* Fetch the parameter */ + if (!Soft386FetchByte(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Set the port number to the parameter */ + Port = Data; + } + else + { + /* The port number is in DX */ + Port = State->GeneralRegs[SOFT386_REG_EDX].LowWord; + } + + if (Size) + { + /* Get the value from EAX */ + ULONG Data = State->GeneralRegs[SOFT386_REG_EAX].Long; + + /* Write a dword to the I/O port */ + State->IoReadCallback(State, Port, &Data, sizeof(ULONG)); + } + else + { + /* Get the value from AX */ + USHORT Data = State->GeneralRegs[SOFT386_REG_EAX].LowWord; + + /* Write a word to the I/O port */ + State->IoWriteCallback(State, Port, &Data, sizeof(USHORT)); + } + + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Sat Aug 31 02:13:58 2013 @@ -151,4 +151,36 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeInByte +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeIn +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeOutByte +( + PSOFT386_STATE State, + UCHAR Opcode +); + +BOOLEAN +FASTCALL +Soft386OpcodeOut +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

1 0

[spetreolle] 59910: configure: remove bashism.
by spetreolle＠svn.reactos.org 31 Aug '13

31 Aug '13

Author: spetreolle Date: Sat Aug 31 00:05:29 2013 New Revision: 59910 URL: http://svn.reactos.org/svn/reactos?rev=59910&view=rev Log: configure: remove bashism. Modified: trunk/reactos/configure.sh Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59910&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sat Aug 31 00:05:29 2013 @@ -21,14 +21,14 @@ -D) shift if echo "x$1" | grep 'x?*=*' > /dev/null; then - ROS_CMAKEOPTS+=" -D $1" + ROS_CMAKEOPTS=$ROS_CMAKEOPTS" -D $1" else usage fi ;; -D?*=*|-D?*) - ROS_CMAKEOPTS+=" $1" + ROS_CMAKEOPTS=$ROS_CMAKEOPTS" $1" ;; makefiles|Makefiles) CMAKE_GENERATOR="Unix Makefiles"

1 0

[ion] 59909: [NTOSKRNL]: Forcefully set IMAGE_DLLCHARACTERISTICS_NO_ISOLATION on all images. See comment for more information. Windows' kernel32.dll now beautifully loads to the ReactOS winlogon sc...
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 19:54:44 2013 New Revision: 59909 URL: http://svn.reactos.org/svn/reactos?rev=59909&view=rev Log: [NTOSKRNL]: Forcefully set IMAGE_DLLCHARACTERISTICS_NO_ISOLATION on all images. See comment for more information. Windows' kernel32.dll now beautifully loads to the ReactOS winlogon screen (which nobody should ever see -- it's being shown because RtlDefaultNpAcl is not implemented in ReactOS, and thus all named pipes die (SCM, etc...) Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Aug 30 19:54:44 2013 @@ -437,7 +437,22 @@ ImageSectionObject->ImageInformation.LoaderFlags = piohOptHeader->LoaderFlags; if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, DllCharacteristics)) + { ImageSectionObject->ImageInformation.DllCharacteristics = piohOptHeader->DllCharacteristics; + + /* + * Since we don't really implement SxS yet and LD doesn't supoprt /ALLOWISOLATION:NO, hard-code + * this flag here, which will prevent the loader and other code from doing any .manifest or SxS + * magic to any binary. + * + * This will break applications that depend on SxS when running with real Windows Kernel32/SxS/etc + * but honestly that's not tested. It will also break them when running no ReactOS once we implement + * the SxS support -- at which point, duh, this should be removed. + * + * But right now, any app depending on SxS is already broken anyway, so this flag only helps. + */ + ImageSectionObject->ImageInformation.DllCharacteristics |= IMAGE_DLLCHARACTERISTICS_NO_ISOLATION; + } break; }

1 0

[ion] 59908: [HIVESYS]: Set Session Manager\AppCompatibility, DisableAppCompat = TRUE in ReactOS, which avoids Kernel32 from doing app compat stuff.
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 19:37:03 2013 New Revision: 59908 URL: http://svn.reactos.org/svn/reactos?rev=59908&view=rev Log: [HIVESYS]: Set Session Manager\AppCompatibility, DisableAppCompat = TRUE in ReactOS, which avoids Kernel32 from doing app compat stuff. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri Aug 30 19:37:03 2013 @@ -1252,6 +1252,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Required",0x00010000,"Debug","Windows" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\SubSystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" + +; App Compat -- Disable on ReactOS +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\AppCompatibility","DisableAppCompat",0x00010003, 0x00000001 ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,""

1 0

[hbelusca] 59907: [CONSRV]: Stubplement the remaining APIs needed for Windows kernel32.
by hbelusca＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: hbelusca Date: Fri Aug 30 17:53:45 2013 New Revision: 59907 URL: http://svn.reactos.org/svn/reactos?rev=59907&view=rev Log: [CONSRV]: Stubplement the remaining APIs needed for Windows kernel32. Added: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c (with props) Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/winsrv/consrv.cmake trunk/reactos/win32ss/user/winsrv/consrv/api.h trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -16,7 +16,6 @@ #define CONSRV_FIRST_API_NUMBER 512 // Windows Server 2003 table from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 -// plus a little bit of Windows 7. typedef enum _CONSRV_API_NUMBER { ConsolepOpenConsole = CONSRV_FIRST_API_NUMBER, @@ -28,14 +27,14 @@ ConsolepWriteConsoleOutputString, ConsolepFillConsoleOutput, ConsolepGetMode, - // ConsolepGetNumberOfFonts, + ConsolepGetNumberOfFonts, ConsolepGetNumberOfInputEvents, ConsolepGetScreenBufferInfo, ConsolepGetCursorInfo, - // ConsolepGetMouseInfo, - // ConsolepGetFontInfo, - // ConsolepGetFontSize, - // ConsolepGetCurrentFont, + ConsolepGetMouseInfo, + ConsolepGetFontInfo, + ConsolepGetFontSize, + ConsolepGetCurrentFont, ConsolepSetMode, ConsolepSetActiveScreenBuffer, ConsolepFlushInputBuffer, @@ -46,28 +45,28 @@ ConsolepSetWindowInfo, ConsolepScrollScreenBuffer, ConsolepSetTextAttribute, - // ConsolepSetFont, + ConsolepSetFont, ConsolepSetIcon, ConsolepReadConsole, ConsolepWriteConsole, ConsolepDuplicateHandle, - // ConsolepGetHandleInformation, - // ConsolepSetHandleInformation, + ConsolepGetHandleInformation, + ConsolepSetHandleInformation, ConsolepCloseHandle, ConsolepVerifyIoHandle, - ConsolepAlloc, - ConsolepFree, + ConsolepAlloc, // Not present in Win7 + ConsolepFree, // Not present in Win7 ConsolepGetTitle, ConsolepSetTitle, ConsolepCreateScreenBuffer, ConsolepInvalidateBitMapRect, - // ConsolepVDMOperation, + ConsolepVDMOperation, ConsolepSetCursor, ConsolepShowCursor, ConsolepMenuControl, ConsolepSetPalette, ConsolepSetDisplayMode, - // ConsolepRegisterVDM, + ConsolepRegisterVDM, ConsolepGetHardwareState, ConsolepSetHardwareState, ConsolepGetDisplayMode, @@ -81,31 +80,36 @@ ConsolepSetNumberOfCommands, ConsolepGetCommandHistoryLength, ConsolepGetCommandHistory, - // ConsolepSetCommandHistoryMode, + ConsolepSetCommandHistoryMode, // Not present in Vista+ ConsolepGetCP, ConsolepSetCP, - // ConsolepSetKeyShortcuts, + ConsolepSetKeyShortcuts, ConsolepSetMenuClose, - // ConsolepNotifyLastClose, + ConsolepNotifyLastClose, ConsolepGenerateCtrlEvent, - // ConsolepGetKeyboardLayoutName, + ConsolepGetKeyboardLayoutName, ConsolepGetConsoleWindow, - // ConsolepCharType, - // ConsolepSetLocalEUDC, - // ConsolepSetCursorMode, - // ConsolepGetCursorMode, - // ConsolepRegisterOS2, - // ConsolepSetOS2OemFormat, - // ConsolepGetNlsMode, - // ConsolepSetNlsMode, - // ConsolepRegisterConsoleIME, - // ConsolepUnregisterConsoleIME, - // ConsolepGetLangId, - ConsolepAttach, + ConsolepCharType, + ConsolepSetLocalEUDC, + ConsolepSetCursorMode, + ConsolepGetCursorMode, + ConsolepRegisterOS2, + ConsolepSetOS2OemFormat, + ConsolepGetNlsMode, + ConsolepSetNlsMode, + ConsolepRegisterConsoleIME, // Not present in Win7 + ConsolepUnregisterConsoleIME, // Not present in Win7 + // ConsolepQueryConsoleIME, // Added only in Vista and Win2k8, not present in Win7 + ConsolepGetLangId, + ConsolepAttach, // Not present in Win7 ConsolepGetSelectionInfo, ConsolepGetProcessList, - ConsolepGetHistory, - ConsolepSetHistory, + + ConsolepGetHistory, // Added in Vista+ + ConsolepSetHistory, // Added in Vista+ + // ConsolepSetCurrentFont, // Added in Vista+ + // ConsolepSetScreenBufferInfo, // Added in Vista+ + // ConsolepClientConnect, // Added in Win7 ConsolepMaxApiNumber } CONSRV_API_NUMBER, *PCONSRV_API_NUMBER; Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -14,6 +14,7 @@ consrv/init.c consrv/lineinput.c consrv/settings.c + consrv/subsysreg.c consrv/condrv/coninput.c consrv/condrv/conoutput.c consrv/condrv/console.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/api.h [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -39,8 +39,9 @@ CSR_API(SrvCreateConsoleScreenBuffer); CSR_API(SrvGetConsoleScreenBufferInfo); CSR_API(SrvSetConsoleActiveScreenBuffer); +CSR_API(SrvSetConsoleScreenBufferSize); CSR_API(SrvScrollConsoleScreenBuffer); -CSR_API(SrvSetConsoleScreenBufferSize); +CSR_API(SrvSetConsoleWindowInfo); /* console.c */ CSR_API(SrvAllocConsole); @@ -50,6 +51,24 @@ CSR_API(SrvSetConsoleMode); CSR_API(SrvGetConsoleTitle); CSR_API(SrvSetConsoleTitle); +CSR_API(SrvGetConsoleCP); +CSR_API(SrvSetConsoleCP); +CSR_API(SrvGetConsoleProcessList); +CSR_API(SrvGenerateConsoleCtrlEvent); +CSR_API(SrvConsoleNotifyLastClose); + +CSR_API(SrvGetConsoleMouseInfo); +CSR_API(SrvSetConsoleKeyShortcuts); +CSR_API(SrvGetConsoleKeyboardLayoutName); +CSR_API(SrvGetConsoleCharType); +CSR_API(SrvSetConsoleLocalEUDC); +CSR_API(SrvSetConsoleCursorMode); +CSR_API(SrvGetConsoleCursorMode); +CSR_API(SrvGetConsoleNlsMode); +CSR_API(SrvSetConsoleNlsMode); +CSR_API(SrvGetConsoleLangId); + +/* frontendctl.c */ CSR_API(SrvGetConsoleHardwareState); CSR_API(SrvSetConsoleHardwareState); CSR_API(SrvGetConsoleDisplayMode); @@ -59,20 +78,23 @@ CSR_API(SrvSetConsoleCursor); CSR_API(SrvConsoleMenuControl); CSR_API(SrvSetConsoleMenuClose); -CSR_API(SrvSetConsoleWindowInfo); CSR_API(SrvGetConsoleWindow); CSR_API(SrvSetConsoleIcon); -CSR_API(SrvGetConsoleCP); -CSR_API(SrvSetConsoleCP); -CSR_API(SrvGetConsoleProcessList); -CSR_API(SrvGenerateConsoleCtrlEvent); CSR_API(SrvGetConsoleSelectionInfo); + +CSR_API(SrvGetConsoleNumberOfFonts); +CSR_API(SrvGetConsoleFontInfo); +CSR_API(SrvGetConsoleFontSize); +CSR_API(SrvGetConsoleCurrentFont); +CSR_API(SrvSetConsoleFont); /* handle.c */ CSR_API(SrvOpenConsole); +CSR_API(SrvDuplicateHandle); +CSR_API(SrvGetHandleInformation); +CSR_API(SrvSetHandleInformation); CSR_API(SrvCloseHandle); CSR_API(SrvVerifyConsoleIoHandle); -CSR_API(SrvDuplicateHandle); /* lineinput.c */ CSR_API(SrvGetConsoleCommandHistory); @@ -81,5 +103,14 @@ CSR_API(SrvSetConsoleNumberOfCommands); CSR_API(SrvGetConsoleHistory); CSR_API(SrvSetConsoleHistory); +CSR_API(SrvSetConsoleCommandHistoryMode); + +/* subsysreg.c */ +CSR_API(SrvRegisterConsoleVDM); +CSR_API(SrvVDMConsoleOperation); +CSR_API(SrvRegisterConsoleOS2); +CSR_API(SrvSetConsoleOS2OemFormat); +CSR_API(SrvRegisterConsoleIME); +CSR_API(SrvUnregisterConsoleIME); /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -647,4 +647,72 @@ return Status; } +CSR_API(SrvConsoleNotifyLastClose) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + + + +CSR_API(SrvGetConsoleMouseInfo) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetConsoleKeyShortcuts) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleKeyboardLayoutName) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleCharType) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetConsoleLocalEUDC) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetConsoleCursorMode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleCursorMode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleNlsMode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetConsoleNlsMode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleLangId) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -328,4 +328,36 @@ return Status; } + + +CSR_API(SrvGetConsoleNumberOfFonts) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleFontInfo) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleFontSize) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvGetConsoleCurrentFont) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetConsoleFont) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/handle.c [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -744,62 +744,6 @@ return Status; } -CSR_API(SrvCloseHandle) -{ - NTSTATUS Status; - PCONSOLE_CLOSEHANDLE CloseHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CloseHandleRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PCONSOLE Console; - - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Can't get console\n"); - return Status; - } - - Status = ConSrvRemoveObject(ProcessData, CloseHandleRequest->ConsoleHandle); - - ConSrvReleaseConsole(Console, TRUE); - return Status; -} - -CSR_API(SrvVerifyConsoleIoHandle) -{ - NTSTATUS Status; - PCONSOLE_VERIFYHANDLE VerifyHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.VerifyHandleRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); - PCONSOLE Console; - - HANDLE ConsoleHandle = VerifyHandleRequest->ConsoleHandle; - ULONG Index = HandleToULong(ConsoleHandle) >> 2; - - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Can't get console\n"); - return Status; - } - - RtlEnterCriticalSection(&ProcessData->HandleTableLock); - - // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || - // (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); - - if (!IsConsoleHandle(ConsoleHandle) || - Index >= ProcessData->HandleTableSize || - ProcessData->HandleTable[Index].Object == NULL) - { - DPRINT("SrvVerifyConsoleIoHandle failed\n"); - Status = STATUS_INVALID_HANDLE; - } - - RtlLeaveCriticalSection(&ProcessData->HandleTableLock); - - ConSrvReleaseConsole(Console, TRUE); - return Status; -} - CSR_API(SrvDuplicateHandle) { NTSTATUS Status; @@ -871,4 +815,72 @@ return Status; } +CSR_API(SrvGetHandleInformation) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetHandleInformation) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvCloseHandle) +{ + NTSTATUS Status; + PCONSOLE_CLOSEHANDLE CloseHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.CloseHandleRequest; + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + + Status = ConSrvRemoveObject(ProcessData, CloseHandleRequest->ConsoleHandle); + + ConSrvReleaseConsole(Console, TRUE); + return Status; +} + +CSR_API(SrvVerifyConsoleIoHandle) +{ + NTSTATUS Status; + PCONSOLE_VERIFYHANDLE VerifyHandleRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.VerifyHandleRequest; + PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); + PCONSOLE Console; + + HANDLE ConsoleHandle = VerifyHandleRequest->ConsoleHandle; + ULONG Index = HandleToULong(ConsoleHandle) >> 2; + + Status = ConSrvGetConsole(ProcessData, &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + + // ASSERT( (ProcessData->HandleTable == NULL && ProcessData->HandleTableSize == 0) || + // (ProcessData->HandleTable != NULL && ProcessData->HandleTableSize != 0) ); + + if (!IsConsoleHandle(ConsoleHandle) || + Index >= ProcessData->HandleTableSize || + ProcessData->HandleTable[Index].Object == NULL) + { + DPRINT("SrvVerifyConsoleIoHandle failed\n"); + Status = STATUS_INVALID_HANDLE; + } + + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); + + ConSrvReleaseConsole(Console, TRUE); + return Status; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -26,7 +26,6 @@ HANDLE ConSrvHeap = NULL; // Our own heap. // Windows Server 2003 table from http://j00ru.vexillium.org/csrss_list/api_list.html#Windows_2k3 -// plus a little bit of Windows 7. PCSR_API_ROUTINE ConsoleServerApiDispatchTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = { SrvOpenConsole, @@ -38,14 +37,14 @@ SrvWriteConsoleOutputString, SrvFillConsoleOutput, SrvGetConsoleMode, - // SrvGetConsoleNumberOfFonts, + SrvGetConsoleNumberOfFonts, SrvGetConsoleNumberOfInputEvents, SrvGetConsoleScreenBufferInfo, SrvGetConsoleCursorInfo, - // SrvGetConsoleMouseInfo, - // SrvGetConsoleFontInfo, - // SrvGetConsoleFontSize, - // SrvGetConsoleCurrentFont, + SrvGetConsoleMouseInfo, + SrvGetConsoleFontInfo, + SrvGetConsoleFontSize, + SrvGetConsoleCurrentFont, SrvSetConsoleMode, SrvSetConsoleActiveScreenBuffer, SrvFlushConsoleInputBuffer, @@ -56,28 +55,28 @@ SrvSetConsoleWindowInfo, SrvScrollConsoleScreenBuffer, SrvSetConsoleTextAttribute, - // SrvSetConsoleFont, + SrvSetConsoleFont, SrvSetConsoleIcon, SrvReadConsole, SrvWriteConsole, SrvDuplicateHandle, - // SrvGetHandleInformation, - // SrvSetHandleInformation, + SrvGetHandleInformation, + SrvSetHandleInformation, SrvCloseHandle, SrvVerifyConsoleIoHandle, - SrvAllocConsole, - SrvFreeConsole, + SrvAllocConsole, // Not present in Win7 + SrvFreeConsole, // Not present in Win7 SrvGetConsoleTitle, SrvSetConsoleTitle, SrvCreateConsoleScreenBuffer, SrvInvalidateBitMapRect, - // SrvVDMConsoleOperation, + SrvVDMConsoleOperation, SrvSetConsoleCursor, SrvShowConsoleCursor, SrvConsoleMenuControl, SrvSetConsolePalette, SrvSetConsoleDisplayMode, - // SrvRegisterConsoleVDM, + SrvRegisterConsoleVDM, SrvGetConsoleHardwareState, SrvSetConsoleHardwareState, SrvGetConsoleDisplayMode, @@ -91,31 +90,36 @@ SrvSetConsoleNumberOfCommands, SrvGetConsoleCommandHistoryLength, SrvGetConsoleCommandHistory, - // SrvSetConsoleCommandHistoryMode, + SrvSetConsoleCommandHistoryMode, // Not present in Vista+ SrvGetConsoleCP, SrvSetConsoleCP, - // SrvSetConsoleKeyShortcuts, + SrvSetConsoleKeyShortcuts, SrvSetConsoleMenuClose, - // SrvConsoleNotifyLastClose, + SrvConsoleNotifyLastClose, SrvGenerateConsoleCtrlEvent, - // SrvGetConsoleKeyboardLayoutName, + SrvGetConsoleKeyboardLayoutName, SrvGetConsoleWindow, - // SrvGetConsoleCharType, - // SrvSetConsoleLocalEUDC, - // SrvSetConsoleCursorMode, - // SrvGetConsoleCursorMode, - // SrvRegisterConsoleOS2, - // SrvSetConsoleOS2OemFormat, - // SrvGetConsoleNlsMode, - // SrvSetConsoleNlsMode, - // SrvRegisterConsoleIME, - // SrvUnregisterConsoleIME, - // SrvGetConsoleLangId, - SrvAttachConsole, + SrvGetConsoleCharType, + SrvSetConsoleLocalEUDC, + SrvSetConsoleCursorMode, + SrvGetConsoleCursorMode, + SrvRegisterConsoleOS2, + SrvSetConsoleOS2OemFormat, + SrvGetConsoleNlsMode, + SrvSetConsoleNlsMode, + SrvRegisterConsoleIME, // Not present in Win7 + SrvUnregisterConsoleIME, // Not present in Win7 + // SrvQueryConsoleIME, // Added only in Vista and Win2k8, not present in Win7 + SrvGetConsoleLangId, + SrvAttachConsole, // Not present in Win7 SrvGetConsoleSelectionInfo, SrvGetConsoleProcessList, - SrvGetConsoleHistory, - SrvSetConsoleHistory, + + SrvGetConsoleHistory, // Added in Vista+ + SrvSetConsoleHistory, // Added in Vista+ + // SrvSetConsoleCurrentFont, // Added in Vista+ + // SrvSetScreenBufferInfo, // Added in Vista+ + // SrvConsoleClientConnect, // Added in Win7 }; BOOLEAN ConsoleServerApiServerValidTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = @@ -129,14 +133,14 @@ FALSE, // SrvWriteConsoleOutputString, FALSE, // SrvFillConsoleOutput, FALSE, // SrvGetConsoleMode, - // FALSE, // SrvGetConsoleNumberOfFonts, + FALSE, // SrvGetConsoleNumberOfFonts, FALSE, // SrvGetConsoleNumberOfInputEvents, FALSE, // SrvGetConsoleScreenBufferInfo, FALSE, // SrvGetConsoleCursorInfo, - // FALSE, // SrvGetConsoleMouseInfo, - // FALSE, // SrvGetConsoleFontInfo, - // FALSE, // SrvGetConsoleFontSize, - // FALSE, // SrvGetConsoleCurrentFont, + FALSE, // SrvGetConsoleMouseInfo, + FALSE, // SrvGetConsoleFontInfo, + FALSE, // SrvGetConsoleFontSize, + FALSE, // SrvGetConsoleCurrentFont, FALSE, // SrvSetConsoleMode, FALSE, // SrvSetConsoleActiveScreenBuffer, FALSE, // SrvFlushConsoleInputBuffer, @@ -147,13 +151,13 @@ FALSE, // SrvSetConsoleWindowInfo, FALSE, // SrvScrollConsoleScreenBuffer, FALSE, // SrvSetConsoleTextAttribute, - // FALSE, // SrvSetConsoleFont, + FALSE, // SrvSetConsoleFont, FALSE, // SrvSetConsoleIcon, FALSE, // SrvReadConsole, FALSE, // SrvWriteConsole, FALSE, // SrvDuplicateHandle, - // FALSE, // SrvGetHandleInformation, - // FALSE, // SrvSetHandleInformation, + FALSE, // SrvGetHandleInformation, + FALSE, // SrvSetHandleInformation, FALSE, // SrvCloseHandle, FALSE, // SrvVerifyConsoleIoHandle, FALSE, // SrvAllocConsole, @@ -162,13 +166,13 @@ FALSE, // SrvSetConsoleTitle, FALSE, // SrvCreateConsoleScreenBuffer, FALSE, // SrvInvalidateBitMapRect, - // FALSE, // SrvVDMConsoleOperation, + FALSE, // SrvVDMConsoleOperation, FALSE, // SrvSetConsoleCursor, FALSE, // SrvShowConsoleCursor, FALSE, // SrvConsoleMenuControl, FALSE, // SrvSetConsolePalette, FALSE, // SrvSetConsoleDisplayMode, - // FALSE, // SrvRegisterConsoleVDM, + FALSE, // SrvRegisterConsoleVDM, FALSE, // SrvGetConsoleHardwareState, FALSE, // SrvSetConsoleHardwareState, TRUE, // SrvGetConsoleDisplayMode, @@ -182,31 +186,36 @@ FALSE, // SrvSetConsoleNumberOfCommands, FALSE, // SrvGetConsoleCommandHistoryLength, FALSE, // SrvGetConsoleCommandHistory, - // FALSE, // SrvSetConsoleCommandHistoryMode, + FALSE, // SrvSetConsoleCommandHistoryMode, FALSE, // SrvGetConsoleCP, FALSE, // SrvSetConsoleCP, - // FALSE, // SrvSetConsoleKeyShortcuts, + FALSE, // SrvSetConsoleKeyShortcuts, FALSE, // SrvSetConsoleMenuClose, - // FALSE, // SrvConsoleNotifyLastClose, + FALSE, // SrvConsoleNotifyLastClose, FALSE, // SrvGenerateConsoleCtrlEvent, - // FALSE, // SrvGetConsoleKeyboardLayoutName, + FALSE, // SrvGetConsoleKeyboardLayoutName, FALSE, // SrvGetConsoleWindow, - // FALSE, // SrvGetConsoleCharType, - // FALSE, // SrvSetConsoleLocalEUDC, - // FALSE, // SrvSetConsoleCursorMode, - // FALSE, // SrvGetConsoleCursorMode, - // FALSE, // SrvRegisterConsoleOS2, - // FALSE, // SrvSetConsoleOS2OemFormat, - // FALSE, // SrvGetConsoleNlsMode, - // FALSE, // SrvSetConsoleNlsMode, - // FALSE, // SrvRegisterConsoleIME, - // FALSE, // SrvUnregisterConsoleIME, - // FALSE, // SrvGetConsoleLangId, + FALSE, // SrvGetConsoleCharType, + FALSE, // SrvSetConsoleLocalEUDC, + FALSE, // SrvSetConsoleCursorMode, + FALSE, // SrvGetConsoleCursorMode, + FALSE, // SrvRegisterConsoleOS2, + FALSE, // SrvSetConsoleOS2OemFormat, + FALSE, // SrvGetConsoleNlsMode, + FALSE, // SrvSetConsoleNlsMode, + FALSE, // SrvRegisterConsoleIME, + FALSE, // SrvUnregisterConsoleIME, + // FALSE, // SrvQueryConsoleIME, + FALSE, // SrvGetConsoleLangId, FALSE, // SrvAttachConsole, FALSE, // SrvGetConsoleSelectionInfo, FALSE, // SrvGetConsoleProcessList, + FALSE, // SrvGetConsoleHistory, FALSE, // SrvSetConsoleHistory + // FALSE, // SrvSetConsoleCurrentFont, + // FALSE, // SrvSetScreenBufferInfo, + // FALSE, // SrvConsoleClientConnect, }; PCHAR ConsoleServerApiNameTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = @@ -220,14 +229,14 @@ "WriteConsoleOutputString", "FillConsoleOutput", "GetConsoleMode", - // "GetConsoleNumberOfFonts", + "GetConsoleNumberOfFonts", "GetConsoleNumberOfInputEvents", "GetConsoleScreenBufferInfo", "GetConsoleCursorInfo", - // "GetConsoleMouseInfo", - // "GetConsoleFontInfo", - // "GetConsoleFontSize", - // "GetConsoleCurrentFont", + "GetConsoleMouseInfo", + "GetConsoleFontInfo", + "GetConsoleFontSize", + "GetConsoleCurrentFont", "SetConsoleMode", "SetConsoleActiveScreenBuffer", "FlushConsoleInputBuffer", @@ -238,13 +247,13 @@ "SetConsoleWindowInfo", "ScrollConsoleScreenBuffer", "SetConsoleTextAttribute", - // "SetConsoleFont", + "SetConsoleFont", "SetConsoleIcon", "ReadConsole", "WriteConsole", "DuplicateHandle", - // "GetHandleInformation", - // "SetHandleInformation", + "GetHandleInformation", + "SetHandleInformation", "CloseHandle", "VerifyConsoleIoHandle", "AllocConsole", @@ -253,13 +262,13 @@ "SetConsoleTitle", "CreateConsoleScreenBuffer", "InvalidateBitMapRect", - // "VDMConsoleOperation", + "VDMConsoleOperation", "SetConsoleCursor", "ShowConsoleCursor", "ConsoleMenuControl", "SetConsolePalette", "SetConsoleDisplayMode", - // "RegisterConsoleVDM", + "RegisterConsoleVDM", "GetConsoleHardwareState", "SetConsoleHardwareState", "GetConsoleDisplayMode", @@ -273,31 +282,36 @@ "SetConsoleNumberOfCommands", "GetConsoleCommandHistoryLength", "GetConsoleCommandHistory", - // "SetConsoleCommandHistoryMode", + "SetConsoleCommandHistoryMode", "GetConsoleCP", "SetConsoleCP", - // "SetConsoleKeyShortcuts", + "SetConsoleKeyShortcuts", "SetConsoleMenuClose", - // "ConsoleNotifyLastClose", + "ConsoleNotifyLastClose", "GenerateConsoleCtrlEvent", - // "GetConsoleKeyboardLayoutName", + "GetConsoleKeyboardLayoutName", "GetConsoleWindow", - // "GetConsoleCharType", - // "SetConsoleLocalEUDC", - // "SetConsoleCursorMode", - // "GetConsoleCursorMode", - // "RegisterConsoleOS2", - // "SetConsoleOS2OemFormat", - // "GetConsoleNlsMode", - // "SetConsoleNlsMode", - // "RegisterConsoleIME", - // "UnregisterConsoleIME", - // "GetConsoleLangId", + "GetConsoleCharType", + "SetConsoleLocalEUDC", + "SetConsoleCursorMode", + "GetConsoleCursorMode", + "RegisterConsoleOS2", + "SetConsoleOS2OemFormat", + "GetConsoleNlsMode", + "SetConsoleNlsMode", + "RegisterConsoleIME", + "UnregisterConsoleIME", + // "QueryConsoleIME", + "GetConsoleLangId", "AttachConsole", "GetConsoleSelectionInfo", "GetConsoleProcessList", + "GetConsoleHistory", "SetConsoleHistory", + // "SetConsoleCurrentFont", + // "SetScreenBufferInfo", + // "ConsoleClientConnect", }; Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -641,4 +641,10 @@ return Status; } +CSR_API(SrvSetConsoleCommandHistoryMode) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */ Added: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c (added) +++ trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Fri Aug 30 17:53:45 2013 @@ -0,0 +1,69 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Server DLL + * FILE: win32ss/user/winsrv/consrv/subsysreg.c + * PURPOSE: Registration APIs for VDM, OS2 and IME subsystems + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "consrv.h" + +#define NDEBUG +#include <debug.h> + + +/* PUBLIC SERVER APIS *********************************************************/ + +/* + * VDM Subsystem + */ + +CSR_API(SrvRegisterConsoleVDM) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvVDMConsoleOperation) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * OS/2 Subsystem + */ + +CSR_API(SrvRegisterConsoleOS2) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvSetConsoleOS2OemFormat) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * IME Subsystem + */ + +CSR_API(SrvRegisterConsoleIME) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvUnregisterConsoleIME) +{ + DPRINT1("%s not yet implemented\n", __FUNCTION__); + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/win32ss/user/winsrv/consrv/subsysreg.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ion] 59906: Enable the C_ASSERT that validates our CONSRV structure matches the expected size.
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 17:32:10 2013 New Revision: 59906 URL: http://svn.reactos.org/svn/reactos?rev=59906&view=rev Log: Enable the C_ASSERT that validates our CONSRV structure matches the expected size. Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Fri Aug 30 17:32:10 2013 @@ -187,7 +187,7 @@ CONSOLE_START_INFO ConsoleStartInfo; } CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO; -//C_ASSERT(sizeof(CONSRV_API_CONNECTINFO) == 0x638); +C_ASSERT(sizeof(CONSRV_API_CONNECTINFO) == 0x638); typedef struct {

1 0

[ion] 59905: [NTOSKRNL]: 903 was not supposed to have this change.
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 17:28:45 2013 New Revision: 59905 URL: http://svn.reactos.org/svn/reactos?rev=59905&view=rev Log: [NTOSKRNL]: 903 was not supposed to have this change. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Aug 30 17:28:45 2013 @@ -1236,12 +1236,14 @@ } else { +#if 0 /* Do what windows does and issue an invalid access violation */ KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, TrapFrame->Eip, TrapFrame->ErrCode & 2 ? TRUE : FALSE, Cr2, TrapFrame); +#endif } }

1 0

[ion] 59904: [CONSRV]: Reorganize/rename/add some fields to CONSRV_API_CONNECTINFO, partially based on an MSDN page, and a little bit of RE, which makes it closer to the Windows structure. No behav...
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 17:14:41 2013 New Revision: 59904 URL: http://svn.reactos.org/svn/reactos?rev=59904&view=rev Log: [CONSRV]: Reorganize/rename/add some fields to CONSRV_API_CONNECTINFO, partially based on an MSDN page, and a little bit of RE, which makes it closer to the Windows structure. No behavioral change should have happened as a result of these changes. Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/init.c Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Fri Aug 30 17:14:41 2013 @@ -121,26 +121,26 @@ ConsoleStartInfo->dwStartupFlags = si.dwFlags; if (si.dwFlags & STARTF_USEFILLATTRIBUTE) { - ConsoleStartInfo->FillAttribute = si.dwFillAttribute; + ConsoleStartInfo->wFillAttribute = si.dwFillAttribute; } if (si.dwFlags & STARTF_USECOUNTCHARS) { - ConsoleStartInfo->ScreenBufferSize.X = (SHORT)(si.dwXCountChars); - ConsoleStartInfo->ScreenBufferSize.Y = (SHORT)(si.dwYCountChars); + ConsoleStartInfo->dwScreenBufferSize.X = (SHORT)(si.dwXCountChars); + ConsoleStartInfo->dwScreenBufferSize.Y = (SHORT)(si.dwYCountChars); } if (si.dwFlags & STARTF_USESHOWWINDOW) { - ConsoleStartInfo->ShowWindow = si.wShowWindow; + ConsoleStartInfo->wShowWindow = si.wShowWindow; } if (si.dwFlags & STARTF_USEPOSITION) { - ConsoleStartInfo->ConsoleWindowOrigin.x = (LONG)(si.dwX); - ConsoleStartInfo->ConsoleWindowOrigin.y = (LONG)(si.dwY); + ConsoleStartInfo->dwWindowOrigin.X = (LONG)(si.dwX); + ConsoleStartInfo->dwWindowOrigin.Y = (LONG)(si.dwY); } if (si.dwFlags & STARTF_USESIZE) { - ConsoleStartInfo->ConsoleWindowSize.cx = (LONG)(si.dwXSize); - ConsoleStartInfo->ConsoleWindowSize.cy = (LONG)(si.dwYSize); + ConsoleStartInfo->dwWindowSize.X = (LONG)(si.dwXSize); + ConsoleStartInfo->dwWindowSize.Y = (LONG) (si.dwYSize); } /* Set up the title for the console */ @@ -194,7 +194,7 @@ { DPRINT("Image is not a console application\n"); Parameters->ConsoleHandle = NULL; - ConnectInfo.ConsoleNeeded = FALSE; // ConsoleNeeded is used for knowing whether or not this is a CUI app. + ConnectInfo.ConsoleStartInfo.ConsoleNeeded = FALSE; // ConsoleNeeded is used for knowing whether or not this is a CUI app. ConnectInfo.ConsoleStartInfo.ConsoleTitle[0] = L'\0'; ConnectInfo.ConsoleStartInfo.AppPath[0] = L'\0'; @@ -211,7 +211,7 @@ if (ExeName) SetConsoleInputExeNameW(ExeName + 1); /* Assume one is needed */ - ConnectInfo.ConsoleNeeded = TRUE; + ConnectInfo.ConsoleStartInfo.ConsoleNeeded = TRUE; /* Handle the special flags given to us by BasePushProcessParameters */ if (Parameters->ConsoleHandle == HANDLE_DETACHED_PROCESS) @@ -219,7 +219,7 @@ /* No console to create */ DPRINT("No console to create\n"); Parameters->ConsoleHandle = NULL; - ConnectInfo.ConsoleNeeded = FALSE; + ConnectInfo.ConsoleStartInfo.ConsoleNeeded = FALSE; } else if (Parameters->ConsoleHandle == HANDLE_CREATE_NEW_CONSOLE) { @@ -232,7 +232,7 @@ /* We'll get the real one soon */ DPRINT("Creating new invisible console\n"); Parameters->ConsoleHandle = NULL; - ConnectInfo.ConsoleStartInfo.ShowWindow = SW_HIDE; + ConnectInfo.ConsoleStartInfo.wShowWindow = SW_HIDE; } else { @@ -249,10 +249,10 @@ /* Initialize the Console Ctrl Handler */ InitConsoleCtrlHandling(); - ConnectInfo.CtrlDispatcher = ConsoleControlDispatcher; + ConnectInfo.ConsoleStartInfo.CtrlDispatcher = ConsoleControlDispatcher; /* Initialize the Property Dialog Handler */ - ConnectInfo.PropDispatcher = PropDialogHandler; + ConnectInfo.ConsoleStartInfo.PropDispatcher = PropDialogHandler; /* Setup the right Object Directory path */ if (!SessionId) @@ -287,7 +287,7 @@ if (InServer) return TRUE; /* Nothing to do if not a console app */ - if (!ConnectInfo.ConsoleNeeded) return TRUE; + if (!ConnectInfo.ConsoleStartInfo.ConsoleNeeded) return TRUE; /* We got the handles, let's set them */ if ((Parameters->ConsoleHandle = ConnectInfo.ConsoleHandle)) Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Fri Aug 30 17:14:41 2013 @@ -110,38 +110,84 @@ ConsolepMaxApiNumber } CONSRV_API_NUMBER, *PCONSRV_API_NUMBER; - +// +// See http://msdn.microsoft.com/en-us/library/windows/desktop/bb773359(v=vs.85).a… +// +typedef struct _CONSOLE_PROPERTIES +{ + WORD wFillAttribute; + WORD wPopupFillAttribute; + + // + // Not on MSDN, but show up in binary + // + WORD wShowWindow; + WORD wUnknown; + + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; + + //NT_FE_CONSOLE_PROPS + UINT uCodePage; +} CONSOLE_PROPERTIES; + +// +// To minimize code changes, some fields were put here even though they really only belong in +// CONSRV_API_CONNECTINFO. Do not change the ordering however, as it's required for Windows +// compatibility. +// typedef struct _CONSOLE_START_INFO { + INT IconIndex; + HICON IconHandle1; + HICON IconHandle2; + DWORD dwHotKey; DWORD dwStartupFlags; - DWORD FillAttribute; - COORD ScreenBufferSize; - WORD ShowWindow; - POINT ConsoleWindowOrigin; - SIZE ConsoleWindowSize; - // UNICODE_STRING ConsoleTitle; + CONSOLE_PROPERTIES; + BOOL ConsoleNeeded; // Used for GUI apps only. + LPTHREAD_START_ROUTINE CtrlDispatcher; + LPTHREAD_START_ROUTINE ImeDispatcher; + LPTHREAD_START_ROUTINE PropDispatcher; + ULONG TitleLength; WCHAR ConsoleTitle[MAX_PATH + 1]; // Console title or full path to the startup shortcut - WCHAR AppPath[MAX_PATH + 1]; // Full path of the launched app + ULONG DesktopLength; + PWCHAR DesktopPath; + ULONG AppNameLength; + WCHAR AppPath[128]; // Full path of the launched app + ULONG IconPathLength; WCHAR IconPath[MAX_PATH + 1]; // Path to the file containing the icon - INT IconIndex; // Index of the icon } CONSOLE_START_INFO, *PCONSOLE_START_INFO; typedef struct _CONSRV_API_CONNECTINFO { - BOOL ConsoleNeeded; // Used for GUI apps only. - + HANDLE ConsoleHandle; + HANDLE InputWaitHandle; + HANDLE InputHandle; + HANDLE OutputHandle; + HANDLE ErrorHandle; + HANDLE Event1; + HANDLE Event2; /* Adapted from CONSOLE_ALLOCCONSOLE */ CONSOLE_START_INFO ConsoleStartInfo; - - HANDLE ConsoleHandle; - HANDLE InputHandle; - HANDLE OutputHandle; - HANDLE ErrorHandle; - HANDLE InputWaitHandle; - LPTHREAD_START_ROUTINE CtrlDispatcher; - LPTHREAD_START_ROUTINE PropDispatcher; } CONSRV_API_CONNECTINFO, *PCONSRV_API_CONNECTINFO; +//C_ASSERT(sizeof(CONSRV_API_CONNECTINFO) == 0x638); typedef struct { Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Fri Aug 30 17:14:41 2013 @@ -249,17 +249,15 @@ */ if (ConsoleStartInfo->dwStartupFlags & STARTF_USEFILLATTRIBUTE) { - ConsoleInfo.ScreenAttrib = (USHORT)ConsoleStartInfo->FillAttribute; + ConsoleInfo.ScreenAttrib = (USHORT)ConsoleStartInfo->wFillAttribute; } if (ConsoleStartInfo->dwStartupFlags & STARTF_USECOUNTCHARS) { - ConsoleInfo.ScreenBufferSize = ConsoleStartInfo->ScreenBufferSize; + ConsoleInfo.ScreenBufferSize = ConsoleStartInfo->dwScreenBufferSize; } if (ConsoleStartInfo->dwStartupFlags & STARTF_USESIZE) { - // ConsoleInfo.ConsoleSize = ConsoleStartInfo->ConsoleWindowSize; - ConsoleInfo.ConsoleSize.X = (SHORT)ConsoleStartInfo->ConsoleWindowSize.cx; - ConsoleInfo.ConsoleSize.Y = (SHORT)ConsoleStartInfo->ConsoleWindowSize.cy; + ConsoleInfo.ConsoleSize = ConsoleStartInfo->dwWindowSize; } } Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Fri Aug 30 17:14:41 2013 @@ -2279,12 +2279,13 @@ */ if (ConsoleStartInfo->dwStartupFlags & STARTF_USESHOWWINDOW) { - TermInfo.ShowWindow = ConsoleStartInfo->ShowWindow; + TermInfo.ShowWindow = ConsoleStartInfo->wShowWindow; } if (ConsoleStartInfo->dwStartupFlags & STARTF_USEPOSITION) { TermInfo.AutoPosition = FALSE; - TermInfo.WindowOrigin = ConsoleStartInfo->ConsoleWindowOrigin; + TermInfo.WindowOrigin.x = ConsoleStartInfo->dwWindowOrigin.X; + TermInfo.WindowOrigin.y = ConsoleStartInfo->dwWindowOrigin.Y; } if (ConsoleStartInfo->dwStartupFlags & STARTF_RUNFULLSCREEN) { @@ -2868,7 +2869,7 @@ /* Get the window showing command */ hRes = IShellLinkW_GetShowCmd(pshl, &ShowCmd); - if (SUCCEEDED(hRes)) ConsoleStartInfo->ShowWindow = (WORD)ShowCmd; + if (SUCCEEDED(hRes)) ConsoleStartInfo->wShowWindow = (WORD)ShowCmd; /* Get the hotkey */ // hRes = pshl->GetHotkey(&ShowCmd); Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Fri Aug 30 17:14:41 2013 @@ -413,7 +413,7 @@ } /* If we don't need a console, then get out of here */ - if (!ConnectInfo->ConsoleNeeded || !ProcessData->ConsoleApp) // In fact, it is for GUI apps. + if (!ConnectInfo->ConsoleStartInfo.ConsoleNeeded || !ProcessData->ConsoleApp) // In fact, it is for GUI apps. { return STATUS_SUCCESS; } @@ -470,8 +470,8 @@ ConnectInfo->InputWaitHandle = ProcessData->ConsoleEvent; /* Set the Property-Dialog and Control-Dispatcher handlers */ - ProcessData->PropDispatcher = ConnectInfo->PropDispatcher; - ProcessData->CtrlDispatcher = ConnectInfo->CtrlDispatcher; + ProcessData->PropDispatcher = ConnectInfo->ConsoleStartInfo.PropDispatcher; + ProcessData->CtrlDispatcher = ConnectInfo->ConsoleStartInfo.CtrlDispatcher; return STATUS_SUCCESS; }

1 0

[ion] 59903: [RTL]: Make RtlUnhandledExceptionFilter show a stack trace, so at least we can see where the exception came from.
by ion＠svn.reactos.org 30 Aug '13

30 Aug '13

Author: ion Date: Fri Aug 30 15:37:10 2013 New Revision: 59903 URL: http://svn.reactos.org/svn/reactos?rev=59903&view=rev Log: [RTL]: Make RtlUnhandledExceptionFilter show a stack trace, so at least we can see where the exception came from. Modified: trunk/reactos/lib/rtl/exception.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=59… ============================================================================== --- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Fri Aug 30 15:37:10 2013 @@ -170,6 +170,128 @@ } /* +* Private helper function to lookup the module name from a given address. +* The address can point to anywhere within the module. +*/ +static const char* + _module_name_from_addr(const void* addr, void **module_start_addr, + char* psz, size_t nChars) +{ +#if 0 + MEMORY_BASIC_INFORMATION mbi; + if (VirtualQuery(addr, &mbi, sizeof(mbi)) != sizeof(mbi) || + !GetModuleFileNameA((HMODULE) mbi.AllocationBase, psz, nChars)) + { + psz[0] = '\0'; + *module_start_addr = 0; + } + else + { + *module_start_addr = (void *) mbi.AllocationBase; + } + return psz; +#else + psz[0] = '\0'; + *module_start_addr = 0; + return psz; +#endif +} + + +static VOID + _dump_context(PCONTEXT pc) +{ +#ifdef _M_IX86 + /* + * Print out the CPU registers + */ + DbgPrint("CS:EIP %x:%x\n", pc->SegCs & 0xffff, pc->Eip); + DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs & 0xffff, pc->SegEs & 0xffff, + pc->SegFs & 0xffff, pc->SegGs & 0xfff); + DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", pc->Eax, pc->Ebx, pc->Ecx); + DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x ESP: %.8x\n", pc->Edx, + pc->Ebp, pc->Esi, pc->Esp); + DbgPrint("EDI: %.8x EFLAGS: %.8x\n", pc->Edi, pc->EFlags); +#elif defined(_M_AMD64) + DbgPrint("CS:RIP %x:%I64x\n", pc->SegCs & 0xffff, pc->Rip); + DbgPrint("DS %x ES %x FS %x GS %x\n", pc->SegDs & 0xffff, pc->SegEs & 0xffff, + pc->SegFs & 0xffff, pc->SegGs & 0xfff); + DbgPrint("RAX: %I64x RBX: %I64x RCX: %I64x RDI: %I64x\n", pc->Rax, pc->Rbx, pc->Rcx, pc->Rdi); + DbgPrint("RDX: %I64x RBP: %I64x RSI: %I64x RSP: %I64x\n", pc->Rdx, pc->Rbp, pc->Rsi, pc->Rsp); + DbgPrint("R8: %I64x R9: %I64x R10: %I64x R11: %I64x\n", pc->R8, pc->R9, pc->R10, pc->R11); + DbgPrint("R12: %I64x R13: %I64x R14: %I64x R15: %I64x\n", pc->R12, pc->R13, pc->R14, pc->R15); + DbgPrint("EFLAGS: %.8x\n", pc->EFlags); +#else +#warning Unknown architecture +#endif +} + +static VOID + PrintStackTrace(struct _EXCEPTION_POINTERS *ExceptionInfo) +{ + PVOID StartAddr; + CHAR szMod[128] = ""; + PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; + PCONTEXT ContextRecord = ExceptionInfo->ContextRecord; + + /* Print a stack trace. */ + DbgPrint("Unhandled exception\n"); + DbgPrint("ExceptionCode: %8x\n", ExceptionRecord->ExceptionCode); + + if ((NTSTATUS) ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + ExceptionRecord->NumberParameters == 2) + { + DbgPrint("Faulting Address: %8x\n", ExceptionRecord->ExceptionInformation[1]); + } + + _dump_context(ContextRecord); + _module_name_from_addr(ExceptionRecord->ExceptionAddress, &StartAddr, szMod, sizeof(szMod)); + DbgPrint("Address:\n %8x+%-8x %s\n", + (PVOID) StartAddr, + (ULONG_PTR) ExceptionRecord->ExceptionAddress - (ULONG_PTR) StartAddr, + szMod); +#ifdef _M_IX86 + DbgPrint("Frames:\n"); + + _SEH2_TRY + { + UINT i; + PULONG Frame = (PULONG) ContextRecord->Ebp; + + for (i = 0; Frame[1] != 0 && Frame[1] != 0xdeadbeef && i < 128; i++) + { + //if (IsBadReadPtr((PVOID) Frame[1], 4)) + if (Frame[1] == 0) + { + DbgPrint(" %8x%9s %s\n", Frame[1], "<invalid address>", " "); + } + else + { + _module_name_from_addr((const void*) Frame[1], &StartAddr, + szMod, sizeof(szMod)); + DbgPrint(" %8x+%-8x %s\n", + (PVOID) StartAddr, + (ULONG_PTR) Frame[1] - (ULONG_PTR) StartAddr, + szMod); + } + + if (Frame[0] == 0) break; + //if (IsBadReadPtr((PVOID) Frame[0], sizeof(*Frame) * 2)) + //break; + + Frame = (PULONG) Frame[0]; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + DbgPrint("<error dumping stack trace: 0x%x>\n", _SEH2_GetExceptionCode()); + } + _SEH2_END; +#endif +} + + +/* * @unimplemented */ LONG @@ -178,6 +300,7 @@ { /* This is used by the security cookie checks, and calso called externally */ UNIMPLEMENTED; + PrintStackTrace(ExceptionInfo); return ERROR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Aug 30 15:37:10 2013 @@ -1234,6 +1234,15 @@ /* Continue execution */ KiEoiHelper(TrapFrame); } + else + { + /* Do what windows does and issue an invalid access violation */ + KiDispatchException2Args(KI_EXCEPTION_ACCESS_VIOLATION, + TrapFrame->Eip, + TrapFrame->ErrCode & 2 ? TRUE : FALSE, + Cr2, + TrapFrame); + } } /* Call the access fault handler */

1 0

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 August 2013