Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 64193: [WIN32K] - Check the right variable for error condition
by jgardou＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: jgardou Date: Thu Sep 18 14:26:59 2014 New Revision: 64193 URL: http://svn.reactos.org/svn/reactos?rev=64193&view=rev Log: [WIN32K] - Check the right variable for error condition Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Sep 18 14:26:59 2014 @@ -1930,7 +1930,7 @@ RETURN(Result); CLEANUP: - if (hrgnUpdate && (Result != ERROR)) + if (hrgnUpdate && (_ret_ != ERROR)) { /* Give everything back to the caller */ RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL);

1 0

[tkreuzer] 64192: [NTOSKRNL/AMD64] Actually revert the change to KiRaiseAssertion, it was correct before
by tkreuzer＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: tkreuzer Date: Thu Sep 18 14:10:41 2014 New Revision: 64192 URL: http://svn.reactos.org/svn/reactos?rev=64192&view=rev Log: [NTOSKRNL/AMD64] Actually revert the change to KiRaiseAssertion, it was correct before Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Sep 18 14:10:41 2014 @@ -612,7 +612,7 @@ PUBLIC KiRaiseAssertion FUNC KiRaiseAssertion /* We have an error code */ - EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + EnterTrap (TF_SAVE_ALL) /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ sub qword ptr [rbp + KTRAP_FRAME_Rip], 2

1 0

[tkreuzer] 64191: [NTOSKRNL/AMD64] - Fix trap flags in KiRaiseAssertion - Add some asm debugcode
by tkreuzer＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: tkreuzer Date: Thu Sep 18 14:06:31 2014 New Revision: 64191 URL: http://svn.reactos.org/svn/reactos?rev=64191&view=rev Log: [NTOSKRNL/AMD64] - Fix trap flags in KiRaiseAssertion - Add some asm debugcode Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Sep 18 14:06:31 2014 @@ -30,6 +30,55 @@ MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" +MsgPageFault: +.asciz "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n" + +MsgGeneralProtFault: +.asciz "General protection fault at %p!\n" + +MsgBreakpointTrap: +.asciz "BreakpointTrap at %p\n" + +MsgUnexpectedInterrupt: +.asciz "UnexpectedInterrupt Vector=0x%02lx\n" + +MsgInvalidOpcodeFault: +.asciz "Invalid opcode fault at %p!\n" + +MsgDoubleFault: +.asciz "Double fault at %p, rbp=%p!\n" + +MsgTrapInfo: +.asciz "Trap: %s at %p\n" + +MACRO(TRAPINFO, func) +LOCAL label1, label2 +#if 0 + jmp label2 +label1: .asciz "\func" +label2: + push rax + push rcx + push rdx + push r8 + push r9 + push r10 + push r11 + sub rsp, 32 + lea rcx, MsgTrapInfo[rip] + lea rdx, 1b[rip] + mov r8, [rbp + KTRAP_FRAME_Rip] + call qword ptr FrLdrDbgPrint[rip] + pop r11 + pop r10 + pop r9 + pop r8 + pop rdx + pop rcx + pop rax + add rsp, 32 +#endif +ENDM /* Helper Macros *************************************************************/ @@ -87,7 +136,7 @@ // rbp = TrapFrame, eax = ExceptionCode, edx = NumParams, r9,r10,r11 = params -.PROC InternalDispatchException +FUNC InternalDispatchException /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ sub rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH @@ -155,7 +204,7 @@ add rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH ret -.ENDP +ENDFUNC InternalDispatchException /* CPU EXCEPTION HANDLERS ****************************************************/ @@ -173,7 +222,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiDivideErrorFault PUBLIC KiDebugTrapOrFault @@ -181,6 +230,8 @@ /* Push pseudo error code */ EnterTrap TF_SAVE_ALL + TRAPINFO KiDebugTrapOrFault + /* Check if the frame was from kernelmode */ test word ptr [rbp + KTRAP_FRAME_SegCs], 3 jz KiDebugTrapOrFaultKMode @@ -194,7 +245,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiDebugTrapOrFault PUBLIC KiNmiInterrupt @@ -207,7 +258,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiNmiInterrupt PUBLIC KiBreakpointTrap @@ -228,7 +279,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiBreakpointTrap PUBLIC KiOverflowTrap @@ -244,7 +295,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiOverflowTrap PUBLIC KiBoundFault @@ -268,13 +319,19 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiBoundFault PUBLIC KiInvalidOpcodeFault FUNC KiInvalidOpcodeFault /* No error code */ EnterTrap TF_SAVE_ALL + + TRAPINFO KiInvalidOpcodeFault + + mov rdx, [rbp + KTRAP_FRAME_Rip] + lea rcx, MsgInvalidOpcodeFault[rip] + call qword ptr FrLdrDbgPrint[rip] /* Enable interrupts */ sti @@ -293,7 +350,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiInvalidOpcodeFault PUBLIC KiNpxNotAvailableFault @@ -315,18 +372,23 @@ KiNpxNotAvailableFaultExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiNpxNotAvailableFault PUBLIC KiDoubleFaultAbort FUNC KiDoubleFaultAbort /* No error code */ EnterTrap TF_SAVE_ALL + + lea rcx, MsgDoubleFault[rip] + mov rdx, [rbp + KTRAP_FRAME_FaultAddress] + mov r8, rbp + call qword ptr FrLdrDbgPrint[rip] /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT jmp $ -ENDFUNC +ENDFUNC KiDoubleFaultAbort PUBLIC KiNpxSegmentOverrunAbort @@ -336,8 +398,9 @@ /* Bugcheck */ Fatal EXCEPTION_NPX_OVERRUN + jmp $ -ENDFUNC +ENDFUNC KiNpxSegmentOverrunAbort PUBLIC KiInvalidTssFault @@ -348,7 +411,7 @@ /* Bugcheck */ Fatal EXCEPTION_INVALID_TSS jmp $ -ENDFUNC +ENDFUNC KiInvalidTssFault PUBLIC KiSegmentNotPresentFault @@ -359,7 +422,7 @@ /* Bugcheck */ Fatal EXCEPTION_SEGMENT_NOT_PRESENT jmp $ -ENDFUNC +ENDFUNC KiSegmentNotPresentFault PUBLIC KiStackFault @@ -370,13 +433,18 @@ /* Bugcheck */ Fatal EXCEPTION_STACK_FAULT jmp $ -ENDFUNC +ENDFUNC KiStackFault PUBLIC KiGeneralProtectionFault FUNC KiGeneralProtectionFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + + //TRAPINFO KiGeneralProtectionFault + //mov rdx, [rbp + KTRAP_FRAME_Rip] + //lea rcx, MsgGeneralProtFault[rip] + //call qword ptr FrLdrDbgPrint[rip] /* Call the C handler */ mov rcx, rbp @@ -404,13 +472,23 @@ /* Return */ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiGeneralProtectionFault PUBLIC KiPageFault FUNC KiPageFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + + TRAPINFO KiPageFault + +#if 0 + 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 FrLdrDbgPrint[rip] +#endif /* Save page fault address */ mov rdx, cr2 @@ -482,7 +560,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiFloatingErrorFault PUBLIC KiAlignmentFault @@ -493,7 +571,7 @@ /* Bugcheck */ Fatal EXCEPTION_ALIGNMENT_CHECK jmp $ -ENDFUNC +ENDFUNC KiAlignmentFault PUBLIC KiMcheckAbort @@ -504,7 +582,7 @@ /* Bugcheck */ Fatal HEX(12) jmp $ -ENDFUNC +ENDFUNC KiMcheckAbort PUBLIC KiXmmException @@ -526,7 +604,7 @@ KiXmmExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiXmmException /* SOFTWARE INTERRUPT SERVICES ***********************************************/ @@ -534,7 +612,7 @@ PUBLIC KiRaiseAssertion FUNC KiRaiseAssertion /* We have an error code */ - EnterTrap (TF_SAVE_ALL) + EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ sub qword ptr [rbp + KTRAP_FRAME_Rip], 2 @@ -544,13 +622,15 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiRaiseAssertion PUBLIC KiDebugServiceTrap -.PROC KiDebugServiceTrap - /* No error code */ - EnterTrap TF_SAVE_ALL +FUNC KiDebugServiceTrap + /* No error code */ + EnterTrap TF_SAVE_ALL + + TRAPINFO KiDebugServiceTrap /* Increase Rip to skip the int3 */ inc qword ptr [rbp + KTRAP_FRAME_Rip] @@ -560,7 +640,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -.ENDP +ENDFUNC KiDebugServiceTrap PUBLIC KiApcInterrupt @@ -666,7 +746,7 @@ #endif /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiUnexpectedInterrupt PUBLIC KiInterruptDispatch FUNC KiInterruptDispatch

1 0

[jgardou] 64190: [WIN32K] - Fix error handling in NtGdiPathToRegion
by jgardou＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: jgardou Date: Thu Sep 18 13:27:02 2014 New Revision: 64190 URL: http://svn.reactos.org/svn/reactos?rev=64190&view=rev Log: [WIN32K] - Fix error handling in NtGdiPathToRegion Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Thu Sep 18 13:27:02 2014 @@ -2716,19 +2716,20 @@ { PATH_UnlockPath(pPath); DC_UnlockDc(pDc); + return NULL; } hrgnRval = Rgn->BaseObject.hHmgr; /* FIXME: Should we empty the path even if conversion failed? */ if (PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn)) { PATH_EmptyPath(pPath); + RGNOBJAPI_Unlock(Rgn); } else { - GreDeleteObject(hrgnRval); + REGION_Delete(Rgn); hrgnRval = NULL; } - RGNOBJAPI_Unlock(Rgn); } PATH_UnlockPath(pPath);

1 0

[jgardou] 64189: [WIN32K] - Do not make callouts to user-mode while holding a lock on GDI objects. Fixes crashes in user32_winetest:win and :msg
by jgardou＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: jgardou Date: Thu Sep 18 13:26:55 2014 New Revision: 64189 URL: http://svn.reactos.org/svn/reactos?rev=64189&view=rev Log: [WIN32K] - Do not make callouts to user-mode while holding a lock on GDI objects. Fixes crashes in user32_winetest:win and :msg Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Sep 18 13:26:55 2014 @@ -1230,13 +1230,12 @@ REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom); RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND); IntGdiOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top); + RGNOBJAPI_Unlock(UpdateRgn); if (bErase && RegionType != NULLREGION && RegionType != ERROR) { co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); } - - RGNOBJAPI_Unlock(UpdateRgn); return RegionType; } @@ -1265,7 +1264,8 @@ RETURN(ERROR); } - Rgn = RGNOBJAPI_Lock(hRgn, NULL); + /* Use a system region, we can't hold GDI locks when doing roundtrips to user mode */ + Rgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (!Rgn) RETURN(ERROR); @@ -1276,8 +1276,21 @@ RETURN(ret); CLEANUP: + if (Rgn && (_ret_ != ERROR)) + { + PREGION TheRgn = RGNOBJAPI_Lock(hRgn, NULL); + if (!TheRgn) + { + EngSetLastError(ERROR_INVALID_HANDLE); + _ret_ = ERROR; + } + IntGdiCombineRgn(TheRgn, Rgn, NULL, RGN_COPY); + RGNOBJAPI_Unlock(TheRgn); + } + if (Rgn) - RGNOBJAPI_Unlock(Rgn); + REGION_Delete(Rgn); + TRACE("Leave NtUserGetUpdateRgn, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; @@ -1427,14 +1440,27 @@ RETURN( FALSE); } + /* We can't hold lock on GDI obects while doing roundtrips to user mode, + * so use a copy instead */ if (hrgnUpdate) { - RgnUpdate = RGNOBJAPI_Lock(hrgnUpdate, NULL); + PREGION RgnTemp; + + RgnUpdate = IntSysCreateRectpRgn(0, 0, 0, 0); if (!RgnUpdate) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + RETURN(FALSE); + } + + RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL); + if (!RgnTemp) { EngSetLastError(ERROR_INVALID_HANDLE); RETURN(FALSE); } + IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); + RGNOBJAPI_Unlock(RgnTemp); } UserRefObjectCo(Wnd, &Ref); @@ -1450,7 +1476,7 @@ CLEANUP: if (RgnUpdate) - RGNOBJAPI_Unlock(RgnUpdate); + REGION_Delete(RgnUpdate); TRACE("Leave NtUserRedrawWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; @@ -1687,11 +1713,10 @@ INT Result; PWND Window = NULL, CaretWnd; HDC hDC; - PREGION RgnOwn = NULL, RgnTemp, RgnWinupd = NULL; + PREGION RgnUpdate = NULL, RgnTemp, RgnWinupd = NULL; HWND hwndCaret; DWORD dcxflags = 0; int rdw_flags; - BOOL bOwnRgn = TRUE; NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1743,17 +1768,26 @@ RETURN(NULLREGION); } + /* We must use a copy of the region, as we can't hold an exclusive lock + * on it while doing callouts to user-mode */ + RgnUpdate = IntSysCreateRectpRgn(0, 0, 0, 0); + if(!RgnUpdate) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + RETURN(ERROR); + } + if (hrgnUpdate) { - RgnOwn = RGNOBJAPI_Lock(hrgnUpdate, NULL); - if (!RgnOwn) - { - RETURN(ERROR); - } - bOwnRgn = FALSE; - } - else - RgnOwn = IntSysCreateRectpRgn(0, 0, 0, 0); + RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL); + if (!RgnTemp) + { + EngSetLastError(ERROR_INVALID_HANDLE); + RETURN(ERROR); + } + IntGdiCombineRgn(RgnUpdate, RgnTemp, NULL, RGN_COPY); + RGNOBJAPI_Unlock(RgnTemp); + } /* ScrollWindow uses the window DC, ScrollWindowEx doesn't */ if (flags & SW_SCROLLWNDDCE) @@ -1788,9 +1822,9 @@ Result = UserScrollDC( hDC, dx, dy, - &rcScroll, - &rcClip, - RgnOwn, + &rcScroll, + &rcClip, + RgnUpdate, prcUnsafeUpdate? &rcUpdate : NULL); UserReleaseDC(Window, hDC, FALSE); @@ -1801,28 +1835,31 @@ */ RgnTemp = IntSysCreateRectpRgn(0, 0, 0, 0); - if (RgnTemp) - { - if (co_UserGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) - { - PREGION RgnClip = IntSysCreateRectpRgnIndirect(&rcClip); - if (RgnClip) + if (!RgnTemp) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + RETURN(ERROR); + } + + if (co_UserGetUpdateRgn(Window, RgnTemp, FALSE) != NULLREGION) + { + PREGION RgnClip = IntSysCreateRectpRgnIndirect(&rcClip); + if (RgnClip) + { + if (hrgnUpdate) { - if (!bOwnRgn) - { - RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); - IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); - } - IntGdiOffsetRgn(RgnTemp, dx, dy); - IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); - if (!bOwnRgn) - IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); - co_UserRedrawWindow(Window, NULL, RgnTemp, rdw_flags ); - REGION_Delete(RgnClip); + RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); + IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); } - } - REGION_Delete(RgnTemp); - } + IntGdiOffsetRgn(RgnTemp, dx, dy); + IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); + if (hrgnUpdate) + IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); + co_UserRedrawWindow(Window, NULL, RgnTemp, rdw_flags ); + REGION_Delete(RgnClip); + } + } + REGION_Delete(RgnTemp); if (flags & SW_SCROLLCHILDREN) { @@ -1854,7 +1891,7 @@ if (flags & (SW_INVALIDATE | SW_ERASE)) { - co_UserRedrawWindow(Window, NULL, RgnOwn, rdw_flags | + co_UserRedrawWindow(Window, NULL, RgnUpdate, rdw_flags | ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); } @@ -1893,19 +1930,27 @@ RETURN(Result); CLEANUP: - if (RgnWinupd && !bOwnRgn) - { - IntGdiCombineRgn( RgnOwn, RgnOwn, RgnWinupd, RGN_OR); - REGION_Delete(RgnWinupd); - } - - if (RgnOwn && !hrgnUpdate) - { - REGION_Delete(RgnOwn); - } - else if (RgnOwn) - { - RGNOBJAPI_Unlock(RgnOwn); + if (hrgnUpdate && (Result != ERROR)) + { + /* Give everything back to the caller */ + RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL); + /* The handle should still be valid */ + ASSERT(RgnTemp); + if (RgnWinupd) + IntGdiCombineRgn(RgnTemp, RgnUpdate, RgnWinupd, RGN_OR); + else + IntGdiCombineRgn(RgnTemp, RgnUpdate, NULL, RGN_COPY); + RGNOBJAPI_Unlock(RgnTemp); + } + + if (RgnWinupd) + { + REGION_Delete(RgnWinupd); + } + + if (RgnUpdate) + { + REGION_Delete(RgnUpdate); } if (Window)

1 0

[jgardou] 64188: [USER32_WINETEST] - Compile as a GUI app
by jgardou＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: jgardou Date: Thu Sep 18 13:04:59 2014 New Revision: 64188 URL: http://svn.reactos.org/svn/reactos?rev=64188&view=rev Log: [USER32_WINETEST] - Compile as a GUI app Modified: trunk/rostests/winetests/user32/CMakeLists.txt Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Thu Sep 18 13:04:59 2014 @@ -27,6 +27,7 @@ testlist.c) add_executable(user32_winetest ${SOURCE} resource.rc) -set_module_type(user32_winetest win32cui) +# some tests need to be run from an app compiled as GUI +set_module_type(user32_winetest win32gui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32) add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all)

1 0

[jgardou] 64187: [WIN32K] - Enable all debug channels if DEBUGCHANNEL is set to "+all". - Fix GDI objects exclusive locks counting, fixing a memory corruption altogether. - Add a missing lock relea...
by jgardou＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: jgardou Date: Thu Sep 18 12:09:19 2014 New Revision: 64187 URL: http://svn.reactos.org/svn/reactos?rev=64187&view=rev Log: [WIN32K] - Enable all debug channels if DEBUGCHANNEL is set to "+all". - Fix GDI objects exclusive locks counting, fixing a memory corruption altogether. - Add a missing lock release on error path. - Add a debug print. Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/winpos.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Thu Sep 18 12:09:19 2014 @@ -595,6 +595,16 @@ DBG_CHANNEL *ChannelEntry; UINT iLevel, iChannel; + /* Special treatment for the "all" channel */ + if (wcscmp(channel, L"all") == 0) + { + for (iChannel = 0; iChannel < DbgChCount; iChannel++) + { + DbgAddDebugChannel(ppi, DbgChannels[iChannel].Name, level, op); + } + return TRUE; + } + ChannelEntry = (DBG_CHANNEL*)bsearch(channel, DbgChannels, DbgChCount, Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Thu Sep 18 12:09:19 2014 @@ -37,12 +37,40 @@ #define NDEBUG #include <debug.h> -// Move to gdidbg.h + +FORCEINLINE +void +INCREASE_THREAD_LOCK_COUNT( + _In_ HANDLE hobj) +{ + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + DBG_UNREFERENCED_PARAMETER(hobj); + if (pti) + { #if DBG -#define DBG_INCREASE_LOCK_COUNT(pti, hobj) \ - if (pti) ((PTHREADINFO)pti)->acExclusiveLockCount[((ULONG_PTR)hobj >> 16) & 0x1f]++; -#define DBG_DECREASE_LOCK_COUNT(pti, hobj) \ - if (pti) ((PTHREADINFO)pti)->acExclusiveLockCount[((ULONG_PTR)hobj >> 16) & 0x1f]--; + pti->acExclusiveLockCount[((ULONG_PTR)hobj >> 16) & 0x1f]++; +#endif + pti->cExclusiveLocks++; + } +} + +FORCEINLINE +void +DECREASE_THREAD_LOCK_COUNT( + _In_ HANDLE hobj) +{ + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + DBG_UNREFERENCED_PARAMETER(hobj); + if (pti) + { +#if DBG + pti->acExclusiveLockCount[((ULONG_PTR)hobj >> 16) & 0x1f]--; +#endif + pti->cExclusiveLocks--; + } +} + +#if DBG #define ASSERT_SHARED_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_SURF_TYPE || \ (objt) == GDIObjType_PAL_TYPE || \ @@ -55,8 +83,6 @@ #define ASSERT_TRYLOCK_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DRVOBJ_TYPE) #else -#define DBG_INCREASE_LOCK_COUNT(ppi, hobj) -#define DBG_DECREASE_LOCK_COUNT(x, y) #define ASSERT_SHARED_OBJECT_TYPE(objt) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) #define ASSERT_TRYLOCK_OBJECT_TYPE(objt) @@ -684,7 +710,7 @@ /* Increase lock count */ pobj->cExclusiveLock++; - DBG_INCREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), hobj); + INCREASE_THREAD_LOCK_COUNT(hobj); DBG_LOGEVENT(&pobj->slhLog, EVENT_LOCK, 0); /* Return the object */ @@ -735,7 +761,7 @@ /* Increase lock count */ pobj->cExclusiveLock++; - DBG_INCREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), hobj); + INCREASE_THREAD_LOCK_COUNT(hobj); DBG_LOGEVENT(&pobj->slhLog, EVENT_LOCK, 0); /* Return the object */ @@ -751,7 +777,7 @@ /* Decrease lock count */ pobj->cExclusiveLock--; - DBG_DECREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), pobj->hHmgr); + DECREASE_THREAD_LOCK_COUNT(pobj->hHmgr); DBG_LOGEVENT(&pobj->slhLog, EVENT_UNLOCK, 0); /* Check if this was the last lock */ @@ -802,7 +828,7 @@ ExAcquirePushLockExclusive(&pobj->pushlock); pobj->cExclusiveLock = 1; pobj->dwThreadId = PtrToUlong(PsGetCurrentThreadId()); - DBG_INCREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), pobj->hHmgr); + INCREASE_THREAD_LOCK_COUNT(pobj->hHmgr); /* Get object type from the hHmgr field */ objt = ((ULONG_PTR)pobj->hHmgr >> 16) & 0xff; @@ -1000,7 +1026,7 @@ /* Release the pushlock and reenable APCs */ ExReleasePushLockExclusive(&pobj->pushlock); KeLeaveCriticalRegion(); - DBG_DECREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), pobj->hHmgr); + DECREASE_THREAD_LOCK_COUNT(pobj->hHmgr); } } Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Thu Sep 18 12:09:19 2014 @@ -475,7 +475,10 @@ UserEnterShared(); if (!gspklBaseLayout) + { + UserLeave(); return 0; + } pKl = gspklBaseLayout; if (nBuff == 0) Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Sep 18 12:09:19 2014 @@ -244,6 +244,7 @@ VOID FASTCALL UserLeave(VOID) { ASSERT_NOGDILOCKS(); + ASSERT(UserIsEntered()); ExReleaseResourceLite(&UserLock); KeLeaveCriticalRegion(); } Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Thu Sep 18 12:09:19 2014 @@ -1258,6 +1258,7 @@ if (!(WinPos->flags & SWP_NOSENDCHANGING)) { + TRACE("Sending WM_WINDOWPOSCHANGING to hwnd %p.\n", Window->head.h); co_IntSendMessageNoWait(Window->head.h, WM_WINDOWPOSCHANGING, 0, (LPARAM) WinPos); }

1 0

[tkreuzer] 64186: [RTL] - Implement RtlpCloseRegistryHandle helper, which closes a registry key, if RTL_REGISTRY_HANDLE was not passed as RelativeTo - Use RtlpCloseRegistryHandle whereever required...
by tkreuzer＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: tkreuzer Date: Thu Sep 18 10:39:54 2014 New Revision: 64186 URL: http://svn.reactos.org/svn/reactos?rev=64186&view=rev Log: [RTL] - Implement RtlpCloseRegistryHandle helper, which closes a registry key, if RTL_REGISTRY_HANDLE was not passed as RelativeTo - Use RtlpCloseRegistryHandle whereever required, fixing some cases, where we unconditionally closed the handle Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=641… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Thu Sep 18 10:39:54 2014 @@ -551,6 +551,20 @@ return Status; } +FORCEINLINE +VOID +RtlpCloseRegistryHandle( + _In_ ULONG RelativeTo, + _In_ HANDLE KeyHandle) +{ + /* Did the caller pass a key handle? */ + if (!(RelativeTo & RTL_REGISTRY_HANDLE)) + { + /* We opened the key in RtlpGetRegistryHandle, so close it now */ + ZwClose(KeyHandle); + } +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -572,7 +586,7 @@ &KeyHandle); if (!NT_SUCCESS(Status)) return Status; - /* All went well, close the handle and return success */ + /* Close the handle even for RTL_REGISTRY_HANDLE */ ZwClose(KeyHandle); return STATUS_SUCCESS; } @@ -596,8 +610,8 @@ &KeyHandle); if (!NT_SUCCESS(Status)) return Status; - /* All went well, close the handle and return success */ - ZwClose(KeyHandle); + /* All went well, close the handle and return status */ + RtlpCloseRegistryHandle(RelativeTo, KeyHandle); return STATUS_SUCCESS; } @@ -626,8 +640,8 @@ RtlInitUnicodeString(&Name, ValueName); Status = ZwDeleteValueKey(KeyHandle, &Name); - /* All went well, close the handle and return status */ - ZwClose(KeyHandle); + /* Close the handle and return status */ + RtlpCloseRegistryHandle(RelativeTo, KeyHandle); return Status; } @@ -664,13 +678,8 @@ ValueData, ValueLength); - /* Did the caller pass a key handle? */ - if (!(RelativeTo & RTL_REGISTRY_HANDLE)) - { - /* We opened the key in RtlpGetRegistryHandle, so close it now */ - ZwClose(KeyHandle); - } - + /* Close the handle and return status */ + RtlpCloseRegistryHandle(RelativeTo, KeyHandle); return Status; } @@ -1017,7 +1026,7 @@ if (!KeyValueInfo) { /* Close the handle if we have one and fail */ - if (!(RelativeTo & RTL_REGISTRY_HANDLE)) ZwClose(KeyHandle); + RtlpCloseRegistryHandle(RelativeTo, KeyHandle); return Status; } @@ -1318,7 +1327,7 @@ } /* Check if we need to close our handle */ - if ((KeyHandle) && !(RelativeTo & RTL_REGISTRY_HANDLE)) ZwClose(KeyHandle); + if (KeyHandle) RtlpCloseRegistryHandle(RelativeTo, KeyHandle); if ((CurrentKey) && (CurrentKey != KeyHandle)) ZwClose(CurrentKey); /* Free our buffer and return status */

1 0

[hbelusca] 64185: [NTVDM] - Add dummy INT 18h (ROM Basic) and INT 19h (Bootstrap loader) interrupts. If INT 18h will never be implemented, INT 19h can be used one day... - Add the standard bootstra...
by hbelusca＠svn.reactos.org 18 Sep '14

18 Sep '14

Author: hbelusca Date: Thu Sep 18 00:16:17 2014 New Revision: 64185 URL: http://svn.reactos.org/svn/reactos?rev=64185&view=rev Log: [NTVDM] - Add dummy INT 18h (ROM Basic) and INT 19h (Bootstrap loader) interrupts. If INT 18h will never be implemented, INT 19h can be used one day... - Add the standard bootstrap code snippets at F000:FFF0 and F000:E05B. - For compatibility purposes, and nice info reporting via tools like Microsoft Diagnostics, or Symantec SysInfo, or whatever else..., register nice BIOS Copyright and Version strings. Also add a version string at the end of the BIOS. - Fix our reported BIOS model. - Add some temporary documentation (from Bochs BIOS) about the ROM BIOS compatibility entry-points that some apps may use (instead of passing through more documented & standard interfaces). Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Thu Sep 18 00:16:17 2014 @@ -112,8 +112,8 @@ WORD Length; // 0x00 BYTE Model; // 0x02 BYTE SubModel; // 0x03 - BYTE BiosRevision; // 0x04 - BYTE BiosFeature[5]; // 0x05 -- 0x09 + BYTE Revision; // 0x04 + BYTE Feature[5]; // 0x05 -- 0x09 // Other BIOSes may extend this table. We don't. } BIOS_CONFIG_TABLE, *PBIOS_CONFIG_TABLE; Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Thu Sep 18 00:16:17 2014 @@ -10,6 +10,9 @@ #define NDEBUG +/* For BIOS Version number */ +#include <reactos/buildno.h> + #include "emulator.h" #include "callback.h" #include "bop.h" @@ -30,6 +33,105 @@ /* PRIVATE VARIABLES **********************************************************/ CALLBACK16 BiosContext; + +/* + +Bochs BIOS, see rombios.h +========================= + +// model byte 0xFC = AT +#define SYS_MODEL_ID 0xFC +#define SYS_SUBMODEL_ID 0x00 +#define BIOS_REVISION 1 +#define BIOS_CONFIG_TABLE 0xe6f5 + +#ifndef BIOS_BUILD_DATE +# define BIOS_BUILD_DATE "06/23/99" +#endif + +// 1K of base memory used for Extended Bios Data Area (EBDA) +// EBDA is used for PS/2 mouse support, and IDE BIOS, etc. +#define EBDA_SEG 0x9FC0 +#define EBDA_SIZE 1 // In KiB +#define BASE_MEM_IN_K (640 - EBDA_SIZE) + + +See rombios.c +============= + +ROM BIOS compatibility entry points: +=================================== +$e05b ; POST Entry Point +$e2c3 ; NMI Handler Entry Point +$e3fe ; INT 13h Fixed Disk Services Entry Point +$e401 ; Fixed Disk Parameter Table +$e6f2 ; INT 19h Boot Load Service Entry Point +$e6f5 ; Configuration Data Table +$e729 ; Baud Rate Generator Table +$e739 ; INT 14h Serial Communications Service Entry Point +$e82e ; INT 16h Keyboard Service Entry Point +$e987 ; INT 09h Keyboard Service Entry Point +$ec59 ; INT 13h Diskette Service Entry Point +$ef57 ; INT 0Eh Diskette Hardware ISR Entry Point +$efc7 ; Diskette Controller Parameter Table +$efd2 ; INT 17h Printer Service Entry Point +$f045 ; INT 10 Functions 0-Fh Entry Point +$f065 ; INT 10h Video Support Service Entry Point +$f0a4 ; MDA/CGA Video Parameter Table (INT 1Dh) +$f841 ; INT 12h Memory Size Service Entry Point +$f84d ; INT 11h Equipment List Service Entry Point +$f859 ; INT 15h System Services Entry Point +$fa6e ; Character Font for 320x200 & 640x200 Graphics (lower 128 characters) +$fe6e ; INT 1Ah Time-of-day Service Entry Point +$fea5 ; INT 08h System Timer ISR Entry Point +$fef3 ; Initial Interrupt Vector Offsets Loaded by POST +$ff53 ; IRET Instruction for Dummy Interrupt Handler +$ff54 ; INT 05h Print Screen Service Entry Point +$fff0 ; Power-up Entry Point +$fff5 ; ASCII Date ROM was built - 8 characters in MM/DD/YY +$fffe ; System Model ID + +*/ + +/* + * See Ralf Brown: http://www.ctyme.com/intr/rb-1594.htm#Table515 + * for more information. + */ +#define BIOS_MODEL 0xFC // PC-AT +#define BIOS_SUBMODEL 0x01 // AT models 319,339 8 MHz, Enh Keyb, 3.5" +#define BIOS_REVISION 0x00 +// FIXME: Find a nice PS/2 486 + 487 BIOS combination! + +/* + * WARNING! For compatibility purposes the string "IBM" should be at F000:E00E . + * Some programs alternatively look at "COPR. IBM" that is at F000:E008 . + */ +static const CHAR BiosCopyright[] = "0000000 NTVDM IBM Compatible 486 32-bit BIOS Copyright (C) ReactOS Team 1996-2014"; +static const CHAR BiosVersion[] = "ReactOS NTVDM 32-bit BIOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")"; +static const CHAR BiosDate[] = "06/17/13"; + +C_ASSERT(sizeof(BiosCopyright)-1 <= 0x5B); // Ensures that we won't overflow on the POST Code starting at F000:E05B +C_ASSERT(sizeof(BiosDate)-1 == 0x08); + +/* 16-bit bootstrap code at F000:FFF0 */ +static BYTE Bootstrap[] = +{ + 0xEA, // jmp far ptr + 0x5B, 0xE0, 0x00, 0xF0, // F000:E05B +}; + +/* + * Normally at F000:E05B there is the POST that finally calls the bootstrap + * interrupt. It should also check the value of Bda->SoftReset. Since we do + * all the POST in 32 bit from the start, we just place there the bootstrap + * interrupt call. + */ +static BYTE PostCode[] = +{ + 0xCD, 0x19, // int 0x19, the bootstrap loader interrupt +// LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), BOP_UNSIMULATE +}; + /* PRIVATE FUNCTIONS **********************************************************/ @@ -141,6 +243,30 @@ getAH()); } } +} + +static VOID WINAPI BiosRomBasic(LPWORD Stack) +{ + /* ROM Basic is unsupported, display a message to the user */ + DisplayMessage(L"NTVDM doesn't support ROM Basic. The VDM is closing."); + + /* Stop the VDM */ + EmulatorTerminate(); + return; +} + +static VOID WINAPI BiosBootstrapLoader(LPWORD Stack) +{ + /* + * In real bioses one loads the bootsector read from a diskette + * or from a disk, to 0000:7C00 and then one runs it. + * Since we are 32-bit VM and we hardcode our DOS at the moment, + * just call the DOS 32-bit initialization code. + */ + + DPRINT1("BiosBootstrapLoader -->\n"); + + DPRINT1("<-- BiosBootstrapLoader\n"); } static VOID WINAPI BiosTimeService(LPWORD Stack) @@ -240,7 +366,7 @@ IOWriteB(PIC_MASTER_CMD, PIC_OCW3_READ_ISR /* == 0x0B */); IrqNumber = IOReadB(PIC_MASTER_CMD); - DPRINT("Master - IrqNumber = 0x%x\n", IrqNumber); + DPRINT("Master - IrqNumber = 0x%02X\n", IrqNumber); PicIRQComplete(Stack); } @@ -252,7 +378,7 @@ IOWriteB(PIC_SLAVE_CMD, PIC_OCW3_READ_ISR /* == 0x0B */); IrqNumber = IOReadB(PIC_SLAVE_CMD); - DPRINT("Slave - IrqNumber = 0x%x\n", IrqNumber); + DPRINT("Slave - IrqNumber = 0x%02X\n", IrqNumber); PicIRQComplete(Stack); } @@ -348,6 +474,8 @@ RegisterBiosInt32(BIOS_EQUIPMENT_INTERRUPT, BiosEquipmentService ); RegisterBiosInt32(BIOS_MEMORY_SIZE , BiosGetMemorySize ); RegisterBiosInt32(BIOS_MISC_INTERRUPT , BiosMiscService ); + RegisterBiosInt32(BIOS_ROM_BASIC , BiosRomBasic ); + RegisterBiosInt32(BIOS_BOOTSTRAP_LOADER , BiosBootstrapLoader ); RegisterBiosInt32(BIOS_TIME_INTERRUPT , BiosTimeService ); RegisterBiosInt32(BIOS_SYS_TIMER_INTERRUPT, BiosSystemTimerInterrupt); @@ -361,20 +489,32 @@ static VOID InitializeBiosInfo(VOID) { - Bct->Length = sizeof(*Bct); - Bct->Model = 0xFC; // PC-AT; see http://www.ctyme.com/intr/rb-1594.htm#Table515 - Bct->SubModel = 0x00; - Bct->BiosRevision = 0x01; - Bct->BiosFeature[0] = 0x64; // At the moment we don't support "INT 15/AH=4Fh called upon INT 09h" nor "wait for external event (INT 15/AH=41h) supported"; see http://www.ctyme.com/intr/rb-1594.htm#Table510 - Bct->BiosFeature[1] = 0x00; // We don't support anything from here; see http://www.ctyme.com/intr/rb-1594.htm#Table511 - Bct->BiosFeature[2] = 0x00; - Bct->BiosFeature[3] = 0x00; - Bct->BiosFeature[4] = 0x00; + Bct->Length = sizeof(*Bct); + Bct->Model = BIOS_MODEL; + Bct->SubModel = BIOS_SUBMODEL; + Bct->Revision = BIOS_REVISION; + Bct->Feature[0] = 0x64; // At the moment we don't support "INT 15/AH=4Fh called upon INT 09h" nor "wait for external event (INT 15/AH=41h) supported"; see http://www.ctyme.com/intr/rb-1594.htm#Table510 + Bct->Feature[1] = 0x00; // We don't support anything from here; see http://www.ctyme.com/intr/rb-1594.htm#Table511 + Bct->Feature[2] = 0x00; + Bct->Feature[3] = 0x00; + Bct->Feature[4] = 0x00; } static VOID InitializeBiosData(VOID) { UCHAR Low, High; + + /* System BIOS Copyright */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE000), BiosCopyright, sizeof(BiosCopyright)-1); + + /* System BIOS Version */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE080), BiosVersion, sizeof(BiosVersion)-1); // FIXME: or E061, or E100 ?? + + /* System BIOS Date */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF5), BiosDate, sizeof(BiosDate)-1); + + /* System BIOS Model (same as Bct->Model) */ + *(PBYTE)(SEG_OFF_TO_PTR(0xF000, 0xFFFE)) = BIOS_MODEL; /* Initialize the BDA contents */ Bda->EquipmentList = BIOS_EQUIPMENT_LIST; @@ -431,6 +571,10 @@ SearchAndInitRoms(&BiosContext); + /* Bootstrap code */ + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xE05B), PostCode , sizeof(PostCode )); + RtlCopyMemory(SEG_OFF_TO_PTR(0xF000, 0xFFF0), Bootstrap, sizeof(Bootstrap)); + /* We are done */ return TRUE; } Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32p.h [iso-8859-1] Thu Sep 18 00:16:17 2014 @@ -24,6 +24,8 @@ #define BIOS_EQUIPMENT_INTERRUPT 0x11 #define BIOS_MEMORY_SIZE 0x12 #define BIOS_MISC_INTERRUPT 0x15 +#define BIOS_ROM_BASIC 0x18 +#define BIOS_BOOTSTRAP_LOADER 0x19 #define BIOS_TIME_INTERRUPT 0x1A #define BIOS_SYS_TIMER_INTERRUPT 0x1C

1 0

[tkreuzer] 64184: [KERNEL32] Update spec file with x64 specific functions
by tkreuzer＠svn.reactos.org 17 Sep '14

17 Sep '14

Author: tkreuzer Date: Wed Sep 17 22:54:06 2014 New Revision: 64184 URL: http://svn.reactos.org/svn/reactos?rev=64184&view=rev Log: [KERNEL32] Update spec file with x64 specific functions Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Wed Sep 17 22:54:06 2014 @@ -25,7 +25,9 @@ @ stdcall BaseInitAppcompatCacheSupport() @ stdcall BaseIsAppcompatInfrastructureDisabled() IsShimInfrastructureDisabled @ stdcall BaseProcessInitPostImport() ; missing in Win 7 +;@ stdcall -arch=x86_64 BaseProcessStart() @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check +;@ stdcall -arch=x86_64 BaseThreadStart() @ stdcall BaseUpdateAppcompatCache(long long long) @ stdcall BasepCheckBadapp(long ptr long long long long long long long) @ stdcall BasepCheckWinSaferRestrictions(long long long long long long) @@ -60,6 +62,7 @@ @ stdcall CompareStringA(long long str long str long) @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) +;@ stdcall -arch=x86_64 ConsoleIMERoutine() @ stdcall ConsoleMenuControl(long long long) @ stdcall ContinueDebugEvent(long long long) @ stdcall ConvertDefaultLocale (long) @@ -108,7 +111,7 @@ @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) @ stdcall CreateSemaphoreA(ptr long long str) @ stdcall CreateSemaphoreW(ptr long long wstr) -@ stdcall CreateSocketHandle() +@ stdcall -i386 CreateSocketHandle() @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) @ stdcall CreateTimerQueue () @@ -116,6 +119,7 @@ @ stdcall CreateToolhelp32Snapshot(long long) @ stdcall CreateWaitableTimerA(ptr long str) @ stdcall CreateWaitableTimerW(ptr long wstr) +;@ stdcall -arch=x86_64 CtrlRoutine() @ stdcall DeactivateActCtx(long ptr) @ stdcall DebugActiveProcess(long) @ stdcall DebugActiveProcessStop(long) @@ -364,7 +368,7 @@ @ stdcall GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long) @ stdcall GetGeoInfoW(long long ptr long long) -@ stdcall GetHandleContext(long) ; missing on x64 +@ stdcall -i386 GetHandleContext(long) ; missing on x64 @ stdcall GetHandleInformation(long ptr) @ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @@ -722,11 +726,22 @@ @ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) +@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr ptr) ntdll.memcpy +@ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=x86_64 RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory +@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64 RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) @@ -794,6 +809,7 @@ @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) @ stdcall SetFileAttributesW(wstr long) +;@ stdcall -stub SetFileCompletionNotificationModes(ptr long); 2K3 SP2 has it! @ stdcall SetFilePointer(long long ptr long) @ stdcall SetFilePointerEx(long double ptr long) @ stdcall SetFileShortNameA(long str) @@ -802,7 +818,7 @@ @ stdcall SetFileValidData(long double) @ stdcall SetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) -@ stdcall SetHandleContext(long long) ; missing in Win 7 x64 +@ stdcall -i386 SetHandleContext(long long) ; missing in Win 7 x64 @ stdcall SetHandleCount(long) @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) @@ -947,11 +963,15 @@ @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) @ stdcall ZombifyActCtx(ptr) +@ stdcall -arch=x86_64 __C_specific_handler() ntdll.__C_specific_handler +@ stdcall -arch=x86_64 __chkstk() ntdll.__chkstk +;@ stdcall -arch=x86_64 __misaligned_access() ntdll.__misaligned_access @ stdcall _hread(long ptr long) @ stdcall _hwrite(long ptr long) @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) +@ stdcall -arch=x86_64 _local_unwind() ntdll._local_unwind @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite @@ -973,17 +993,13 @@ @ stdcall lstrlen(str) lstrlenA @ stdcall lstrlenA(str) @ stdcall lstrlenW(wstr) - -@ stdcall -arch=x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable -@ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr ptr) ntdll.RtlCompareMemory -@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr ptr) ntdll.memcpy -@ stdcall -arch=x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable -@ stdcall -arch=x86_64 RtlInstallFunctionTableCallback(double double long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback -@ stdcall -arch=x86_64 RtlLookupFunctionEntry(ptr ptr ptr) ntdll.RtlLookupFunctionEntry -@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader -@ stdcall -arch=x86_64 RtlRaiseException(ptr) ntdll.RtlRaiseException -@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext -@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx -@ stdcall -arch=x86_64 RtlVirtualUnwind(ptr ptr ptr long) ntdll.RtlVirtualUnwind +;@ stdcall -arch=x86_64 uaw_lstrcmpW(wstr wstr) +;@ stdcall -arch=x86_64 uaw_lstrcmpiW(wstr wstr) +;@ stdcall -arch=x86_64 uaw_lstrlenW(wstr) +;@ stdcall -arch=x86_64 uaw_wcschr(wstr long) +;@ stdcall -arch=x86_64 uaw_wcscpy(ptr wstr) +;@ stdcall -arch=x86_64 uaw_wcsicmp(wstr wstr) +;@ stdcall -arch=x86_64 uaw_wcslen(wstr) +;@ stdcall -arch=x86_64 uaw_wcsrchr(wstr long) @ stdcall GetTickCount64() ; FOR WINE

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs