Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[cfinck] 45346: - Pass through the return value of the program called by buildtime. - Make the Windows version of buildtime fully Unicode-aware.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jan 30 15:37:45 2010 New Revision: 45346 URL: http://svn.reactos.org/svn/reactos?rev=45346&view=rev Log: - Pass through the return value of the program called by buildtime. - Make the Windows version of buildtime fully Unicode-aware. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/t… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/tools/buildtime.c [iso-8859-1] Sat Jan 30 15:37:45 2010 @@ -1,28 +1,20 @@ /* Program for computing the build time. - Developed by Colin Finck <mail(a)colinfinck.de> + Developed by Colin Finck <colin(a)reactos.org> Derived from "buildtime.c" of RosBE for Windows Released under GNU GPL v2 or any later version. */ #include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <sys/types.h> +#include <sys/wait.h> #include <time.h> +#include <unistd.h> int main(int argc, char* argv[]) { - char* CommandLine; - double TotalTime; - int i; - int CommandLineLength = 0; - int Hour; - int Minute; - int Ret; - int Second; - time_t StartTime; - time_t FinishTime; + pid_t ProcessId; /* Do we have command line arguments? */ if(argc <= 1) @@ -31,50 +23,52 @@ return 1; } - /* First compute the memory size to allocate */ - for(i = 1; i < argc; i++) + ProcessId = fork(); + if(ProcessId < 0) { - /* Every argument is enclosed between quotes and followed by a space. - The last argument is followed by a terminating null character instead of a space. */ - CommandLineLength += 3 + strlen(argv[i]); - } - - /* Now allocate the needed memory */ - CommandLine = malloc(CommandLineLength + 1); - if(!CommandLine) - { - fprintf(stderr, "buildtime: Unable to allocate memory!\n"); + /* Error */ + fprintf(stderr, "buildtime: fork() failed!\n"); return 1; } + else if(ProcessId == 0) + { + /* Child process */ + execvp(argv[1], &argv[1]); + + /* If this function returned, an error occured */ + fprintf(stderr, "execvp() failed!\n"); + return 1; + } + else + { + /* Parent process */ + double TotalTime; + int Hour; + int Minute; + int Ret; + int Second; + time_t StartTime; + time_t FinishTime; + + time(&StartTime); - memset(CommandLine, 0, CommandLineLength + 1); + if(wait(&Ret) != ProcessId) + { + fprintf(stderr, "buildtime: wait() failed!\n"); + return 1; + } + + time(&FinishTime); - /* Put the command line into the variable */ - for(i = 1; i < argc; i++) - { - strcat(CommandLine, "\""); - strcat(CommandLine, argv[i]); - strcat(CommandLine, "\" "); + /* Compute the needed time and print it */ + TotalTime = difftime(FinishTime, StartTime); + + Second = (int)TotalTime % 60; + TotalTime = TotalTime / 60; + Minute = (int)TotalTime % 60; + Hour = TotalTime / 60; + + printf("\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second); + return WEXITSTATUS(Ret); } - - CommandLine[CommandLineLength] = 0; - - /* Get the timestamps and execute the command line */ - time(&StartTime); - Ret = system(CommandLine); - time(&FinishTime); - - /* Compute the needed time and print it */ - TotalTime = difftime(FinishTime, StartTime); - - Second = (int)TotalTime % 60; - TotalTime = TotalTime / 60; - Minute = (int)TotalTime % 60; - Hour = TotalTime / 60; - - printf("\nTotal Build Time: %02d:%02d:%02d\n", Hour, Minute, Second); - - /* Final actions */ - free(CommandLine); - return Ret; } Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/bu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] Sat Jan 30 15:37:45 2010 @@ -5,25 +5,22 @@ * PURPOSE: Buildtime Counter * COPYRIGHT: Copyright 2007 KJK::Hyperion * Copyright 2007 Peter Ward <dralnix(a)gmail.com> + * Copyright 2010 Colin Finck <colin(a)reactos.org> * */ #include <windows.h> #include <time.h> #include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <ctype.h> -#include <wctype.h> -#include <tchar.h> -static LPTSTR SkipSelfArgument(LPTSTR lpszCommandLine) +static PWSTR SkipSelfArgument(PWSTR lpszCommandLine) { - LPTSTR p = lpszCommandLine; + PWSTR p = lpszCommandLine; int quote = 0; // Skip leading whitespace - while(*p != 0 && _istspace(*p)) + while(*p != 0 && iswspace(*p)) ++ p; if(*p == 0) @@ -33,7 +30,7 @@ // BUGBUG: the assumption is that argument 0 never contains escaped quotes do { - if(*p == TEXT('\"')) + if(*p == L'\"') { quote = !quote; ++ p; @@ -42,10 +39,10 @@ ++ p; } - while(*p != 0 && (quote || !_istspace(*p))); + while(*p != 0 && (quote || !iswspace(*p))); // Skip trailing whitespace - while(*p != 0 && _istspace(*p)) + while(*p != 0 && iswspace(*p)) ++ p; return p; @@ -53,15 +50,16 @@ int main() { - LPTSTR CommandLine, FullCommandLine, CommandLineBuffer; + DWORD ExitCode; + PWSTR CommandLine; time_t StartTime, FinishTime; double TotalTime; int Hour, Minute, Second; - int Status; + PROCESS_INFORMATION ProcessInfo; + STARTUPINFOW StartupInfo = {0}; // Get the command line to pass on. - FullCommandLine = GetCommandLine(); - CommandLine = SkipSelfArgument(FullCommandLine); + CommandLine = SkipSelfArgument(GetCommandLineW()); // If nothing is on the command-line exit if (CommandLine[0] == 0) @@ -70,21 +68,20 @@ return 1; } - CommandLineBuffer = malloc((strlen(CommandLine) + 2 + 1)); - if (!CommandLineBuffer) + // Grab the starting timestamp. + time(&StartTime); + + // Run the program and get its exit code. + StartupInfo.cb = sizeof(StartupInfo); + + if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo, &ProcessInfo)) { - fprintf(stderr, "buildtime: unable to allocate memory\n"); + fprintf(stderr, "buildtime: CreateProcessW() failed!\n"); return 1; } - CommandLineBuffer[0] = 0; - strcat(CommandLineBuffer, CommandLine); - - // Grab the starting timestamp. - time(&StartTime); - - // Run the program (Status is 1 on failure). - Status = system(CommandLineBuffer); + WaitForSingleObject(ProcessInfo.hProcess, INFINITE); + GetExitCodeProcess(ProcessInfo.hProcess, &ExitCode); // Grab the finishing timestamp. time(&FinishTime); @@ -101,8 +98,5 @@ // Print the total build time. printf("\nTotal Build Time: %02d:%02d:%02d", Hour, Minute, Second); - // Free the memory we allocated for the command line. - free(CommandLineBuffer); - - return Status; + return ExitCode; }

14 years, 10 months

[cfinck] 45345: [FORMATTING] Fix indentation and comment style. No code changes.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jan 30 14:39:19 2010 New Revision: 45345 URL: http://svn.reactos.org/svn/reactos?rev=45345&view=rev Log: [FORMATTING] Fix indentation and comment style. No code changes. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/bu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/buildtime.c [iso-8859-1] Sat Jan 30 14:39:19 2010 @@ -19,36 +19,36 @@ static LPTSTR SkipSelfArgument(LPTSTR lpszCommandLine) { - LPTSTR p = lpszCommandLine; - int quote = 0; + LPTSTR p = lpszCommandLine; + int quote = 0; - // Skip leading whitespace - while(*p != 0 && _istspace(*p)) - ++ p; + // Skip leading whitespace + while(*p != 0 && _istspace(*p)) + ++ p; - if(*p == 0) - return p; + if(*p == 0) + return p; - // Skip argument 0 - // BUGBUG: the assumption is that argument 0 never contains escaped quotes - do - { - if(*p == TEXT('\"')) - { - quote = !quote; - ++ p; - continue; - } + // Skip argument 0 + // BUGBUG: the assumption is that argument 0 never contains escaped quotes + do + { + if(*p == TEXT('\"')) + { + quote = !quote; + ++ p; + continue; + } - ++ p; - } - while(*p != 0 && (quote || !_istspace(*p))); + ++ p; + } + while(*p != 0 && (quote || !_istspace(*p))); - // Skip trailing whitespace - while(*p != 0 && _istspace(*p)) - ++ p; + // Skip trailing whitespace + while(*p != 0 && _istspace(*p)) + ++ p; - return p; + return p; } int main() @@ -57,69 +57,51 @@ time_t StartTime, FinishTime; double TotalTime; int Hour, Minute, Second; - int Status; + int Status; - // // Get the command line to pass on. - // FullCommandLine = GetCommandLine(); CommandLine = SkipSelfArgument(FullCommandLine); - // // If nothing is on the command-line exit - // if (CommandLine[0] == 0) { - fprintf(stderr, "buildtime: required parameter not specified\n"); + fprintf(stderr, "buildtime: required parameter not specified\n"); return 1; } CommandLineBuffer = malloc((strlen(CommandLine) + 2 + 1)); if (!CommandLineBuffer) { - fprintf(stderr, "buildtime: unable to allocate memory\n"); + fprintf(stderr, "buildtime: unable to allocate memory\n"); return 1; } - CommandLineBuffer[0] = 0; + CommandLineBuffer[0] = 0; strcat(CommandLineBuffer, CommandLine); - // // Grab the starting timestamp. - // time(&StartTime); - // // Run the program (Status is 1 on failure). - // Status = system(CommandLineBuffer); - // // Grab the finishing timestamp. - // time(&FinishTime); - // // Get the elapsed time. - // TotalTime = difftime(FinishTime, StartTime); - // // Convert the elapsed time to a human readable format. - // Second = (int)TotalTime % 60; TotalTime = TotalTime / 60; Minute = (int)TotalTime % 60; Hour = TotalTime / 60; - // // Print the total build time. - // printf("\nTotal Build Time: %02d:%02d:%02d", Hour, Minute, Second); - // // Free the memory we allocated for the command line. - // free(CommandLineBuffer); return Status;

14 years, 10 months

[tkreuzer] 45344: [NTOS] - Implement KiSystemFatalException, stubplement KiGeneralProtectionFaultHandler and KiXmmExceptionHandler, KiNpxNotAvailableFaultHandler in C - Implement KiDivideErrorFault, KiOverflowTrap, KiBoundFault, KiInvalidOpcodeFault, KiNpxNotAvailableFault, KiNpxSegmentOverrunAbort, KiInvalidTssFault, KiSegmentNotPresentFault, KiStackFault, KiAlignmentFault, KiMcheckAbort, KiXmmException, KiRaiseAssertion in assembler - Modify rsp instead of pushing a pseudo error code - Move al

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 14:35:46 2010 New Revision: 45344 URL: http://svn.reactos.org/svn/reactos?rev=45344&view=rev Log: [NTOS] - Implement KiSystemFatalException, stubplement KiGeneralProtectionFaultHandler and KiXmmExceptionHandler, KiNpxNotAvailableFaultHandler in C - Implement KiDivideErrorFault, KiOverflowTrap, KiBoundFault, KiInvalidOpcodeFault, KiNpxNotAvailableFault, KiNpxSegmentOverrunAbort, KiInvalidTssFault, KiSegmentNotPresentFault, KiStackFault, KiAlignmentFault, KiMcheckAbort, KiXmmException, KiRaiseAssertion in assembler - Modify rsp instead of pushing a pseudo error code - Move all unwind ops into ENTER_TRAP_FRAME macro Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Sat Jan 30 14:35:46 2010 @@ -202,3 +202,99 @@ return STATUS_UNSUCCESSFUL; } + +VOID +DECLSPEC_NORETURN +KiSystemFatalException(IN ULONG ExceptionCode, + IN PKTRAP_FRAME TrapFrame) +{ + /* Bugcheck the system */ + KeBugCheckWithTf(UNEXPECTED_KERNEL_MODE_TRAP, + ExceptionCode, + 0, + 0, + 0, + TrapFrame); +} + +NTSTATUS +NTAPI +KiNpxNotAvailableFaultHandler( + IN PKTRAP_FRAME TrapFrame) +{ + UNIMPLEMENTED; + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); + return -1; +} + + +NTSTATUS +NTAPI +KiGeneralProtectionFaultHandler( + IN PKTRAP_FRAME TrapFrame) +{ + PUCHAR Instructions; + + /* Check for user-mode GPF */ + if (TrapFrame->SegCs & 3) + { + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* Check for nested exception */ + if ((TrapFrame->Rip >= (ULONG64)KiGeneralProtectionFaultHandler) && + (TrapFrame->Rip < (ULONG64)KiGeneralProtectionFaultHandler)) + { + /* Not implemented */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* Get Instruction Pointer */ + Instructions = (PUCHAR)TrapFrame->Rip; + + /* Check for IRET */ + if (Instructions[0] == 0x48 && Instructions[1] == 0xCF) + { + /* Not implemented */ + UNIMPLEMENTED; + ASSERT(FALSE); + } + + /* Check for RDMSR/WRMSR */ + if ((Instructions[0] == 0xF) && // 2-byte opcode + (((Instructions[1] >> 8) == 0x30) || // RDMSR + ((Instructions[2] >> 8) == 0x32))) // WRMSR + { + /* Unknown CPU MSR, so raise an access violation */ + return STATUS_ACCESS_VIOLATION; + } + + /* Check for lazy segment load */ + if (TrapFrame->SegDs != (KGDT64_R0_DATA | RPL_MASK)) + { + /* Fix it */ + TrapFrame->SegDs = (KGDT64_R0_DATA | RPL_MASK); + return STATUS_SUCCESS; + } + else if (TrapFrame->SegEs != (KGDT64_R0_DATA | RPL_MASK)) + { + /* Fix it */ + TrapFrame->SegEs = (KGDT64_R0_DATA | RPL_MASK); + return STATUS_SUCCESS; + } + + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +KiXmmExceptionHandler( + IN PKTRAP_FRAME TrapFrame) +{ + UNIMPLEMENTED; + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); + return -1; +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Jan 30 14:35:46 2010 @@ -66,6 +66,7 @@ #define TRAPFLAG_XMM HEX(04) #define TRAPFLAG_SEGMENTS HEX(08) #define TRAPFLAG_DEBUG HEX(10) +#define TRAPFLAG_HAS_ERRORCODE HEX(100) #define TRAPFLAG_SYSTEMSERVICE (TRAPFLAG_VOLATILES|TRAPFLAG_DEBUG) #define TRAPFLAG_ALL HEX(ff) @@ -87,17 +88,26 @@ */ MACRO(ENTER_TRAP_FRAME, Flags) LOCAL dont_swap - SIZE_INITIAL_FRAME = 7 * 8 - SIZE_TRAP_FRAME_ALLOC = SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME + + /* Save the trap flags for this trap */ TRAPFLAGS = VAL(Flags) + /* Size of hardware trap frame */ +if (TRAPFLAGS AND TRAPFLAG_HAS_ERRORCODE) + .pushframe code + SIZE_INITIAL_FRAME = 6 * 8 +else + .pushframe + SIZE_INITIAL_FRAME = 5 * 8 +endif + + /* Make room for a KTRAP_FRAME */ + sub rsp, (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) + .allocstack (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) + .endprolog + /* Save rbp */ - push rbp - .pushreg rbp - - /* Make room for a KTRAP_FRAME and function parameters */ - sub rsp, SIZE_TRAP_FRAME_ALLOC - .allocstack SIZE_TRAP_FRAME_ALLOC + mov [rsp + KTRAP_FRAME_Rbp], rbp /* Point rbp to the KTRAP_FRAME */ lea rbp, [rsp] @@ -237,8 +247,8 @@ /* Restore rbp */ mov rbp, [rbp + KTRAP_FRAME_Rbp] - /* Adjust stack pointer (plus one qword for rbp, one for error code) */ - add rsp, SIZE_TRAP_FRAME_ALLOC + HEX(10) + /* Adjust stack pointer */ + add rsp, KTRAP_FRAME_Rip ENDM @@ -260,7 +270,7 @@ ENDR // rbp = TrapFrame, eax = ExceptionCode, edx = NumParams, r9,r10,r11 = params -_InternalDispatchException: +.PROC _InternalDispatchException /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME @@ -326,30 +336,36 @@ add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME ret +.ENDP _InternalDispatchException + /* SOFTWARE INTERRUPT SERVICES ***********************************************/ PUBLIC _KiDivideErrorFault .PROC _KiDivideErrorFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiDivideErrorFault - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Enable interrupts */ + sti + + /* Dispatch the exception */ + mov eax, STATUS_INTEGER_DIVIDE_BY_ZERO + mov edx, 0 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiDivideErrorFault + PUBLIC _KiDebugTrapOrFault .PROC _KiDebugTrapOrFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiDebugTrapOrFault @@ -376,27 +392,25 @@ iretq .ENDP _KiDebugTrapOrFault + PUBLIC _KiNmiInterrupt .PROC _KiNmiInterrupt - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL UNIMPLEMENTED KiNmiInterrupt jmp $ + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiNmiInterrupt + PUBLIC _KiBreakpointTrap .PROC _KiBreakpointTrap - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiBreakpointTrap @@ -418,82 +432,128 @@ iretq .ENDP _KiBreakpointTrap + PUBLIC _KiOverflowTrap .PROC _KiOverflowTrap - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiOverflowTrap - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Enable interrupts */ + sti + + /* Dispatch the exception */ + mov eax, STATUS_INTEGER_OVERFLOW + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiOverflowTrap + PUBLIC _KiBoundFault .PROC _KiBoundFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - - sub rsp, 32 - .allocstack 32 - - mov [rsp + 8], rbx - .savereg rbx, 8 - .endprolog - - UNIMPLEMENTED KiBoundFault - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Check if the frame was from kernelmode */ + test word ptr [rbp + KTRAP_FRAME_SegCs], 3 + jnz KiBoundFaltUserMode + + /* Bugcheck */ + mov ecx, EXCEPTION_BOUND_CHECK + mov rdx, rbp + call _KiSystemFatalException + +KiBoundFaltUserMode: + /* Enable interrupts for user-mode */ + sti + + /* Dispatch the exception */ + mov eax, STATUS_INTEGER_OVERFLOW + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiBoundFault + PUBLIC _KiInvalidOpcodeFault .PROC _KiInvalidOpcodeFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiInvalidOpcodeFault - -// DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, _MsgInvalidOpcodeFault[rip] call qword ptr _FrLdrDbgPrint[rip] - jmp $ + + /* Enable interrupts */ + sti + + /* Check if the frame was from kernelmode */ + test word ptr [rbp + KTRAP_FRAME_SegCs], 3 + jz KiInvalidOpcodeKernel + + // FIXME: handle STATUS_INVALID_LOCK_SEQUENCE + +KiInvalidOpcodeKernel: + /* Kernel mode fault */ + + /* Dispatch the exception */ + mov eax, STATUS_ILLEGAL_INSTRUCTION + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException /* Return */ LEAVE_TRAP_FRAME iretq .ENDP _KiInvalidOpcodeFault + PUBLIC _KiNpxNotAvailableFault .PROC _KiNpxNotAvailableFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiNpxNotAvailableFault - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Call the C handler */ + mov rcx, rbp + call _KiNpxNotAvailableFaultHandler + + /* Check the return status code */ + test eax, eax + jz KiNpxNotAvailableFaultExit + + /* Dispatch the exception */ + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + +KiNpxNotAvailableFaultExit: + /* Return */ + LEAVE_TRAP_FRAME + iretq .ENDP _KiNpxNotAvailableFault + PUBLIC _KiDoubleFaultAbort .PROC _KiDoubleFaultAbort - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL lea rcx, _MsgDoubleFault[rip] @@ -501,119 +561,94 @@ mov r8, rbp call qword ptr _FrLdrDbgPrint[rip] - /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ - mov rcx, HEX(0000007F) - - /* Set double fault parameters */ - mov rdx, 8 // EXCEPTION_DOUBLE_FAULT - mov r8, 0 - mov r9, 0 - mov [rbp + KTRAP_FRAME_P5], rbp // trap frame (HACKY) - push 0 - call _KeBugCheckWithTf + /* Bugcheck */ + mov ecx, 8 // EXCEPTION_DOUBLE_FAULT + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiDoubleFaultAbort + PUBLIC _KiNpxSegmentOverrunAbort .PROC _KiNpxSegmentOverrunAbort - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiNpxSegmentOverrunAbort + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Bugcheck */ + mov ecx, EXCEPTION_NPX_OVERRUN + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiNpxSegmentOverrunAbort + PUBLIC _KiInvalidTssFault .PROC _KiInvalidTssFault - .pushframe code /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiInvalidTssFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Bugcheck */ + mov ecx, EXCEPTION_INVALID_TSS + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiInvalidTssFault + PUBLIC _KiSegmentNotPresentFault .PROC _KiSegmentNotPresentFault - .pushframe /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiSegmentNotPresentFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Bugcheck */ + mov ecx, EXCEPTION_SEGMENT_NOT_PRESENT + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiSegmentNotPresentFault + PUBLIC _KiStackFault .PROC _KiStackFault - .pushframe code /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiStackFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Bugcheck */ + mov ecx, EXCEPTION_STACK_FAULT + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiStackFault + PUBLIC _KiGeneralProtectionFault .PROC _KiGeneralProtectionFault - .pushframe code /* We have an error code */ - .endprolog - - cli - ENTER_TRAP_FRAME TRAPFLAG_ALL + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) TRAPINFO KiGeneralProtectionFault - mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, _MsgGeneralProtFault[rip] call qword ptr _FrLdrDbgPrint[rip] - /* Check if this was from user-mode */ - cmp byte ptr [rbp + KTRAP_FRAME_PreviousMode], KernelMode - jnz KiGpfUserMode - - /* Get instruction */ - mov rax, [rbp + KTRAP_FRAME_Rip] - mov rax, [rax] - - /* Check for MSR failure */ - cmp al, HEX(0F) - jz KiGpfMsr - - /* Check for IRET */ - cmp ax, HEX(0CF48) - je KiGpfIret - - /* Check for pop ds/es/fs/gs */ - xor edx, edx - cmp al, HEX(1F) - jz KiGpfPopSegDs - cmp al, HEX(07) - jz KiGpfPopSegEs - cmp ax, HEX(0A10F) - jz KiGpfPopSegFs - cmp ax, HEX(0A90F) - jz KiGpfPopSegGs - - - mov dx, HEX(002B) // KGDT64_R3_DATA | RPL_MASK - cmp [rbp + KTRAP_FRAME_SegDs], dx - jne KiGpfPopSegDs - cmp [rbp + KTRAP_FRAME_SegEs], dx - jne KiGpfPopSegEs - cmp [rbp + KTRAP_FRAME_SegGs], dx - jne KiGpfPopSegGs - mov dx, HEX(0053) // KGDT64_R3_CMTEB | RPL_MASK - cmp [rbp + KTRAP_FRAME_SegFs], dx - jne KiGpfPopSegFs + /* Call the C handler */ + call _KiGeneralProtectionFaultHandler + + /* Check for success */ + test eax, eax + jge KiGpfExit + + /* Dispatch the exception */ + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException KiGpfFatal: @@ -626,61 +661,17 @@ mov [rsp + KTRAP_FRAME_P5+8], rbp // trap frame call _KeBugCheckWithTf - -KiGpfPopSegDs: - mov [rbp + KTRAP_FRAME_SegDs], dx - jmp KiGpfPopSeg - -KiGpfPopSegEs: - mov [rbp + KTRAP_FRAME_SegEs], dx - jmp KiGpfPopSeg - -KiGpfPopSegFs: - mov [rbp + KTRAP_FRAME_SegFs], dx - jmp KiGpfPopSeg - -KiGpfPopSegGs: - mov [rbp + KTRAP_FRAME_SegGs], dx - jmp KiGpfPopSeg - -KiGpfPopSeg: - jmp KiGpfExit - -KiGpfIret: - /* Get error code */ - mov ax, [rbp + KTRAP_FRAME_ErrorCode] -// and ax, ~RPL_MASK - -KiGpfMsr: - - jmp KiGpfFatal - - -KiGpfUserMode: - - /* Dispatch the exception */ - mov eax, STATUS_ACCESS_VIOLATION - mov edx, 2 - mov r9, [rbp + KTRAP_FRAME_ErrorCode] - mov r10, 0 - mov r11, 0 - call _InternalDispatchException - KiGpfExit: - /* Return */ LEAVE_TRAP_FRAME iretq - .ENDP _KiGeneralProtectionFault + PUBLIC _KiPageFault .PROC _KiPageFault - .pushframe code /* We have an error code */ - .endprolog - - ENTER_TRAP_FRAME TRAPFLAG_ALL + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) TRAPINFO KiPageFault @@ -740,88 +731,114 @@ call _InternalDispatchException PageFaultReturn: - LEAVE_TRAP_FRAME; + LEAVE_TRAP_FRAME iretq .ENDP _KiPageFault + PUBLIC _KiFloatingErrorFault .PROC _KiFloatingErrorFault - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL UNIMPLEMENTED KiFloatingErrorFault jmp $ .ENDP _KiFloatingErrorFault + PUBLIC _KiAlignmentFault .PROC _KiAlignmentFault - .pushframe code /* We have an error code */ - .endprolog - - UNIMPLEMENTED KiAlignmentFault + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Enable interrupts */ + sti + + /* Bugcheck */ + mov ecx, EXCEPTION_ALIGNMENT_CHECK + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiAlignmentFault + PUBLIC _KiMcheckAbort .PROC _KiMcheckAbort - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiMcheckAbort + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Bugcheck */ + mov ecx, HEX(12) + mov rdx, rbp + call _KiSystemFatalException jmp $ .ENDP _KiMcheckAbort + PUBLIC _KiXmmException .PROC _KiXmmException - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - - UNIMPLEMENTED KiXmmException - - jmp $ + /* Push pseudo error code */ + ENTER_TRAP_FRAME TRAPFLAG_ALL + + /* Call the C handler */ + mov rcx, rbp + call _KiXmmExceptionHandler + + /* Check for success */ + test eax, eax + jge KiXmmExit + + /* Dispatch the exception */ + mov edx, 3 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException + +KiXmmExit: + LEAVE_TRAP_FRAME + iretq .ENDP _KiXmmException + PUBLIC _KiApcInterrupt .PROC _KiApcInterrupt - .pushframe code - .endprolog + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) UNIMPLEMENTED KiApcInterrupt jmp $ .ENDP _KiApcInterrupt + PUBLIC _KiRaiseAssertion .PROC _KiRaiseAssertion - .pushframe code - .endprolog - - UNIMPLEMENTED KiRaiseAssertion + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) + + /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ + sub qword ptr [rbp + KTRAP_FRAME_Rip], 2 + + /* Dispatch the exception */ + mov eax, STATUS_ASSERTION_FAILURE + mov edx, 0 + mov r9, 0 + mov r10, 0 + mov r11, 0 + call _InternalDispatchException - jmp $ + LEAVE_TRAP_FRAME + iretq .ENDP _KiRaiseAssertion + PUBLIC _KiDebugServiceTrap .PROC _KiDebugServiceTrap - .pushframe - /* Push pseudo error code */ - push 0 - .allocstack 8 - .endprolog - + /* Push pseudo error code */ ENTER_TRAP_FRAME TRAPFLAG_ALL TRAPINFO KiDebugServiceTrap @@ -841,36 +858,34 @@ iretq .ENDP _KiDebugServiceTrap + PUBLIC _KiDpcInterrupt .PROC _KiDpcInterrupt - .pushframe code - .endprolog + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) UNIMPLEMENTED KiDpcInterrupt jmp $ .ENDP _KiDpcInterrupt + PUBLIC _KiIpiInterrupt .PROC _KiIpiInterrupt - .pushframe code - .endprolog + /* We have an error code */ + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) UNIMPLEMENTED KiIpiInterrupt jmp $ .ENDP _KiIpiInterrupt + PUBLIC _KiUnexpectedInterrupt .PROC _KiUnexpectedInterrupt - .pushframe - .endprolog - /* The error code is the vector */ - cli - - ENTER_TRAP_FRAME TRAPFLAG_ALL + ENTER_TRAP_FRAME (TRAPFLAG_HAS_ERRORCODE | TRAPFLAG_ALL) /* Set bugcheck parameters */ mov ecx, TRAP_CAUSE_UNKNOWN @@ -881,14 +896,9 @@ mov [rbp + KTRAP_FRAME_P5 + 8], rbp // trap frame call _KeBugCheckWithTf + jmp $ .ENDP _KiUnexpectedInterrupt -PUBLIC _KiSystemFatalException -.PROC _KiSystemFatalException - .endprolog - -.ENDP _KiSystemFatalException - END

14 years, 10 months

[tkreuzer] 45343: Add exception codes for asm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 14:21:28 2010 New Revision: 45343 URL: http://svn.reactos.org/svn/reactos?rev=45343&view=rev Log: Add exception codes for asm Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Sat Jan 30 14:21:28 2010 @@ -309,7 +309,27 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 // -// NTSTATUS and Bugcheck Codes +// Exception codes +// +#define EXCEPTION_DIVIDED_BY_ZERO 0x00000 +#define EXCEPTION_DEBUG 0x00001 +#define EXCEPTION_NMI 0x00002 +#define EXCEPTION_INT3 0x00003 +#define EXCEPTION_BOUND_CHECK 0x00005 +#define EXCEPTION_INVALID_OPCODE 0x00006 +#define EXCEPTION_NPX_NOT_AVAILABLE 0x00007 +#define EXCEPTION_DOUBLE_FAULT 0x00008 +#define EXCEPTION_NPX_OVERRUN 0x00009 +#define EXCEPTION_INVALID_TSS 0x0000A +#define EXCEPTION_SEGMENT_NOT_PRESENT 0x0000B +#define EXCEPTION_STACK_FAULT 0x0000C +#define EXCEPTION_GP_FAULT 0x0000D +#define EXCEPTION_RESERVED_TRAP 0x0000F +#define EXCEPTION_NPX_ERROR 0x00010 +#define EXCEPTION_ALIGNMENT_CHECK 0x00011 + +// +// NTSTATUS values // #define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_IN_PAGE_ERROR 0xC0000006 @@ -336,6 +356,11 @@ #define STATUS_FLOAT_UNDERFLOW 0xC0000093 #define STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4 #define STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5 +#define STATUS_ASSERTION_FAILURE 0xC0000420 + +// +// Bugcheck Codes +// #define APC_INDEX_MISMATCH 0x01 #define IRQL_NOT_GREATER_OR_EQUAL 0x09 #define IRQL_NOT_LESS_OR_EQUAL 0x0A

14 years, 10 months

[fireball] 45342: - Disable hacked-up SwitchDesktop implementation for now. During shutdown, winlogon tries to switch to the winlogon (the same and only) desktop which results in a RedrawWindow sending a message to a CSR desktop window which is probably already in the process of being destroyed. Fixes a hang during shutdown (issue #27 in the wiki).

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 30 14:10:29 2010 New Revision: 45342 URL: http://svn.reactos.org/svn/reactos?rev=45342&view=rev Log: - Disable hacked-up SwitchDesktop implementation for now. During shutdown, winlogon tries to switch to the winlogon (the same and only) desktop which results in a RedrawWindow sending a message to a CSR desktop window which is probably already in the process of being destroyed. Fixes a hang during shutdown (issue #27 in the wiki). Modified: branches/arwinss/reactos/dll/win32/user32/win.c Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Jan 30 14:10:29 2010 @@ -3315,7 +3315,7 @@ hWnd = GetDesktopWindow(/*hDesktop*/); FIXME("SwitchDesktop(hDesktop %p, desk window %x) stub!\n", hDesktop, hWnd); - +#if 0 /* Set foreground window */ SetForegroundWindow(hWnd); @@ -3328,7 +3328,7 @@ UpdateWindow(hWnd); RedrawWindow(NULL, NULL, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASENOW | RDW_ALLCHILDREN); - +#endif return TRUE; }

14 years, 10 months

[jimtabor] 45341: [User32] - More movement to WND support.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 30 07:41:39 2010 New Revision: 45341 URL: http://svn.reactos.org/svn/reactos?rev=45341&view=rev Log: [User32] - More movement to WND support. Modified: trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sat Jan 30 07:41:39 2010 @@ -37,9 +37,20 @@ static HBITMAP hHatch; const DWORD HatchBitmap[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA}; +BOOL WINAPI MirrorRgn(HWND hwnd, HRGN hrgn); BOOL WINAPI PolyPatBlt(HDC,DWORD,PPATRECT,INT,ULONG); /* FUNCTIONS *****************************************************************/ + +INT +WINAPI +MirrorWindowRect( PWND pWnd, LPRECT lprc) +{ + INT Ret = pWnd->rcWindow.right - pWnd->rcWindow.left - lprc->left; + lprc->left = pWnd->rcWindow.right - pWnd->rcWindow.left - lprc->right; + lprc->right = Ret; + return Ret; +} VOID CreateFrameBrushes(VOID) @@ -91,7 +102,24 @@ LPRECT Rect, BOOL Erase) { - return NtUserGetUpdateRect(Wnd, Rect, Erase); + PWND pWnd; + + pWnd = ValidateHwnd(Wnd); + if (!pWnd) + return FALSE; +/* + if ( pWnd->hrgnUpdate || + pWnd->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT|WNDS_UPDATEDIRTY|WNDS_PAINTNOTPROCESSED)) + {*/ + return NtUserGetUpdateRect(Wnd, Rect, Erase); +/* } + + if (Rect) + { // Did the Rgn update? No! Back set and shutup! + Rect->left = Rect->right = Rect->top = Rect->bottom = 0; + } + return FALSE; // msdn: "If there is no update region, the return value is zero." +*/ } @@ -105,7 +133,25 @@ HRGN hRgn, BOOL bErase) { - return NtUserGetUpdateRgn(hWnd, hRgn, bErase); + PWND pWnd; + + if (!hRgn) + { + SetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } + + pWnd = ValidateHwnd(hWnd); + if (!pWnd) + return ERROR; +/* + if ( pWnd->hrgnUpdate || + pWnd->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT|WNDS_UPDATEDIRTY|WNDS_PAINTNOTPROCESSED)) + {*/ + return NtUserGetUpdateRgn(hWnd, hRgn, bErase); +/* } + SetRectRgn(hRgn, 0, 0, 0, 0); + return NULLREGION;*/ } @@ -224,7 +270,31 @@ HWND hWnd, HRGN hRgn) { - return (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_GETWINDOWRGN); + PWND pWnd; + int Ret; + + if (!hRgn) + return ERROR; + + pWnd = ValidateHwnd(hWnd); + + if (!pWnd) // || !pwnd->hrgnClip || pwnd->state2 & WNDS2_MAXIMIZEDMONITORREGION) + return ERROR; +/* + Ret = CombineRgn(hRgn, pWnd->hrgnClip, NULL, RGN_COPY); + + if (!Ret) + return ERROR; + + if (pWnd->fnid != FNID_DESKTOP) + Ret = OffsetRgn(hRgn, -pWnd->rcWindow.left, -pWnd->rcWindow.top); + + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) + MirrorRgn(hWnd, hRgn); +*/ + Ret = (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_GETWINDOWRGN); + + return Ret; } /* @@ -236,7 +306,31 @@ HWND hWnd, LPRECT lprc) { - return (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)lprc, TWOPARAM_ROUTINE_GETWINDOWRGNBOX); + PWND pWnd; + int Ret; + + if (!lprc) + return ERROR; + + pWnd = ValidateHwnd(hWnd); + + if (!pWnd) // || !pwnd->hrgnClip || pwnd->state2 & WNDS2_MAXIMIZEDMONITORREGION) + return ERROR; +/* + Ret = GetRgnBox(pWnd->hrgnClip, lprc); + + if (!Ret) + return ERROR; + + if (pWnd->fnid != FNID_DESKTOP) + Ret = OffsetRect(lprc, -pWnd->rcWindow.left, -pWnd->rcWindow.top); + + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) + MirrorWindowRect(pWnd, lprc); +*/ + Ret = (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)lprc, TWOPARAM_ROUTINE_GETWINDOWRGNBOX); + + return Ret; }

14 years, 10 months

[tkreuzer] 45340: add else

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 05:27:17 2010 New Revision: 45340 URL: http://svn.reactos.org/svn/reactos?rev=45340&view=rev Log: add else Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sat Jan 30 05:27:17 2010 @@ -159,5 +159,6 @@ conditionals. We therefore use "if", too. .if shouldn't be used at all */ #define if .if #define endif .endif +#define else .else #endif

14 years, 10 months

[jimtabor] 45339: [Win32k|User32] - Updated paint functions to use one calls. - Found one leak in engwindow.c and monitor.c, not the big one.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 30 05:23:58 2010 New Revision: 45339 URL: http://svn.reactos.org/svn/reactos?rev=45339&view=rev Log: [Win32k|User32] - Updated paint functions to use one calls. - Found one leak in engwindow.c and monitor.c, not the big one. Modified: trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -198,8 +198,7 @@ pWnd->state & WNDS_INTERNALPAINT || pWnd->spwndChild ) {*/ - return RedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); -// return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); + return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); /* } return TRUE;*/ } @@ -213,10 +212,7 @@ HWND hWnd, HRGN hRgn) { - /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, - but Wine dont so i removed it... */ - return RedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); -// return NtUserCallHwndParamLock(hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); + return NtUserCallHwndParamLock(hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); } /* Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -83,6 +83,8 @@ PROSRGNDATA visRgn; CLIPOBJ *ClipObj = NULL; CLIPOBJ *OldClipObj; + + DPRINT("IntEngWndUpdateClipObj\n"); hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) @@ -115,6 +117,7 @@ { DPRINT1("Warning: Couldn't lock visible region of window DC\n"); } + REGION_FreeRgnByHandle(hVisRgn); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -190,7 +190,7 @@ Monitor->rcWork = Monitor->rcMonitor; Monitor->cWndStack = 0; - Monitor->hrgnMonitor= IntSysCreateRectRgnIndirect( &Monitor->rcMonitor ); + Monitor->hrgnMonitor = IntSysCreateRectRgnIndirect( &Monitor->rcMonitor ); IntGdiSetRegionOwner(Monitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); @@ -263,6 +263,9 @@ if (Monitor->Next != NULL) Monitor->Next->Prev = Monitor->Prev; } + + if (Monitor->hrgnMonitor) + REGION_FreeRgnByHandle(Monitor->hrgnMonitor); IntDestroyMonitorObject(Monitor); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -712,9 +712,39 @@ DWORD Param, DWORD Routine) { - UNIMPLEMENTED; - - return 0; + DWORD Ret = 0; + PWINDOW_OBJECT Window; + PWND Wnd; + USER_REFERENCE_ENTRY Ref; + DECLARE_RETURN(DWORD); + + DPRINT1("Enter NtUserCallHwndParamLock\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) + { + RETURN( FALSE); + } + UserRefObjectCo(Window, &Ref); + + Wnd = Window->Wnd; + + switch (Routine) + { + case TWOPARAM_ROUTINE_VALIDATERGN: + Ret = (DWORD)co_UserRedrawWindow( Window, NULL, (HRGN)Param, RDW_VALIDATE); + break; + } + + UserDerefObjectCo(Window); + + RETURN( Ret); + +CLEANUP: + DPRINT1("Leave NtUserCallHwndParamLock, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; + } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -4625,6 +4625,7 @@ HRGN hRgn, BOOL bRedraw) { + HRGN hrgnCopy; PWINDOW_OBJECT Window; DECLARE_RETURN(INT); @@ -4636,15 +4637,25 @@ RETURN( 0); } - /* FIXME - Verify if hRgn is a valid handle!!!! - Propably make this operation thread-safe, but maybe it's not necessary */ - - if(Window->hrgnClip) + if (hRgn) // The region will be deleted in user32. + { + if (GDIOBJ_ValidateHandle(hRgn, GDI_OBJECT_TYPE_REGION)) + { + hrgnCopy = IntSysCreateRectRgn(0, 0, 0, 0); + NtGdiCombineRgn(hrgnCopy, hRgn, 0, RGN_COPY); + } + else + RETURN( 0); + } + else + hrgnCopy = (HRGN) 1; + + if (Window->hrgnClip) { /* Delete no longer needed region handle */ GreDeleteObject(Window->hrgnClip); } - Window->hrgnClip = hRgn; + Window->hrgnClip = hrgnCopy; /* FIXME - send WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED messages to the window */

14 years, 10 months

[tkreuzer] 45338: and the same for trap.S

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 04:18:20 2010 New Revision: 45338 URL: http://svn.reactos.org/svn/reactos?rev=45338&view=rev Log: and the same for trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Jan 30 04:18:20 2010 @@ -51,10 +51,10 @@ label1: .asciz "\func" label2: sub rsp, 32 - lea rcx, RIP(_MsgTrapInfo) + lea rcx, _MsgTrapInfo[rip] lea rdx, 1b[rip] mov r8, [rbp + KTRAP_FRAME_Rip] - call qword ptr RIP(_FrLdrDbgPrint) + call qword ptr _FrLdrDbgPrint[rip] add rsp, 32 #endif ENDM @@ -401,9 +401,9 @@ TRAPINFO KiBreakpointTrap -// lea rcx, RIP(_MsgBreakpointTrap) +// lea rcx, _MsgBreakpointTrap[rip] // mov rdx, rsp -// call qword ptr RIP(_FrLdrDbgPrint) +// call qword ptr _FrLdrDbgPrint[rip] /* Dispatch the exception */ mov eax, STATUS_BREAKPOINT @@ -464,8 +464,8 @@ // DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, RIP(_MsgInvalidOpcodeFault) - call qword ptr RIP(_FrLdrDbgPrint) + lea rcx, _MsgInvalidOpcodeFault[rip] + call qword ptr _FrLdrDbgPrint[rip] jmp $ /* Return */ @@ -496,10 +496,10 @@ ENTER_TRAP_FRAME TRAPFLAG_ALL - lea rcx, RIP(_MsgDoubleFault) + lea rcx, _MsgDoubleFault[rip] mov rdx, [rbp + KTRAP_FRAME_FaultAddress] mov r8, rbp - call qword ptr RIP(_FrLdrDbgPrint) + call qword ptr _FrLdrDbgPrint[rip] /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ mov rcx, HEX(0000007F) @@ -573,8 +573,8 @@ TRAPINFO KiGeneralProtectionFault mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, RIP(_MsgGeneralProtFault) - call qword ptr RIP(_FrLdrDbgPrint) + lea rcx, _MsgGeneralProtFault[rip] + call qword ptr _FrLdrDbgPrint[rip] /* Check if this was from user-mode */ cmp byte ptr [rbp + KTRAP_FRAME_PreviousMode], KernelMode @@ -685,11 +685,11 @@ TRAPINFO KiPageFault #if 0 - lea rcx, RIP(_MsgPageFault) + lea rcx, _MsgPageFault[rip] mov rdx, [rbp + KTRAP_FRAME_ErrorCode] mov r8, [rbp + KTRAP_FRAME_Rip] mov r9, [rbp + KTRAP_FRAME_FaultAddress] - call qword ptr RIP(_FrLdrDbgPrint) + call qword ptr _FrLdrDbgPrint[rip] #endif /* Save page fault address */

14 years, 10 months

[tkreuzer] 45337: remove the RIP() hack, instead use a constant rip=0 for MASM/ML

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jan 30 04:17:11 2010 New Revision: 45337 URL: http://svn.reactos.org/svn/reactos?rev=45337&view=rev Log: remove the RIP() hack, instead use a constant rip=0 for MASM/ML Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sat Jan 30 04:17:11 2010 @@ -18,7 +18,7 @@ #define VAL(x) x /* MASM/ML doesn't want explicit [rip] addressing */ -#define RIP(address) [address] +rip = 0 /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ #define MACRO(name, ...) name MACRO __VA_ARGS__ @@ -59,9 +59,6 @@ /* Macro values need to be marked */ #define VAL(x) \x - -/* GAS needs explicit [rip] addressing */ -#define RIP(address) address##[rip] /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ #define MACRO(...) .macro __VA_ARGS__

14 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010