Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tkreuzer] 64822: [USER32] Fix uninitialized variable use/warnings in - RegisterClassExWOWW (found by MSVC runtime checks) - IntDrawState (CID-514399) - IntCallWindowProcA (CID-514389) - IntCallWin...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 19 13:17:49 2014 New Revision: 64822 URL: http://svn.reactos.org/svn/reactos?rev=64822&view=rev Log: [USER32] Fix uninitialized variable use/warnings in - RegisterClassExWOWW (found by MSVC runtime checks) - IntDrawState (CID-514399) - IntCallWindowProcA (CID-514389) - IntCallWindowProcW (CID-414390) - SendMessageA (CID-514392) - SendMessageW (CID-514393) - SendMessageTimeoutA (CID-514441) - SendMessageCallbackA (CID-514442) - SendNotifyMessageW (CID-514443) - SendNotifyMessageA (CID-514444) - User32CallWindowProcFromKernel (CID-514445) - DesktopWndProcA (CID-716765) Modified: trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/draw.c trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Sun Oct 19 13:17:49 2014 @@ -67,7 +67,7 @@ ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, &SectionName, &KeyedData ); - + if (NT_SUCCESS(Status) && KeyedData.ulDataFormatVersion == 1) { struct dll_redirect *dll = KeyedData.lpSectionBase; @@ -165,7 +165,7 @@ Error_Exit: if ( Ret || !hLibModule ) { - if ( phLibModule ) *phLibModule = hLibModule; + if ( phLibModule ) *phLibModule = hLibModule; } else { @@ -173,7 +173,7 @@ FreeLibrary(hLibModule); SetLastError(save_error); } - + return Ret; } @@ -269,7 +269,7 @@ Error_Exit: if ( Ret || !hLibModule ) { - if ( phLibModule ) *phLibModule = hLibModule; + if ( phLibModule ) *phLibModule = hLibModule; } else { @@ -1022,7 +1022,7 @@ { WCHAR tmpbuf[MAX_ATOM_LEN + 1]; int len; - + if (nMaxCount <= 0) return 0; if (!GetClassNameW( hWnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; RtlUnicodeToMultiByteN( lpClassName, nMaxCount - 1, (PULONG)&len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); @@ -1256,7 +1256,7 @@ { WCHAR tmpbuf[MAX_ATOM_LEN + 1]; UINT len; - + if ((INT)cchType <= 0) return 0; if (!RealGetWindowClassW( hwnd, tmpbuf, sizeof(tmpbuf)/sizeof(WCHAR) )) return 0; RtlUnicodeToMultiByteN( pszType, cchType - 1, (PULONG)&len, tmpbuf, strlenW(tmpbuf) * sizeof(WCHAR) ); @@ -1472,6 +1472,7 @@ WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } */ + RtlInitEmptyAnsiString(&AnsiMenuName, NULL, 0); if (WndClass.lpszMenuName != NULL) { if (!IS_INTRESOURCE(WndClass.lpszMenuName)) Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Sun Oct 19 13:17:49 2014 @@ -1272,6 +1272,10 @@ case DST_COMPLEX: /* cx and cy must be set in this mode */ return FALSE; + + default: + ERR("Invalid opcode: %u\n", opcode); + return FALSE; } if(!cx) @@ -1552,7 +1556,7 @@ /* Handle system colors */ if (hbr <= (HBRUSH)(COLOR_MENUBAR + 1)) hbr = GetSysColorBrush(PtrToUlong(hbr) - 1); - + prevhbr = SelectObject(hDC, hbr); if (prevhbr == NULL) return (INT)FALSE; Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Sun Oct 19 13:17:49 2014 @@ -1357,6 +1357,9 @@ AnsiMsg.message = message; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; // Desktop is always Unicode so convert Ansi here. if (!MsgiAnsiToUnicodeMessage(hwnd, &UcMsg, &AnsiMsg)) @@ -1501,7 +1504,10 @@ UnicodeMsg.message = Msg; UnicodeMsg.wParam = wParam; UnicodeMsg.lParam = lParam; - if (! MsgiUnicodeToAnsiMessage(hWnd, &AnsiMsg, &UnicodeMsg)) + UnicodeMsg.time = 0; + UnicodeMsg.pt.x = 0; + UnicodeMsg.pt.y = 0; + if (! MsgiUnicodeToAnsiMessage(hWnd, &AnsiMsg, &UnicodeMsg)) { goto Exit; } @@ -1699,6 +1705,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (! MsgiAnsiToUnicodeMessage(hWnd, &UnicodeMsg, &AnsiMsg)) { goto Exit; @@ -2428,6 +2437,9 @@ UMMsg.message = Msg; UMMsg.wParam = wParam; UMMsg.lParam = lParam; + UMMsg.time = 0; + UMMsg.pt.x = 0; + UMMsg.pt.y = 0; if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, FALSE)) { @@ -2492,6 +2504,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (!MsgiAnsiToUnicodeMessage(Wnd, &UcMsg, &AnsiMsg)) { @@ -2548,6 +2563,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (!MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { @@ -2635,6 +2653,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { @@ -2728,6 +2749,9 @@ AnsiMsg.message = Msg; AnsiMsg.wParam = wParam; AnsiMsg.lParam = lParam; + AnsiMsg.time = 0; + AnsiMsg.pt.x = 0; + AnsiMsg.pt.y = 0; if (! MsgiAnsiToUnicodeMessage(hWnd, &UcMsg, &AnsiMsg)) { return FALSE; @@ -2763,6 +2787,9 @@ UMMsg.message = Msg; UMMsg.wParam = wParam; UMMsg.lParam = lParam; + UMMsg.time = 0; + UMMsg.pt.x = 0; + UMMsg.pt.y = 0; if (! MsgiUMToKMMessage(&UMMsg, &KMMsg, TRUE)) { return FALSE; @@ -2924,6 +2951,9 @@ KMMsg.hwnd = CallbackArgs->Wnd; KMMsg.message = CallbackArgs->Msg; KMMsg.wParam = CallbackArgs->wParam; + KMMsg.time = 0; + KMMsg.pt.x = 0; + KMMsg.pt.y = 0; /* Check if lParam is really a pointer and adjust it if it is */ if (0 <= CallbackArgs->lParamBufferSize) {

9 years, 11 months

[tkreuzer] 64821: [CRT] Fix MSVC global constructor initialization.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Oct 19 10:27:22 2014 New Revision: 64821 URL: http://svn.reactos.org/svn/reactos?rev=64821&view=rev Log: [CRT] Fix MSVC global constructor initialization. Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sun Oct 19 10:27:22 2014 @@ -20,6 +20,12 @@ #error Unsupported platform #endif +/* + * Initializer / constructor handling + * see http://msdn.microsoft.com/en-us/library/bb918180.aspx + * Destructors are registered from the initializers using atexit() + */ + extern _PVFV __xi_a[]; extern _PVFV __xi_z[]; extern _PVFV __xc_a[]; @@ -34,7 +40,7 @@ _PVFV *current; for (current = start; current < end; current++) { - if (*current != NULL); + if (*current != NULL) (*current)(); } } @@ -47,12 +53,6 @@ { /* Nothing to do */ return 1; -} - -void -__do_global_dtors(void) -{ - } void

9 years, 11 months

[hbelusca] 64820: Ok Arch, it's good to remove unuseful brackets, but don't exaggerate too much. Also check how the RtlInsertAsLeft/RightChild macros are defined. Since MS don't use the nice do { ....

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 19 00:05:18 2014 New Revision: 64820 URL: http://svn.reactos.org/svn/reactos?rev=64820&view=rev Log: Ok Arch, it's good to remove unuseful brackets, but don't exaggerate too much. Also check how the RtlInsertAsLeft/RightChild macros are defined. Since MS don't use the nice do { ... } while(0) for them, you cannot just use the if (blah) foo(); else bar(); to do the job, but you need the extra-brackets. And you cannot just change the macros definitions to not "break" headers compatibility (or... idiocies). Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=64… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Sun Oct 19 00:05:18 2014 @@ -22,17 +22,25 @@ FixupChildLinks(PRTL_SPLAY_LINKS Links, BOOLEAN Root, BOOLEAN LeftChild) { if (RtlLeftChild(Links)) + { RtlInsertAsLeftChild(Links, RtlLeftChild(Links)); + } if (RtlRightChild(Links)) + { RtlInsertAsRightChild(Links, RtlRightChild(Links)); + } if (!Root) { if (LeftChild) + { RtlInsertAsLeftChild(RtlParent(Links), Links); + } else + { RtlInsertAsRightChild(RtlParent(Links), Links); + } } } @@ -86,15 +94,23 @@ if (!RootA) { if (LeftA) + { RtlInsertAsLeftChild(RtlParent(&Ta), LinkB); + } else + { RtlInsertAsRightChild(RtlParent(&Ta), LinkB); + } } if (LeftB) + { RtlInsertAsLeftChild(LinkB, LinkA); + } else + { RtlInsertAsRightChild(LinkB, LinkA); + } } FixupChildLinks(LinkA, FALSE, LeftB);

9 years, 11 months

[hbelusca] 64819: Fix whitespace, and get rid of that sh*tty K&R style.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 18 23:59:25 2014 New Revision: 64819 URL: http://svn.reactos.org/svn/reactos?rev=64819&view=rev Log: Fix whitespace, and get rid of that sh*tty K&R style. Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=64… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Sat Oct 18 23:59:25 2014 @@ -21,18 +21,18 @@ VOID FixupChildLinks(PRTL_SPLAY_LINKS Links, BOOLEAN Root, BOOLEAN LeftChild) { - if (RtlLeftChild(Links)) { + if (RtlLeftChild(Links)) RtlInsertAsLeftChild(Links, RtlLeftChild(Links)); - } - if (RtlRightChild(Links)) { + + if (RtlRightChild(Links)) RtlInsertAsRightChild(Links, RtlRightChild(Links)); - } - if (!Root) { - if (LeftChild) { + + if (!Root) + { + if (LeftChild) RtlInsertAsLeftChild(RtlParent(Links), Links); - } else { + else RtlInsertAsRightChild(RtlParent(Links), Links); - } } } @@ -57,14 +57,16 @@ Set Q's parent to S, and the proper child ptr of S to Q When Q is the root, Set S's parent to S - */ + +*/ static VOID SwapSplayLinks(PRTL_SPLAY_LINKS LinkA, PRTL_SPLAY_LINKS LinkB) { - if (RtlParent(LinkA) == LinkB || RtlIsRoot(LinkB)) { + if (RtlParent(LinkA) == LinkB || RtlIsRoot(LinkB)) + { PRTL_SPLAY_LINKS Tmp = LinkA; LinkA = LinkB; LinkB = Tmp; @@ -72,25 +74,27 @@ { RTL_SPLAY_LINKS Ta = *LinkA, Tb = *LinkB; - BOOLEAN RootA = RtlIsRoot(LinkA), - LeftA = RtlIsLeftChild(LinkA), - LeftB = RtlIsLeftChild(LinkB); + BOOLEAN RootA = RtlIsRoot(LinkA), + LeftA = RtlIsLeftChild(LinkA), + LeftB = RtlIsLeftChild(LinkB); + *LinkB = Ta; *LinkA = Tb; // A was parent of B is a special case: A->Parent is now B - if (RtlParent(&Tb) == LinkA) { - if (!RootA) { - if (LeftA) { + if (RtlParent(&Tb) == LinkA) + { + if (!RootA) + { + if (LeftA) RtlInsertAsLeftChild(RtlParent(&Ta), LinkB); - } else { + else RtlInsertAsRightChild(RtlParent(&Ta), LinkB); - } - } - if (LeftB) { + } + + if (LeftB) RtlInsertAsLeftChild(LinkB, LinkA); - } else { + else RtlInsertAsRightChild(LinkB, LinkA); - } } FixupChildLinks(LinkA, FALSE, LeftB); @@ -102,8 +106,10 @@ #ifdef VERIFY_SWAP_SPLAY_LINKS // Verify the distinct cases of node swap - if (RootA) { - if (RtlParent(&Tb) == LinkA) { + if (RootA) + { + if (RtlParent(&Tb) == LinkA) + { // LinkA = D, LinkB = B // D B S S.L S.R S Q Q.R ASSERT(RtlParent(LinkA) == LinkB); @@ -112,7 +118,9 @@ ASSERT(RtlParent(LinkB) == LinkB); ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); - } else { + } + else + { // LinkA = D, LinkB = A // D A S.P S.L S.R S Q.L Q.R ASSERT(RtlParent(LinkA) == RtlParent(&Tb)); @@ -122,8 +130,11 @@ ASSERT(RtlLeftChild(LinkB) == RtlLeftChild(&Ta)); ASSERT(RtlRightChild(LinkB) == RtlRightChild(&Ta)); } - } else { - if (RtlParent(&Tb) == LinkA) { + } + else + { + if (RtlParent(&Tb) == LinkA) + { // LinkA = B, LinkB = A // B A S S.L S.R Q.P Q Q.R ASSERT(RtlParent(LinkA) == LinkB); @@ -132,7 +143,9 @@ ASSERT(RtlParent(LinkB) == RtlParent(&Ta)); ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); - } else { + } + else + { // LinkA = A, LinkB = C // A C S.P S.L S.R Q.P Q.L Q.R ASSERT(!memcmp(LinkA, &Tb, sizeof(Tb))); @@ -323,8 +336,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlRealPredecessor(PRTL_SPLAY_LINKS Links) @@ -352,8 +365,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlRealSuccessor(PRTL_SPLAY_LINKS Links) @@ -381,8 +394,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlSplay(PRTL_SPLAY_LINKS Links) @@ -725,8 +738,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlSubtreePredecessor(IN PRTL_SPLAY_LINKS Links) @@ -745,8 +758,8 @@ } /* -* @implemented -*/ + * @implemented + */ PRTL_SPLAY_LINKS NTAPI RtlSubtreeSuccessor(IN PRTL_SPLAY_LINKS Links)

9 years, 11 months

[hbelusca] 64818: [RTL] Implement RtlDeleteNoSplay which is really just a copy/paste of RtlDelete, but without splaying the tree after deletion of the node. Needed by the filter driver fltmgr.sys. ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 18 23:51:35 2014 New Revision: 64818 URL: http://svn.reactos.org/svn/reactos?rev=64818&view=rev Log: [RTL] Implement RtlDeleteNoSplay which is really just a copy/paste of RtlDelete, but without splaying the tree after deletion of the node. Needed by the filter driver fltmgr.sys. Dedicated to Mr. V ;) Modified: trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=64… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Sat Oct 18 23:51:35 2014 @@ -154,17 +154,17 @@ N = Links; /* Check if we have two children */ - if ((RtlLeftChild(N)) && (RtlRightChild(N))) + if (RtlLeftChild(N) && RtlRightChild(N)) { /* Get the predecessor */ SP = RtlSubtreePredecessor(N); - /* Swap it with N, this will guarantee that N will have only a child */ + /* Swap it with N, this will guarantee that N will only have a child */ SwapSplayLinks(SP, N); } /* Check if we have no children */ - if (!(RtlLeftChild(N)) && !(RtlRightChild(N))) + if (!RtlLeftChild(N) && !RtlRightChild(N)) { /* If we are also the root, then the tree is gone */ if (RtlIsRoot(N)) return NULL; @@ -176,12 +176,12 @@ if (RtlIsLeftChild(N)) { /* N was a left child, so erase its parent's left child link */ - RtlLeftChild(RtlParent(N)) = NULL; + RtlLeftChild(P) = NULL; } else { /* N was a right child, so erase its parent's right child link */ - RtlRightChild(RtlParent(N)) = NULL; + RtlRightChild(P) = NULL; } /* And finally splay the parent */ @@ -196,44 +196,130 @@ } else { - /* We have a right child, get him instead */ + /* We have a right child, get it instead */ C = RtlRightChild(N); } /* Check if we are the root entry */ if (RtlIsRoot(N)) { - /* Our child is now root, return him */ - C->Parent = C; + /* Our child is now root, return it */ + RtlParent(C) = C; return C; } + + /* Get our parent */ + P = RtlParent(N); /* Find out who is referencing us and link to our child instead */ if (RtlIsLeftChild(N)) { /* N was a left child, so set its parent's left child as our child */ - RtlLeftChild(RtlParent(N)) = C; + RtlLeftChild(P) = C; } else { /* N was a right child, so set its parent's right child as our child */ - RtlRightChild(RtlParent(N)) = C; + RtlRightChild(P) = C; } /* Finally, inherit our parent and splay the parent */ - C->Parent = N->Parent; - return RtlSplay(RtlParent(C)); -} - -/* -* @unimplemented -*/ + RtlParent(C) = P; + return RtlSplay(P); +} + +/* + * @implemented + */ VOID NTAPI RtlDeleteNoSplay(PRTL_SPLAY_LINKS Links, PRTL_SPLAY_LINKS *Root) { - UNIMPLEMENTED; + PRTL_SPLAY_LINKS N, P, C, SP; + N = Links; + + /* Check if we have two children */ + if (RtlLeftChild(N) && RtlRightChild(N)) + { + /* Get the predecessor */ + SP = RtlSubtreePredecessor(N); + + /* If we are the root, the new root will be our predecessor after swapping */ + if (RtlIsRoot(N)) *Root = SP; + + /* Swap the predecessor with N, this will guarantee that N will only have a child */ + SwapSplayLinks(SP, N); + } + + /* Check if we have no children */ + if (!RtlLeftChild(N) && !RtlRightChild(N)) + { + /* If we are also the root, then the tree is gone */ + if (RtlIsRoot(N)) + { + *Root = NULL; + return; + } + + /* Get our parent */ + P = RtlParent(N); + + /* Find out who is referencing us and delete the reference */ + if (RtlIsLeftChild(N)) + { + /* N was a left child, so erase its parent's left child link */ + RtlLeftChild(P) = NULL; + } + else + { + /* N was a right child, so erase its parent's right child link */ + RtlRightChild(P) = NULL; + } + + /* We are done */ + return; + } + + /* If we got here, we have a child (not two: we swapped above!) */ + if (RtlLeftChild(N)) + { + /* We have a left child, so get it */ + C = RtlLeftChild(N); + } + else + { + /* We have a right child, get it instead */ + C = RtlRightChild(N); + } + + /* Check if we are the root entry */ + if (RtlIsRoot(N)) + { + /* Our child is now root, return it */ + RtlParent(C) = C; + *Root = C; + return; + } + + /* Get our parent */ + P = RtlParent(N); + + /* Find out who is referencing us and link to our child instead */ + if (RtlIsLeftChild(N)) + { + /* N was a left child, so set its parent's left child as our child */ + RtlLeftChild(P) = C; + } + else + { + /* N was a right child, so set its parent's right child as our child */ + RtlRightChild(P) = C; + } + + /* Finally, inherit our parent and we are done */ + RtlParent(C) = P; + return; } /*

9 years, 11 months

[tkreuzer] 64817: [CRT] Implement __do_global_ctors for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 21:38:07 2014 New Revision: 64817 URL: http://svn.reactos.org/svn/reactos?rev=64817&view=rev Log: [CRT] Implement __do_global_ctors for MSVC Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sat Oct 18 21:38:07 2014 @@ -10,6 +10,7 @@ #include <stdarg.h> #include <rtcapi.h> #include <assert.h> +#include <internal.h> #if defined(_M_IX86) #pragma comment(linker, "/alternatename:__RTC_Initialize=__RTC_NoInitialize") @@ -18,6 +19,25 @@ #else #error Unsupported platform #endif + +extern _PVFV __xi_a[]; +extern _PVFV __xi_z[]; +extern _PVFV __xc_a[]; +extern _PVFV __xc_z[]; + +static +void +__do_xtors( + _PVFV *start, + _PVFV *end) +{ + _PVFV *current; + for (current = start; current < end; current++) + { + if (*current != NULL); + (*current)(); + } +} void _pei386_runtime_relocator(void) { @@ -38,7 +58,8 @@ void __do_global_ctors(void) { - + __do_xtors(__xi_a, __xi_z); + __do_xtors(__xc_a, __xc_z); } BOOL

9 years, 11 months

[tkreuzer] 64816: [RunTmChk] - Implement _RTC_GetErrDesc, _RTC_SetErrorFuncW, add stubs for _RTC_NumErrors, _RTC_SetErrorType, _RTC_SetErrorFunc - Implement _RTC_DefaultErrorFuncW which will be use...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 21:22:52 2014 New Revision: 64816 URL: http://svn.reactos.org/svn/reactos?rev=64816&view=rev Log: [RunTmChk] - Implement _RTC_GetErrDesc, _RTC_SetErrorFuncW, add stubs for _RTC_NumErrors, _RTC_SetErrorType, _RTC_SetErrorFunc - Implement _RTC_DefaultErrorFuncW which will be used, when no other error func was set - Implement _RTC_InitBase, which will be called from _RTC_Initialize, and which in turn calls either _CRT_RTC_INITW, if CRT was linked, or a local _CRT_RTC_INITW0, which in turn will return the error function to use. This allows us to use a custom error function for all modules that link to (MSV)CRT. Only user32 does not really fit into here, since it uses the same startup code but does not link to MSVCRT. [CRT] - Call _RTC_Initialize from __main before initializing the global constructors, but fall back to a dummy _RTC_NoInitialize(), when RunTmChk.lib was not linked. Now we properly initialize both our own as well as MS RunTmChk lib. Added: trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c (with props) Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt trunk/reactos/lib/sdk/runtmchk/rtcapi.c Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -6,6 +6,18 @@ #include <windows.h> #include <stdlib.h> +#include <stdio.h> +#include <stdarg.h> +#include <rtcapi.h> +#include <assert.h> + +#if defined(_M_IX86) +#pragma comment(linker, "/alternatename:__RTC_Initialize=__RTC_NoInitialize") +#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) +#pragma comment(linker, "/alternatename:_RTC_Initialize=_RTC_NoInitialize") +#else +#error Unsupported platform +#endif void _pei386_runtime_relocator(void) { @@ -36,16 +48,39 @@ return TRUE; } -void Catch_RTC_Failure(int errType, const wchar_t *file, int line, - const wchar_t *module, const wchar_t *format, ...) +int +__cdecl +Catch_RTC_Failure( + int errType, + const wchar_t *file, + int line, + const wchar_t *module, + const wchar_t *format, + ...) { /* FIXME: better failure routine */ __debugbreak(); + return 0; } -void* __cdecl _CRT_RTC_INITW(void *res0, void **res1, int res2, int res3, int res4) +extern +void +__cdecl +_RTC_NoInitialize(void) { - return &Catch_RTC_Failure; + /* Do nothing, if RunTmChk.lib is not pulled in */ +} + +_RTC_error_fnW +__cdecl +_CRT_RTC_INITW( + void *_Res0, + void **_Res1, + int _Res2, + int _Res3, + int _Res4) +{ + return &Catch_RTC_Failure; } static int initialized = 0; @@ -56,6 +91,9 @@ if (!initialized) { initialized = 1; + + _RTC_Initialize(); + __do_global_ctors (); } } Modified: trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/CMakeList… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/runtmchk/CMakeLists.txt [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -1,5 +1,8 @@ -list(APPEND SOURCE rtcapi.c) +list(APPEND SOURCE + rtcapi.c + rtcuserapi.c +) if(ARCH STREQUAL "i386") list(APPEND ASM_SOURCE i386/_RTC_CheckEsp.S) Modified: trunk/reactos/lib/sdk/runtmchk/rtcapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/rtcapi.c?… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/rtcapi.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/runtmchk/rtcapi.c [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -7,21 +7,76 @@ #include <rtcapi.h> -unsigned long -__cdecl -DbgPrint( - const char *fmt, ...); - -void +#if defined(_M_IX86) +#pragma comment(linker, "/alternatename:__CRT_RTC_INITW=__CRT_RTC_INITW0") +#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) +#pragma comment(linker, "/alternatename:_CRT_RTC_INITW=_CRT_RTC_INITW0") +#else +#error Unsupported platform +#endif + +int +__cdecl +_RTC_DefaultErrorFuncW( + int errType, + const wchar_t *file, + int line, + const wchar_t *module, + const wchar_t *format, + ...) +{ + /* Simple fallback function */ + __debugbreak(); + return 0; +} + +_RTC_error_fnW _RTC_pErrorFuncW = _RTC_DefaultErrorFuncW; + +/* + Default CRT RTC init, if we don't link to CRT +*/ +_RTC_error_fnW +__cdecl +_CRT_RTC_INITW0( + void *_Res0, + void **_Res1, + int _Res2, + int _Res3, + int _Res4) +{ + return &_RTC_DefaultErrorFuncW; +} + +void +__cdecl _RTC_InitBase(void) { + static char initialized = 0; + _RTC_error_fnW errorFunc; + + if (!initialized) + { + errorFunc = _CRT_RTC_INITW(0, 0, 0, 1, 0); + _RTC_SetErrorFuncW(errorFunc); + initialized = 1; + } +} + +void +__cdecl +_RTC_Shutdown(void) +{ __debugbreak(); } void -_RTC_Shutdown(void) -{ - __debugbreak(); +__cdecl +_RTC_Initialize(void) +{ + /* Usually this function would walk an array of function pointers and call + each of these, like done with global ctors, but since these are currently + only _RTC_InitBase, we simply call that function once. */ + _RTC_InitBase(); } void @@ -30,7 +85,13 @@ void* retaddr, int errnum) { - __debugbreak(); + _RTC_pErrorFuncW(errnum, + L"unknown file", + -1, + L"unknown module", + L"Invalid stack pointer value caught at %p, error %d\n", + retaddr, + errnum); } void @@ -38,7 +99,12 @@ _RTC_UninitUse( const char *_Varname) { - __debugbreak(); + _RTC_pErrorFuncW(_RTC_UNINIT_LOCAL_USE, + L"unknown file", + -1, + L"unknown module", + L"Use of uninitialized variable %S!\n", + _Varname); } void @@ -59,7 +125,12 @@ /* Check if they contain the guard bytes */ if ((*guard1 != 0xCCCCCCCC) || (*guard2 != 0xCCCCCCCC)) { - __debugbreak(); + _RTC_pErrorFuncW(_RTC_CORRUPT_STACK, + L"unknown file", + -1, + L"unknown module", + L"Stack corruption near '%s'\n", + _Fd->variables[i].name); } } } @@ -90,7 +161,11 @@ (current->guard2[2] != 0xCCCCCCCC) || (*guard != 0xCCCCCCCC)) { - __debugbreak(); + _RTC_pErrorFuncW(_RTC_CORRUPTED_ALLOCA, + L"unknown file", + -1, + L"unknown module", + L"Stack corruption in alloca frame\n"); } } } @@ -124,3 +199,4 @@ *_PAllocaInfoList = _PAllocaBase; } } + Added: trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/runtmchk/rtcuserap… ============================================================================== --- trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c (added) +++ trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c [iso-8859-1] Sat Oct 18 21:22:52 2014 @@ -0,0 +1,91 @@ +/* + * PROJECT: MSVC runtime check support library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Provides support functions for MSVC runtime checks + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#include <rtcapi.h> + +extern _RTC_error_fnW _RTC_pErrorFuncW; + +int +__cdecl +_RTC_DefaultErrorFuncW( + int errType, + const wchar_t *file, + int line, + const wchar_t *module, + const wchar_t *format, + ...); + +static +char* +_RTC_ErrorDescription[] = +{ + "The stack pointer was wrong after returning from a function call.", /* _RTC_CHKSTK */ + "Data was lost when a type was converted to a smaller type.", /* _RTC_CVRT_LOSS_INFO */ + "The stack near a local variable was corrupted.", /* _RTC_CORRUPT_STACK */ + "An uninitialized local variable was used.", /* _RTC_UNINIT_LOCAL_USE */ + "The stack around an alloca was corrupted.", /* _RTC_CORRUPTED_ALLOCA */ +}; + +int +__cdecl +_RTC_NumErrors(void) +{ + /* Not supported yet */ + __debugbreak(); + return 0; +} + +const char * +__cdecl +_RTC_GetErrDesc( + _RTC_ErrorNumber _Errnum) +{ + if (_Errnum < (sizeof(_RTC_ErrorDescription) / sizeof(_RTC_ErrorDescription[0]))) + { + return _RTC_ErrorDescription[_Errnum]; + } + + return "Invalid/Unknown error."; +} + +int +__cdecl +_RTC_SetErrorType( + _RTC_ErrorNumber _Errnum, + int _ErrType) +{ + /* Not supported yet */ + __debugbreak(); + return 0; +} + +_RTC_error_fn +__cdecl +_RTC_SetErrorFunc( + _RTC_error_fn new_fn) +{ + /* Not supported yet */ + __debugbreak(); + return 0; +} + +_RTC_error_fnW +__cdecl +_RTC_SetErrorFuncW(_RTC_error_fnW new_fn) +{ + _RTC_error_fnW old_fn; + + /* Get the current error func */ + old_fn = _RTC_pErrorFuncW; + + /* Set the new function or reset when 0 was passed */ + _RTC_pErrorFuncW = new_fn ? new_fn : _RTC_DefaultErrorFuncW; + + /* Return the old error func, or 0, if none was set */ + return old_fn != _RTC_DefaultErrorFuncW ? old_fn : 0; +} + Propchange: trunk/reactos/lib/sdk/runtmchk/rtcuserapi.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 11 months

[tkreuzer] 64815: [FREELDR] - Improve memory layout by moving the 32/64 bit stack to 0x7000-0xF000 and moving the BIOSCALLBUFFER up a bit. This gives us 56 KB additional space for freeldr itself. T...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 18 21:12:12 2014 New Revision: 64815 URL: http://svn.reactos.org/svn/reactos?rev=64815&view=rev Log: [FREELDR] - Improve memory layout by moving the 32/64 bit stack to 0x7000-0xF000 and moving the BIOSCALLBUFFER up a bit. This gives us 56 KB additional space for freeldr itself. This allows to compile freeldr with /RTC1 (x86 only, the x64 version would get too big). And yes, it works. - Implement FrLdrBugCheckWithMessage to get some useful messages on the screen and use it in MmCheckFreeldrImageFile - Merge the .rtc section into the .text section, when we use RTC1 - Check the location of the Extended BIOS Data Area, add it to the memory descriptors and make sure we have enough space to put freeldr in. If the location of the EBDA is too low, print out a nice message on a blue screen :) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h trunk/reactos/boot/freeldr/freeldr/include/debug.h trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -216,6 +216,7 @@ elseif(RUNTIME_CHECKS) target_link_libraries(freeldr_pe runtmchk) target_link_libraries(freeldr_pe_dbg runtmchk) + add_target_link_flags(freeldr_pe "/MERGE:.rtc=.text") endif() add_dependencies(freeldr_pe asm) @@ -279,6 +280,7 @@ elseif(RUNTIME_CHECKS) target_link_libraries(setupldr_pe runtmchk) target_link_libraries(setupldr_pe_dbg runtmchk) + add_target_link_flags(setupldr_pe "/MERGE:.rtc=.text") endif() add_dependencies(setupldr_pe asm) Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -121,7 +121,7 @@ /* 64-bit stack pointer */ stack64: - .double STACK64ADDR + .double STACKADDR PUBLIC FrldrBootDrive FrldrBootDrive: Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -257,7 +257,7 @@ /* 32-bit stack pointer */ stack32: - .long STACK32ADDR + .long STACKADDR .align 4 /* force 4-byte alignment */ gdt: Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386bug.c [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -86,11 +86,11 @@ PrintText("Frames:\n"); #ifdef _M_IX86 for (Frame = (FRAME*)TrapFrame->Ebp; - Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; + Frame != 0 && (ULONG_PTR)Frame < STACKADDR; Frame = Frame->Next) #else for (Frame = (FRAME*)TrapFrame->TrapFrame; - Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR; + Frame != 0 && (ULONG_PTR)Frame < STACKADDR; Frame = Frame->Next) #endif { @@ -171,6 +171,44 @@ InstructionPointer[6], InstructionPointer[7]); } +VOID +NTAPI +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...) +{ + CHAR Buffer[1024]; + va_list argptr; + + /* Blue screen for the win */ + MachVideoClearScreen(SCREEN_ATTR); + i386_ScreenPosX = 0; + i386_ScreenPosY = 0; + + PrintText("A problem has been detected and FreeLoader boot has been aborted.\n\n"); + + PrintText("%ld: %s\n\n", BugCode, BugCodeStrings[BugCode]); + + if (File) + { + PrintText("Location: %s:%ld\n\n", File, Line); + } + + va_start(argptr, Format); + _vsnprintf(Buffer, sizeof(Buffer), Format, argptr); + va_end(argptr); + Buffer[sizeof(Buffer) - 1] = 0; + + i386PrintText(Buffer); + + _disable(); + __halt(); + for (;;); +} + void NTAPI FrLdrBugCheckEx( Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -28,15 +28,15 @@ DBG_DEFAULT_CHANNEL(MEMORY); #define MAX_BIOS_DESCRIPTORS 32 + +#define STACK_BASE_PAGE (STACKLOW / PAGE_SIZE) #define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE) #define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE) -#define STACK_BASE_PAGE (STACKLOWLIMIT / PAGE_SIZE) -#define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE) #define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE) +#define STACK_PAGE_COUNT (FREELDR_BASE_PAGE - STACK_BASE_PAGE) #define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE) -#define DISKBUF_PAGE_COUNT (STACK_BASE_PAGE - DISKBUF_BASE_PAGE) -#define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE) +#define DISKBUF_PAGE_COUNT (0x10) #define BIOSBUF_PAGE_COUNT (1) BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS]; @@ -45,11 +45,12 @@ FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] = { { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors - { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline + { LoaderFirmwareTemporary, 0x01, STACK_BASE_PAGE - 1 }, // freeldr stack + cmdline + { LoaderOsloaderStack, STACK_BASE_PAGE, FREELDR_BASE_PAGE - STACK_BASE_PAGE }, // prot mode stack. { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER - { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER + { LoaderFirmwarePermanent, 0x9F, 0x1 }, // EBDA { LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video { LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video { LoaderSpecialMemory, 0xFFF, 1 }, // unusable memory @@ -193,9 +194,63 @@ ULONG MapCount = 0; ULONGLONG RealBaseAddress, RealSize; TYPE_OF_MEMORY MemoryType; + ULONG Size; ASSERT(PcBiosMapCount == 0); TRACE("GetBiosMemoryMap()\n"); + + /* Make sure the usable memory is large enough. To do this we check the 16 + bit value at address 0x413 inside the BDA, which gives us the usable size + in KB */ + Size = (*(PUSHORT)(ULONG_PTR)0x413) * 1024; + if (Size < 0x9F000) + { + FrLdrBugCheckWithMessage( + MEMORY_INIT_FAILURE, + __FILE__, + __LINE__, + "The BIOS reported a usable memory range up to 0x%x, which is too small!\n", + Size); + } + + /* Get the address of the Extended BIOS Data Area (EBDA). + * Int 15h, AH=C1h + * SYSTEM - RETURN EXTENDED-BIOS DATA-AREA SEGMENT ADDRESS (PS) + * + * Return: + * CF set on error + * CF clear if successful + * ES = segment of data area + */ + Regs.x.eax = 0x0000C100; + Int386(0x15, &Regs, &Regs); + + /* If the function fails, there is no EBDA */ + if (INT386_SUCCESS(Regs)) + { + /* Check if this is high enough */ + ULONG EbdaBase = (ULONG)Regs.w.es << 4; + if (EbdaBase < 0x9F000) + { + FrLdrBugCheckWithMessage( + MEMORY_INIT_FAILURE, + __FILE__, + __LINE__, + "The location of your EBDA is 0x%lx, which is too low!\n" + "If you see this, please report to the ReactOS team!", + EbdaBase); + } + + /* Calculate the (max) size of the EBDA */ + Size = 0xA0000 - EbdaBase; + + /* Add the descriptor */ + MapCount = AddMemoryDescriptor(PcMemoryMap, + MAX_BIOS_DESCRIPTORS, + (EbdaBase / MM_PAGE_SIZE), + (Size / MM_PAGE_SIZE), + LoaderFirmwarePermanent); + } /* Int 15h AX=E820h * Newer BIOSes - GET SYSTEM MEMORY MAP Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -444,6 +444,7 @@ "TEST_BUGCHECK", "MISSING_HARDWARE_REQUIREMENTS", "FREELDR_IMAGE_CORRUPTION", + "MEMORY_INIT_FAILURE", }; ULONG_PTR BugCheckInfo[5]; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -11,13 +11,13 @@ //#endif #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) +#define STACKLOW HEX(7000) +#define STACKADDR HEX(F000) /* The 32/64-bit stack top will be at 0000:F000, or 0xF000 */ #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define DISKREADBUFFER HEX(80000) /* Buffer to store data read in from the disk via the BIOS */ -#define STACKLOWLIMIT HEX(90000) -#define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ -#define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ -#define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ +#define DISKREADBUFFER HEX(8E000) /* Buffer to store data read in from the disk via the BIOS */ +#define BIOSCALLBUFFER HEX(9E000) /* Buffer to store temporary data for any Int386() call */ +/* 9F000- 9FFFF is reserved for the EBDA */ #define DISKREADBUFFER_SIZE HEX(10000) #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -124,12 +124,22 @@ NTAPI FrLdrBugCheck(ULONG BugCode); +VOID +NTAPI +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...); + /* Bugcheck codes */ enum _FRLDR_BUGCHECK_CODES { TEST_BUGCHECK, MISSING_HARDWARE_REQUIREMENTS, FREELDR_IMAGE_CORRUPTION, + MEMORY_INIT_FAILURE, }; extern char *BugCodeStrings[]; Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sat Oct 18 21:12:12 2014 @@ -159,8 +159,8 @@ } } - -BOOLEAN +static +VOID MmCheckFreeldrImageFile() { PIMAGE_NT_HEADERS NtHeaders; @@ -172,7 +172,11 @@ if (!NtHeaders) { ERR("Could not get NtHeaders!\n"); - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "Could not get NtHeaders!\n"); } /* Check the file header */ @@ -184,12 +188,21 @@ (FileHeader->SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER))) { ERR("FreeLdr FileHeader is invalid.\n"); - BugCheckInfo[0] = FileHeader->Machine; - BugCheckInfo[1] = FileHeader->NumberOfSections; - BugCheckInfo[2] = FileHeader->PointerToSymbolTable; - BugCheckInfo[3] = FileHeader->NumberOfSymbols; - BugCheckInfo[4] = FileHeader->SizeOfOptionalHeader; - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "FreeLdr FileHeader is invalid.\n" + "Machine == 0x%lx, expected 0x%lx\n" + "NumberOfSections == 0x%lx, expected 0x%lx\n" + "PointerToSymbolTable == 0x%lx, expected 0\n" + "NumberOfSymbols == 0x%lx, expected 0\n" + "SizeOfOptionalHeader == 0x%lx, expected 0x%lx\n", + FileHeader->Machine, IMAGE_FILE_MACHINE_NATIVE, + FileHeader->NumberOfSections, FREELDR_SECTION_COUNT, + FileHeader->PointerToSymbolTable, + FileHeader->NumberOfSymbols, + FileHeader->SizeOfOptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER)); } /* Check the optional header */ @@ -201,15 +214,22 @@ (OptionalHeader->SectionAlignment != OptionalHeader->FileAlignment)) { ERR("FreeLdr OptionalHeader is invalid.\n"); - BugCheckInfo[0] = 0x80000000 | (OptionalHeader->Subsystem << 16) | OptionalHeader->Magic; - BugCheckInfo[1] = OptionalHeader->ImageBase; - BugCheckInfo[2] = OptionalHeader->SizeOfImage; - BugCheckInfo[3] = OptionalHeader->SectionAlignment; - BugCheckInfo[4] = OptionalHeader->FileAlignment; - return FALSE; - } - - return TRUE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "FreeLdr OptionalHeader is invalid.\n" + "Magic == 0x%lx, expected 0x%lx\n" + "Subsystem == 0x%lx, expected 1 (native)\n" + "ImageBase == 0x%lx, expected 0x%lx\n" + "SizeOfImage == 0x%lx, maximum 0x%lx\n" + "SectionAlignment 0x%lx doesn't match FileAlignment 0x%lx\n", + OptionalHeader->Magic, IMAGE_NT_OPTIONAL_HDR_MAGIC, + OptionalHeader->Subsystem, + OptionalHeader->ImageBase, FREELDR_PE_BASE, + OptionalHeader->SizeOfImage, MAX_FREELDR_PE_SIZE, + OptionalHeader->SectionAlignment, OptionalHeader->FileAlignment); + } } BOOLEAN MmInitializeMemoryManager(VOID) @@ -221,10 +241,7 @@ TRACE("Initializing Memory Manager.\n"); /* Check the freeldr binary */ - if (!MmCheckFreeldrImageFile()) - { - FrLdrBugCheck(FREELDR_IMAGE_CORRUPTION); - } + MmCheckFreeldrImageFile(); BiosMemoryMap = MachVtbl.GetMemoryMap(&BiosMemoryMapEntryCount);

9 years, 11 months

[hpoussin] 64814: [ACPI] Fix some traces

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Oct 18 21:09:31 2014 New Revision: 64814 URL: http://svn.reactos.org/svn/reactos?rev=64814&view=rev Log: [ACPI] Fix some traces Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Sat Oct 18 21:09:31 2014 @@ -96,7 +96,7 @@ ACPI_HANDLE handle, void *context) { - DPRINT1("acpi_bus_data_handler not implemented"); + DPRINT1("acpi_bus_data_handler not implemented\n"); /* TBD */ @@ -489,7 +489,7 @@ { ULONG_PTR TypeData = 0; - DPRINT("acpi_bus_generate_event"); + DPRINT("acpi_bus_generate_event\n"); if (!device) return_VALUE(AE_BAD_PARAMETER); @@ -519,7 +519,7 @@ //DECLARE_WAITQUEUE(wait, current); - DPRINT("acpi_bus_receive_event"); + DPRINT("acpi_bus_receive_event\n"); if (!event) return AE_BAD_PARAMETER; @@ -1635,7 +1635,7 @@ int result = 0; ACPI_STATUS status = AE_OK; - DPRINT("acpi_bus_init"); + DPRINT1("acpi_bus_init\n"); KeInitializeDpc(&event_dpc, acpi_bus_generate_event_dpc, NULL); @@ -1714,7 +1714,7 @@ { ACPI_STATUS status = AE_OK; - DPRINT("acpi_bus_exit"); + DPRINT1("acpi_bus_exit\n"); status = AcpiRemoveNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, acpi_bus_notify); @@ -1748,7 +1748,7 @@ { int result = 0; - DPRINT("acpi_init"); + DPRINT("acpi_init\n"); DPRINT("Subsystem revision %08x\n",ACPI_CA_VERSION); @@ -1806,7 +1806,7 @@ void acpi_exit (void) { - DPRINT("acpi_exit"); + DPRINT("acpi_exit\n"); #ifdef CONFIG_PM pm_active = 0; Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Sat Oct 18 21:09:31 2014 @@ -659,7 +659,7 @@ { int result = 0; - DPRINT("acpi_power_init"); + DPRINT("acpi_power_init\n"); INIT_LIST_HEAD(&acpi_power_resource_list); Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Sat Oct 18 21:09:31 2014 @@ -94,7 +94,7 @@ case ACPI_STATE_S4: if (/*AcpiGbl_FACS->S4bios_f &&*/ 0 != AcpiGbl_FADT.SmiCommand) { - DPRINT(" S4bios"); + DPRINT(" S4bios\n"); system->states[i] = 1; } /* no break */

9 years, 11 months

[hpoussin] 64813: [CMLIB] Add an assert to track potential registry corruptions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Oct 18 21:08:40 2014 New Revision: 64813 URL: http://svn.reactos.org/svn/reactos?rev=64813&view=rev Log: [CMLIB] Add an assert to track potential registry corruptions Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Oct 18 21:08:40 2014 @@ -71,6 +71,7 @@ PHHIVE RegistryHive, HCELL_INDEX CellIndex) { + ASSERT(CellIndex != HCELL_NIL); return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); }

9 years, 11 months

← Newer
1
...
32
33
34
35
36
37
38
...
73
Older →

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 October 2014