Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[tkreuzer] 57942: [RTL] - Implement dynamic allocation of handle entry pages in RtlAllocateHandle - Fix a possible NULL pointer dereference

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 18 10:10:34 2012 New Revision: 57942 URL: http://svn.reactos.org/svn/reactos?rev=57942&view=rev Log: [RTL] - Implement dynamic allocation of handle entry pages in RtlAllocateHandle - Fix a possible NULL pointer dereference Modified: trunk/reactos/lib/rtl/handle.c Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=57942… ============================================================================== --- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Tue Dec 18 10:10:34 2012 @@ -60,66 +60,89 @@ PRTL_HANDLE_TABLE HandleTable, PULONG Index) { - PRTL_HANDLE_TABLE_ENTRY *pp_new, *pph, ph; + PRTL_HANDLE_TABLE_ENTRY CurrentEntry, NextEntry; NTSTATUS Status; - PRTL_HANDLE_TABLE_ENTRY retval; + PRTL_HANDLE_TABLE_ENTRY HandleEntry; PVOID ArrayPointer; SIZE_T ArraySize; - - pp_new = &HandleTable->FreeHandles; - + ULONG i, NumberOfEntries; + + /* Check if we are out of free handles entries */ if (HandleTable->FreeHandles == NULL) { - /* no free handle available */ + /* Check if we don't have uncomitted handle entries yet */ if (HandleTable->UnCommittedHandles == NULL) { - /* allocate handle array */ + /* Use the maximum number of handle entries */ ArraySize = HandleTable->SizeOfHandleTableEntry * HandleTable->MaximumNumberOfHandles; ArrayPointer = NULL; - /* FIXME - only reserve handles here! */ - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&ArrayPointer, + /* Reserve memory */ + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &ArrayPointer, 0, &ArraySize, - MEM_RESERVE | MEM_COMMIT, + MEM_RESERVE, PAGE_READWRITE); if (!NT_SUCCESS(Status)) return NULL; - /* update handle array pointers */ - HandleTable->FreeHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; + /* Update handle array pointers */ + HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; HandleTable->MaxReservedHandles = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ArrayPointer + ArraySize); - HandleTable->CommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; - HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; } - /* FIXME - should check if handles need to be committed */ - - /* build free list in handle array */ - ph = HandleTable->FreeHandles; - pph = pp_new; - while (ph < HandleTable->MaxReservedHandles) + /* Commit one reserved handle entry page */ + ArraySize = PAGE_SIZE; + ArrayPointer = HandleTable->UnCommittedHandles; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &ArrayPointer, + 0, + &ArraySize, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + return NULL; + + /* Update handle array pointers */ + HandleTable->FreeHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; + HandleTable->CommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)ArrayPointer; + HandleTable->UnCommittedHandles = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ArrayPointer + ArraySize); + + /* Calculate the number of entries we can store in the array */ + NumberOfEntries = ArraySize / HandleTable->SizeOfHandleTableEntry; + + /* Loop all entries, except the last one */ + CurrentEntry = HandleTable->FreeHandles; + for (i = 0; i < NumberOfEntries - 1; i++) { - *pph = ph; - pph = &ph->NextFree; - ph = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)ph + HandleTable->SizeOfHandleTableEntry); + /* Calculate the address of the next handle entry */ + NextEntry = (PRTL_HANDLE_TABLE_ENTRY)((ULONG_PTR)CurrentEntry + + HandleTable->SizeOfHandleTableEntry); + + /* Link the next entry */ + CurrentEntry->NextFree = NextEntry; + + /* Continue with the next entry */ + CurrentEntry = NextEntry; } - *pph = 0; + + /* CurrentEntry now points to the last entry, terminate the list here */ + CurrentEntry->NextFree = NULL; } /* remove handle from free list */ - retval = *pp_new; - *pp_new = retval->NextFree; - retval->NextFree = NULL; + HandleEntry = HandleTable->FreeHandles; + HandleTable->FreeHandles = HandleEntry->NextFree; + HandleEntry->NextFree = NULL; if (Index) { - *Index = ((ULONG)((ULONG_PTR)retval - (ULONG_PTR)HandleTable->CommittedHandles) / + *Index = ((ULONG)((ULONG_PTR)HandleEntry - (ULONG_PTR)HandleTable->CommittedHandles) / HandleTable->SizeOfHandleTableEntry); } - return retval; + return HandleEntry; }

11 years, 9 months

[tkreuzer] 57941: [HAL] Fix / silence some warnings/errors detected with VS-analyze

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 18 09:52:07 2012 New Revision: 57941 URL: http://svn.reactos.org/svn/reactos?rev=57941&view=rev Log: [HAL] Fix / silence some warnings/errors detected with VS-analyze Modified: trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Tue Dec 18 09:52:07 2012 @@ -72,6 +72,8 @@ /* INCLUDES *****************************************************************/ #include <hal.h> +#include <suppress.h> + #define NDEBUG #include <debug.h> @@ -552,6 +554,7 @@ if (Controller == 1) { /* Set the Request Data */ + _PRAGMA_WARNING_SUPPRESS(__WARNING_DEREF_NULL_PTR) WRITE_PORT_UCHAR(&((PDMA1_CONTROL)AdapterBaseVa)->Mode, DmaMode.Byte); /* Unmask DMA Channel */ Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Tue Dec 18 09:52:07 2012 @@ -39,13 +39,16 @@ BusSpecificData, NULL, &Bus); - if (!Bus) return NULL; + if (!Bus) + { + return NULL; + } /* Check for a valid interface */ if (InterfaceType != InterfaceTypeUndefined) { /* Allocate address ranges and zero them out */ - Bus->BusAddresses = ExAllocatePoolWithTag(NonPagedPool, + Bus->BusAddresses = ExAllocatePoolWithTag(NonPagedPoolMustSucceed, sizeof(SUPPORTED_RANGES), ' laH'); RtlZeroMemory(Bus->BusAddresses, sizeof(SUPPORTED_RANGES)); @@ -1153,7 +1156,7 @@ PBUS_HANDLER Handler; NTSTATUS Status; PAGED_CODE(); - DPRINT1("Slot assignment for %d on bus %d\n", BusType, BusNumber); + DPRINT1("Slot assignment for %d on bus %u\n", BusType, BusNumber); /* Find the handler */ Handler = HalReferenceHandlerForBus(BusType, BusNumber); @@ -1263,7 +1266,7 @@ Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); if (!(Handler) || !(Handler->TranslateBusAddress)) { - DPRINT1("No translator Interface: %x, Bus: %x, Handler: %x!\n", InterfaceType, BusNumber, Handler); + DPRINT1("No translator Interface: %x, Bus: %x, Handler: %p!\n", InterfaceType, BusNumber, Handler); return FALSE; }

11 years, 9 months

[hbelusca] 57940: [REGEDIT] Update the address bar after creating a registry key. CORE-6816 #resolve #comment Committed in r57940. Thanks ; )

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 17 23:22:03 2012 New Revision: 57940 URL: http://svn.reactos.org/svn/reactos?rev=57940&view=rev Log: [REGEDIT] Update the address bar after creating a registry key. CORE-6816 #resolve #comment Committed in r57940. Thanks ;) Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/childwnd.c [iso-8859-1] Mon Dec 17 23:22:03 2012 @@ -35,7 +35,7 @@ if (hRootKey == HKEY_CURRENT_CONFIG) return L"HKEY_CURRENT_CONFIG"; if (hRootKey == HKEY_DYN_DATA) return L"HKEY_DYN_DATA"; - return L"UKNOWN HKEY, PLEASE REPORT"; + return L"UNKNOWN HKEY, PLEASE REPORT"; } extern void ResizeWnd(int cx, int cy) @@ -301,6 +301,53 @@ break; } return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam); +} + +static VOID +UpdateAddress(HTREEITEM hItem, HKEY hRootKey, LPCWSTR pszPath) +{ + LPCWSTR keyPath, rootName; + LPWSTR fullPath; + + if (pszPath == NULL) + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hItem, &hRootKey); + else + keyPath = pszPath; + + if (keyPath) + { + RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath); + rootName = get_root_key_name(hRootKey); + fullPath = HeapAlloc(GetProcessHeap(), 0, (wcslen(rootName) + 1 + wcslen(keyPath) + 1) * sizeof(WCHAR)); + if (fullPath) + { + /* set (correct) the address bar text */ + if (keyPath[0] != L'\0') + swprintf(fullPath, L"%s\\%s", rootName, keyPath); + else + fullPath = wcscpy(fullPath, rootName); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); + SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); + HeapFree(GetProcessHeap(), 0, fullPath); + /* disable hive manipulation items temporarily (enable only if necessary) */ + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED); + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED); + /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */ + if (!(wcsicmp(rootName, L"HKEY_LOCAL_MACHINE") && + wcsicmp(rootName, L"HKEY_USERS"))) + { + /* + * enable the unload menu item if at the root, otherwise + * enable the load menu item if there is no slash in + * keyPath (ie. immediate child selected) + */ + if(keyPath[0] == L'\0') + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED); + else if(!wcschr(keyPath, L'\\')) + EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED); + } + } + } } /******************************************************************************* @@ -494,45 +541,8 @@ case TVN_ITEMEXPANDING: return !OnTreeExpanding(g_pChildWnd->hTreeWnd, (NMTREEVIEW*)lParam); case TVN_SELCHANGED: - { - LPCWSTR keyPath, rootName; - LPWSTR fullPath; - HKEY hRootKey; - - keyPath = GetItemPath(g_pChildWnd->hTreeWnd, ((NMTREEVIEW*)lParam)->itemNew.hItem, &hRootKey); - if (keyPath) - { - RefreshListView(g_pChildWnd->hListWnd, hRootKey, keyPath); - rootName = get_root_key_name(hRootKey); - fullPath = HeapAlloc(GetProcessHeap(), 0, (wcslen(rootName) + 1 + wcslen(keyPath) + 1) * sizeof(WCHAR)); - if (fullPath) - { - /* set (correct) the address bar text */ - if(keyPath[0] != L'\0') - swprintf(fullPath, L"%s\\%s", rootName, keyPath); - else - fullPath = wcscpy(fullPath, rootName); - SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)fullPath); - SendMessageW(g_pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); - HeapFree(GetProcessHeap(), 0, fullPath); - /* disable hive manipulation items temporarily (enable only if necessary) */ - EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_GRAYED); - EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_GRAYED); - /* compare the strings to see if we should enable/disable the "Load Hive" menus accordingly */ - if (!(wcsicmp(rootName, L"HKEY_LOCAL_MACHINE") && - wcsicmp(rootName, L"HKEY_USERS"))) - { - // enable the unload menu item if at the root - // otherwise enable the load menu item if there is no slash in keyPath (ie. immediate child selected) - if(keyPath[0] == L'\0') - EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_LOADHIVE, MF_BYCOMMAND | MF_ENABLED); - else if(!wcschr(keyPath, L'\\')) - EnableMenuItem(GetSubMenu(hMenuFrame,0), ID_REGISTRY_UNLOADHIVE, MF_BYCOMMAND | MF_ENABLED); - } - } - } - } - break; + UpdateAddress(((NMTREEVIEW*)lParam)->itemNew.hItem, NULL, NULL); + break; case NM_SETFOCUS: g_pChildWnd->nFocusPanel = 0; break; @@ -571,6 +581,8 @@ { if (RenameKey(hRootKey, keyPath, ptvdi->item.pszText) != ERROR_SUCCESS) lResult = FALSE; + else + UpdateAddress(ptvdi->item.hItem, hRootKey, szBuffer); } return lResult; }

11 years, 9 months

[spetreolle] 57939: [INFLIB] Don't use _swprintf. Tested in rosbe 2, 2.1, windows, linux, and VS 10.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Dec 17 22:48:07 2012 New Revision: 57939 URL: http://svn.reactos.org/svn/reactos?rev=57939&view=rev Log: [INFLIB] Don't use _swprintf. Tested in rosbe 2, 2.1, windows, linux, and VS 10. Modified: trunk/reactos/lib/inflib/CMakeLists.txt Modified: trunk/reactos/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/CMakeLists.txt [iso-8859-1] Mon Dec 17 22:48:07 2012 @@ -20,10 +20,12 @@ infhostput.c infhostrtl.c) - add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS) + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) + if(MSVC) + add_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS) + endif() add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) if(NOT MSVC) - add_definitions(-D_swprintf=swprintf) add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings") endif() target_link_libraries(inflibhost unicode)

11 years, 9 months

[tkreuzer] 57938: [RTL] Revert silencing a warning and apply a real fix. Spotted by Thomas.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 17 13:27:33 2012 New Revision: 57938 URL: http://svn.reactos.org/svn/reactos?rev=57938&view=rev Log: [RTL] Revert silencing a warning and apply a real fix. Spotted by Thomas. 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=579… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Mon Dec 17 13:27:33 2012 @@ -10,8 +10,6 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> -#include <suppress.h> - #define NDEBUG #include <debug.h> @@ -244,8 +242,7 @@ { /* Prepare defaults */ Status = STATUS_SUCCESS; - _PRAGMA_WARNING_SUPPRESS(__WARNING_SIZEOF_COUNTOF_MISMATCH) - ValueEnd = (PWSTR)((ULONG_PTR)Data + Length) - sizeof(UNICODE_NULL); + ValueEnd = (PWSTR)((ULONG_PTR)Data + Length - sizeof(UNICODE_NULL)); p = Data; /* Loop all strings */ @@ -837,7 +834,7 @@ KeyInfo, BufferLength, &ReturnedLength); - if (NT_SUCCESS(Status) && (KeyInfo != NULL)) + if (NT_SUCCESS(Status)) { /* Check if the name fits */ if (KeyInfo->NameLength <= SubKeyName->MaximumLength)

11 years, 9 months

[tkreuzer] 57937: [CMLIB] Fix / silence some warnings/errors detected with VS-analyze

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 17 12:27:21 2012 New Revision: 57937 URL: http://svn.reactos.org/svn/reactos?rev=57937&view=rev Log: [CMLIB] Fix / silence some warnings/errors detected with VS-analyze Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Mon Dec 17 12:27:21 2012 @@ -235,10 +235,10 @@ /* Something bad happened, print a useful trace info and bugcheck */ CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); - CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %d\n", Index); + CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %u\n", Index); for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) { - CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%d]: ", FreeListIndex); + CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%u]: ", FreeListIndex); pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; while (*pFreeCellOffset != HCELL_NIL) { Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=5… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Mon Dec 17 12:27:21 2012 @@ -119,7 +119,6 @@ RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; } - RtlInitializeBitMap(&RegistryHive->DirtyVector, NULL, 0); return STATUS_SUCCESS; }

11 years, 9 months

[tkreuzer] 57936: [RTL] - Fix a calculation bug in the heap code - Fix pointer arithmetics - Fix artihetic overflows - rename some global items to not conflict with local names - Silence some more ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 17 12:06:14 2012 New Revision: 57936 URL: http://svn.reactos.org/svn/reactos?rev=57936&view=rev Log: [RTL] - Fix a calculation bug in the heap code - Fix pointer arithmetics - Fix artihetic overflows - rename some global items to not conflict with local names - Silence some more warnings from VS analyze Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/ppb.c trunk/reactos/lib/rtl/rangelist.c trunk/reactos/lib/rtl/registry.c trunk/reactos/lib/rtl/srw.c trunk/reactos/lib/rtl/version.c trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=57936… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -192,7 +192,7 @@ static const WCHAR iidW[] = {'i','i','d',0}; static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; static const WCHAR manifestVersionW[] = {'m','a','n','i','f','e','s','t','V','e','r','s','i','o','n',0}; -static const WCHAR nameW[] = {'n','a','m','e',0}; +static const WCHAR g_nameW[] = {'n','a','m','e',0}; static const WCHAR newVersionW[] = {'n','e','w','V','e','r','s','i','o','n',0}; static const WCHAR oldVersionW[] = {'o','l','d','V','e','r','s','i','o','n',0}; static const WCHAR optionalW[] = {'o','p','t','i','o','n','a','l',0}; @@ -203,7 +203,7 @@ static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; -static const WCHAR xmlW[] = {'?','x','m','l',0}; +static const WCHAR g_xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; static const WCHAR manifestv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; @@ -528,21 +528,17 @@ {',','p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e','=',0}; static const WCHAR public_keyW[] = {',','p','u','b','l','i','c','K','e','y','T','o','k','e','n','=',0}; - static const WCHAR typeW[] = - {',','t','y','p','e','=',0}; - static const WCHAR versionW[] = - {',','v','e','r','s','i','o','n','=',0}; WCHAR version[64], *ret; SIZE_T size = 0; sprintfW( version, version_formatW, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision ); - if (ai->name) size += strlenW(ai->name) * sizeof(WCHAR); + if (ai->name) size += strlenW(ai->name); if (ai->arch) size += strlenW(archW) + strlenW(ai->arch) + 2; if (ai->public_key) size += strlenW(public_keyW) + strlenW(ai->public_key) + 2; - if (ai->type) size += strlenW(typeW) + strlenW(ai->type) + 2; - size += strlenW(versionW) + strlenW(version) + 2; + if (ai->type) size += 1 + strlenW(typeW) + 1 + strlenW(ai->type) + 2; + size += 1+ strlenW(versionW) + 1 + strlenW(version) + 2; if (!(ret = RtlAllocateHeap( RtlGetProcessHeap(), 0, (size + 1) * sizeof(WCHAR) ))) return NULL; @@ -847,7 +843,7 @@ while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { - if (xmlstr_cmp(&attr_name, nameW)) + if (xmlstr_cmp(&attr_name, g_nameW)) { if (!(ai->name = xmlstrdupW(&attr_value))) return FALSE; } @@ -944,7 +940,7 @@ { if (!(entity->u.proxy.iid = xmlstrdupW(&attr_value))) return FALSE; } - if (xmlstr_cmp(&attr_name, nameW)) + if (xmlstr_cmp(&attr_name, g_nameW)) { if (!(entity->u.proxy.name = xmlstrdupW(&attr_value))) return FALSE; } @@ -1107,7 +1103,7 @@ { if (!(entity->u.proxy.iid = xmlstrdupW(&attr_value))) return FALSE; } - if (xmlstr_cmp(&attr_name, nameW)) + if (xmlstr_cmp(&attr_name, g_nameW)) { if (!(entity->u.proxy.name = xmlstrdupW(&attr_value))) return FALSE; } @@ -1133,7 +1129,7 @@ while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { - if (xmlstr_cmp(&attr_name, nameW)) + if (xmlstr_cmp(&attr_name, g_nameW)) { if (!(entity->u.clrclass.name = xmlstrdupW(&attr_value))) return FALSE; } @@ -1165,7 +1161,7 @@ while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) { - if (xmlstr_cmp(&attr_name, nameW)) + if (xmlstr_cmp(&attr_name, g_nameW)) { if (!(entity->u.clrsurrogate.name = xmlstrdupW(&attr_value))) return FALSE; } @@ -1299,7 +1295,7 @@ attr_nameU = xmlstr2unicode(&attr_name); attr_valueU = xmlstr2unicode(&attr_value); - if (xmlstr_cmp(&attr_name, nameW)) + if (xmlstr_cmp(&attr_name, g_nameW)) { if (!(dll->name = xmlstrdupW(&attr_value))) return FALSE; DPRINT("name=%wZ\n", &attr_valueU); @@ -1499,7 +1495,7 @@ if (!next_xml_elem(xmlbuf, &elem)) return STATUS_SXS_CANT_GEN_ACTCTX; - if (xmlstr_cmp(&elem, xmlW) && + if (xmlstr_cmp(&elem, g_xmlW) && (!parse_xml_header(xmlbuf) || !next_xml_elem(xmlbuf, &elem))) return STATUS_SXS_CANT_GEN_ACTCTX; Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=57… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -260,7 +260,7 @@ ULONG ReturnSize = 0; ULONG MSize; - Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); + Mp = (PRTL_PROCESS_MODULES)((PUCHAR)Buf + Buf->OffsetFree); /* I like this better than the do & while loop. */ Status = LdrQueryProcessModuleInformation(NULL, @@ -284,7 +284,7 @@ PRTL_PROCESS_HEAPS Hp; ULONG HSize; - Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); + Hp = (PRTL_PROCESS_HEAPS)((PUCHAR)Buf + Buf->OffsetFree); HSize = sizeof(RTL_PROCESS_HEAPS); if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) { @@ -304,7 +304,7 @@ PRTL_PROCESS_LOCKS Lp; ULONG LSize; - Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); + Lp = (PRTL_PROCESS_LOCKS)((PUCHAR)Buf + Buf->OffsetFree); LSize = sizeof(RTL_PROCESS_LOCKS); Buf->Locks = Lp; Buf->OffsetFree = Buf->OffsetFree + LSize; @@ -344,7 +344,7 @@ ULONG ReturnSize = 0; ULONG MSize; - Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->OffsetFree); + Mp = (PRTL_PROCESS_MODULES)((PUCHAR)Buf + Buf->OffsetFree); Status = RtlpQueryRemoteProcessModules(hProcess, NULL, @@ -370,7 +370,7 @@ PRTL_PROCESS_HEAPS Hp; ULONG HSize; - Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->OffsetFree); + Hp = (PRTL_PROCESS_HEAPS)((PUCHAR)Buf + Buf->OffsetFree); HSize = sizeof(RTL_PROCESS_HEAPS); if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) { @@ -390,7 +390,7 @@ PRTL_PROCESS_LOCKS Lp; ULONG LSize; - Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->OffsetFree); + Lp = (PRTL_PROCESS_LOCKS)((PUCHAR)Buf + Buf->OffsetFree); LSize = sizeof(RTL_PROCESS_LOCKS); Buf->Locks = Lp; Buf->OffsetFree = Buf->OffsetFree + LSize; Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=57936&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -2761,7 +2761,7 @@ if (InUseEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) { /* Simple in case of a virtual alloc - just an unused size */ - InUseEntry->Size = (USHORT)(AllocationSize - Size); + InUseEntry->Size = (USHORT)((AllocationSize - Size) >> HEAP_ENTRY_SHIFT); } else if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) { Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -33,7 +33,7 @@ /* Only if user want it */ if (*CallersAddress != NULL) { - /* only when first frames exist */ + /* only when first frames exist */ if (FrameCount >= 1) { *CallersAddress = BackTrace[0]; @@ -47,7 +47,7 @@ /* Only if user want it */ if (*CallersCaller != NULL) { - /* only when second frames exist */ + /* only when second frames exist */ if (FrameCount >= 2) { *CallersCaller = BackTrace[1]; @@ -92,6 +92,9 @@ /* Now loop every frame */ while (RegistrationFrame != EXCEPTION_CHAIN_END) { + /* Registration chain entries are never NULL */ + ASSERT(RegistrationFrame != NULL); + /* Find out where it ends */ RegistrationFrameEnd = (ULONG_PTR)RegistrationFrame + sizeof(EXCEPTION_REGISTRATION_RECORD); @@ -127,8 +130,7 @@ RegistrationFrame, Context, &DispatcherContext, - RegistrationFrame-> - Handler); + RegistrationFrame->Handler); /* Check if this is a nested frame */ if (RegistrationFrame == NestedFrame) @@ -274,6 +276,9 @@ /* Now loop every frame */ while (RegistrationFrame != EXCEPTION_CHAIN_END) { + /* Registration chain entries are never NULL */ + ASSERT(RegistrationFrame != NULL); + /* If this is the target */ if (RegistrationFrame == TargetFrame) ZwContinue(Context, FALSE); @@ -326,8 +331,7 @@ RegistrationFrame, Context, &DispatcherContext, - RegistrationFrame-> - Handler); + RegistrationFrame->Handler); switch(Disposition) { /* Continue searching */ Modified: trunk/reactos/lib/rtl/ppb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/ppb.c?rev=57936&r1… ============================================================================== --- trunk/reactos/lib/rtl/ppb.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/ppb.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -147,8 +147,6 @@ /* make sure the current directory has a trailing backslash */ if (Param->CurrentDirectory.DosPath.Length > 0) { - ULONG Length; - Length = Param->CurrentDirectory.DosPath.Length / sizeof(WCHAR); if (Param->CurrentDirectory.DosPath.Buffer[Length-1] != L'\\') { Modified: trunk/reactos/lib/rtl/rangelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rangelist.c?rev=57… ============================================================================== --- trunk/reactos/lib/rtl/rangelist.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rangelist.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -569,12 +569,6 @@ PRTL_RANGE_ENTRY Current; PLIST_ENTRY Entry; NTSTATUS Status; - - /* Don't invert an empty range list */ - if (IsListEmpty(&RangeList->ListHead)) - { - return STATUS_SUCCESS; - } /* Add leading and intermediate ranges */ Previous = NULL; @@ -618,6 +612,13 @@ Entry = Entry->Flink; } + /* Check if the list was empty */ + if (Previous == NULL) + { + /* We're done */ + return STATUS_SUCCESS; + } + /* Add trailing range */ if (Previous->Range.End + 1 != (ULONGLONG)-1) { Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=579… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -10,6 +10,8 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> +#include <suppress.h> + #define NDEBUG #include <debug.h> @@ -242,6 +244,7 @@ { /* Prepare defaults */ Status = STATUS_SUCCESS; + _PRAGMA_WARNING_SUPPRESS(__WARNING_SIZEOF_COUNTOF_MISMATCH) ValueEnd = (PWSTR)((ULONG_PTR)Data + Length) - sizeof(UNICODE_NULL); p = Data; @@ -834,7 +837,7 @@ KeyInfo, BufferLength, &ReturnedLength); - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && (KeyInfo != NULL)) { /* Check if the name fits */ if (KeyInfo->NameLength <= SubKeyName->MaximumLength) Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=57936&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/srw.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -140,19 +140,19 @@ } else { - PRTLP_SRWLOCK_SHARED_WAKE WakeChain, Next; + PRTLP_SRWLOCK_SHARED_WAKE WakeChain, NextWake; /* If we were the first one to acquire the shared lock, we now need to wake all others... */ WakeChain = FirstWaitBlock->SharedWakeChain; do { - Next = WakeChain->Next; + NextWake = WakeChain->Next; (void)InterlockedOr((PLONG)&WakeChain->Wake, TRUE); - WakeChain = Next; + WakeChain = NextWake; } while (WakeChain != NULL); } } Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=5793… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -214,6 +214,8 @@ IN DWORD dwTypeBitMask, IN BYTE bConditionMask) { + ULONGLONG ullCondMask; + if (dwTypeBitMask == 0) return dwlConditionMask; @@ -222,22 +224,23 @@ if (bConditionMask == 0) return dwlConditionMask; + ullCondMask = bConditionMask; if (dwTypeBitMask & VER_PRODUCT_TYPE) - dwlConditionMask |= bConditionMask << 7 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (7 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_SUITENAME) - dwlConditionMask |= bConditionMask << 6 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (6 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) - dwlConditionMask |= bConditionMask << 5 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (5 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_SERVICEPACKMINOR) - dwlConditionMask |= bConditionMask << 4 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (4 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_PLATFORMID) - dwlConditionMask |= bConditionMask << 3 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (3 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_BUILDNUMBER) - dwlConditionMask |= bConditionMask << 2 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (2 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_MAJORVERSION) - dwlConditionMask |= bConditionMask << 1 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (1 * VER_NUM_BITS_PER_CONDITION_MASK); else if (dwTypeBitMask & VER_MINORVERSION) - dwlConditionMask |= bConditionMask << 0 * VER_NUM_BITS_PER_CONDITION_MASK; + dwlConditionMask |= ullCondMask << (0 * VER_NUM_BITS_PER_CONDITION_MASK); return dwlConditionMask; } Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=579… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Mon Dec 17 12:06:14 2012 @@ -175,7 +175,7 @@ if (NT_SUCCESS(Status)) { NtResumeThread(ThreadHandle, NULL); - + /* Poll until the thread got a chance to initialize */ while (WorkerInitialized == 0) { @@ -724,6 +724,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + (void)0; } _SEH2_END; }

11 years, 9 months

[hbelusca] 57935: [FREELDR] - Effectively reboot instead of exiting the bootloader and hanging. - Do a cold reboot instead of a (soft) warm reboot, to let the user be able to choose another boot su...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 17 00:22:11 2012 New Revision: 57935 URL: http://svn.reactos.org/svn/reactos?rev=57935&view=rev Log: [FREELDR] - Effectively reboot instead of exiting the bootloader and hanging. - Do a cold reboot instead of a (soft) warm reboot, to let the user be able to choose another boot support or do anything else, instead of directly rebooting to the bootloader. Rename the concerned function accordingly. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -359,5 +359,5 @@ UiMessageBox("The system will now reboot."); DiskStopFloppyMotor(); - SoftReboot(); -} + Reboot(); +} 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] Mon Dec 17 00:22:11 2012 @@ -198,10 +198,10 @@ ret -PUBLIC _SoftReboot -_SoftReboot: +PUBLIC _Reboot +_Reboot: /* Set the function ID */ - mov bx, FNID_SoftReboot + mov bx, FNID_Reboot /*Switch to real mode (We don't return) */ jmp SwitchToReal Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -50,7 +50,7 @@ /* Wait for a keypress */ int HEX(16) - jmp SoftReboot + jmp Reboot Msg_Unsupported: .ascii "This CPU is not supported.", CR, LF @@ -330,11 +330,11 @@ .long 0, 0 int HEX(16) - jmp SoftReboot + jmp Reboot CallbackTable: .word Int386 - .word SoftReboot + .word Reboot .word ChainLoadBiosBootSectorCode .word PxeCallApi .word PnpBiosGetDeviceNodeCount Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -92,20 +92,17 @@ popfd ret -SoftReboot: - mov ax, HEX(40) - mov ds, ax - mov si, HEX(72) +Reboot: + cli - /* Set the word at location 40:72 to 1234h */ - mov word ptr [si], HEX(1234) + /* Set the word at location 40h:72h to 0 (cold reboot) */ + mov word ptr ds:[HEX(0472)], HEX(0) - /* and jump to location FFFF:0 in ROM */ - ljmp16 HEX(0FFFF), HEX(0000) + /* and jump to location F000h:FFF0h in ROM */ + ljmp16 HEX(0F000), HEX(0FFF0) ChainLoadBiosBootSectorCode: - /* Load segment registers */ cli xor ax, ax @@ -117,4 +114,4 @@ mov esp, HEX(7C00) /* Jump to the bootsector code */ - ljmp16 HEX(0000), HEX(7C00) + ljmp16 HEX(0000), HEX(7C00) Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -142,7 +142,7 @@ callback_table: .word Int386 - .word SoftReboot + .word Reboot .word ChainLoadBiosBootSectorCode .word PxeCallApi .word PnpBiosGetDeviceNodeCount Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -40,13 +40,13 @@ if (!UiInitialize(FALSE)) { UiMessageBoxCritical("Unable to initialize UI.\n"); - return; + goto quit; } if (!MmInitializeMemoryManager()) { UiMessageBoxCritical("Unable to initialize memory manager"); - return; + goto quit; } #ifdef _M_IX86 @@ -54,6 +54,11 @@ HalpInitBusHandler(); #endif RunLoader(); + +quit: + /* If we reach this point, something went wrong before, therefore reboot */ + DiskStopFloppyMotor(); + Reboot(); } // We need to emulate these, because the original ones don't work in freeldr Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/pcbios.h [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -119,7 +119,7 @@ void EnableA20(void); VOID ChainLoadBiosBootSectorCode(VOID); // Implemented in boot.S -VOID SoftReboot(VOID); // Implemented in boot.S +VOID Reboot(VOID); // Implemented in boot.S VOID DetectHardware(VOID); // Implemented in hardware.c #endif /* ! __ASM__ */ 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] Mon Dec 17 00:22:11 2012 @@ -48,7 +48,7 @@ /* Realmode function IDs */ #define FNID_Int386 0 -#define FNID_SoftReboot 1 +#define FNID_Reboot 1 #define FNID_ChainLoadBiosBootSectorCode 2 #define FNID_PxeCallApi 3 #define FNID_PnpBiosGetDeviceNodeCount 4 Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -48,8 +48,8 @@ BOOLEAN TuiInitialize(VOID) { - MachVideoClearScreen(ATTR(COLOR_WHITE, COLOR_BLACK)); MachVideoHideShowTextCursor(FALSE); + MachVideoClearScreen(ATTR(COLOR_GRAY, COLOR_BLACK)); TextVideoBuffer = VideoAllocateOffScreenBuffer(); if (TextVideoBuffer == NULL) @@ -71,7 +71,7 @@ MachVideoSetDisplayMode(NULL, FALSE); } - //VideoClearScreen(); + MachVideoClearScreen(ATTR(COLOR_GRAY, COLOR_BLACK)); MachVideoHideShowTextCursor(TRUE); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Mon Dec 17 00:22:11 2012 @@ -229,7 +229,7 @@ VOID UiUnInitialize(PCSTR BootText) { UiDrawBackdrop(); - UiDrawStatusText("Booting..."); + UiDrawStatusText(BootText); UiInfoBox(BootText); UiVtbl.UnInitialize();

11 years, 9 months

[hbelusca] 57934: [FREELDR] Get rid of the default status bar text, which reappears at OS loading time if one boots with bootloader's text UI.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 16 22:00:41 2012 New Revision: 57934 URL: http://svn.reactos.org/svn/reactos?rev=57934&view=rev Log: [FREELDR] Get rid of the default status bar text, which reappears at OS loading time if one boots with bootloader's text UI. Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sun Dec 16 22:00:41 2012 @@ -132,11 +132,6 @@ 2, UiTitleBoxTitleText, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - - // - // Draw status bar - // - TuiDrawStatusText("Welcome to FreeLoader!"); // // Update the date & time

11 years, 9 months

[hbelusca] 57933: [FREELDR] Completely remove the special blue "setup-ui" appearing when starting the bootcd, in this way revert a part of r57842 and r57843. Requested by some people. Now we keep t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 16 21:32:41 2012 New Revision: 57933 URL: http://svn.reactos.org/svn/reactos?rev=57933&view=rev Log: [FREELDR] Completely remove the special blue "setup-ui" appearing when starting the bootcd, in this way revert a part of r57842 and r57843. Requested by some people. Now we keep the NTLDR-like boot ui. Modified: trunk/reactos/boot/bootdata/bootcd.ini trunk/reactos/boot/freeldr/freeldr/include/ui.h trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c Modified: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Sun Dec 16 21:32:41 2012 @@ -13,11 +13,16 @@ TitleBoxColor=Red MessageBoxTextColor=White MessageBoxColor=Blue -MenuTextColor=White -MenuColor=Blue -TextColor=Yellow +MenuTextColor=Gray +MenuColor=Black +TextColor=Gray SelectedTextColor=Black SelectedColor=Gray +ShowTime=No +MenuBox=No +CenterMenu=No +MinimalUI=Yes +TimeText=Seconds until highlighted choice will be started automatically: [Operating Systems] Setup="Setup" Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] Sun Dec 16 21:32:41 2012 @@ -55,7 +55,6 @@ // /////////////////////////////////////////////////////////////////////////////////////// BOOLEAN UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface -BOOLEAN SetupUiInitialize(VOID); // Initialize Setup User-Interface VOID UiUnInitialize(PCSTR BootText); // Un-initialize User-Interface VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Sun Dec 16 21:32:41 2012 @@ -575,13 +575,4 @@ return TRUE; } - -/* SETUP MODE *****************************************************************/ - -BOOLEAN SetupUiInitialize(VOID) -{ - /* Nothing to do */ - return TRUE; -} - #endif Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Sun Dec 16 21:32:41 2012 @@ -20,11 +20,8 @@ #include <freeldr.h> #include <debug.h> -#include <reactos/buildno.h> DBG_DEFAULT_CHANNEL(UI); - -BOOLEAN UiMinimal = FALSE; // Tells us if we are using a minimal console-like UI ULONG UiScreenWidth; // Screen Width ULONG UiScreenHeight; // Screen Height @@ -84,6 +81,7 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui) { VIDEODISPLAYMODE UiDisplayMode; // Tells us if we are in text or graphics mode + BOOLEAN UiMinimal = FALSE; // Tells us if we are using a minimal console-like UI ULONG_PTR SectionId; CHAR DisplayModeText[260]; CHAR SettingText[260]; @@ -464,72 +462,4 @@ return UiVtbl.EditBox(MessageText, EditTextBuffer, Length); } - -/* SETUP MODE *****************************************************************/ - -VOID SetupUiDrawBackdrop(VOID) -{ - CHAR Underline[80]; - SIZE_T Length; - - // Draw the backdrop and fade it in if special effects are enabled - UiVtbl.FillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 2, 0, - ATTR(UiBackdropFgColor, UiBackdropBgColor)); - - Length = min( strlen("ReactOS " KERNEL_VERSION_STR " Setup"), - sizeof(Underline) - 1 ); - memset(Underline, 0xcd, Length); // Underline title - Underline[Length] = '\0'; - - UiVtbl.DrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor)); - UiVtbl.DrawText(4, 2, Underline, ATTR(COLOR_GRAY, UiBackdropBgColor)); - - // Update the screen buffer - VideoCopyOffScreenBufferToVRAM(); -} - -BOOLEAN SetupUiInitialize(VOID) -{ - if (!UiMinimal) - { - ULONG Depth; - - // Initialize the video - MachVideoSetDisplayMode(NULL, TRUE); - MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); - - // Use Text UI with a modified backdrop and set display properties - UiVtbl = TuiVtbl; - UiVtbl.DrawBackdrop = SetupUiDrawBackdrop; - - UiStatusBarFgColor = COLOR_BLACK; - UiStatusBarBgColor = COLOR_GRAY; - UiBackdropFgColor = COLOR_WHITE; - UiBackdropBgColor = COLOR_BLUE; - UiBackdropFillStyle = MEDIUM_FILL; - UiTitleBoxFgColor = COLOR_WHITE; - UiTitleBoxBgColor = COLOR_RED; - UiMessageBoxFgColor = COLOR_WHITE; - UiMessageBoxBgColor = COLOR_BLUE; - UiMenuFgColor = COLOR_WHITE; - UiMenuBgColor = COLOR_BLUE; - UiTextColor = COLOR_YELLOW; - UiSelectedTextColor = COLOR_BLACK; - UiSelectedTextBgColor = COLOR_GRAY; - UiEditBoxTextColor = COLOR_WHITE; - UiEditBoxBgColor = COLOR_BLACK; - UiUseSpecialEffects = FALSE; - UiDrawTime = FALSE; - - UiVtbl.Initialize(); - - // Draw the backdrop - UiDrawBackdrop(); - } - - TRACE("SetupUiInitialize() returning TRUE.\n"); - - return TRUE; -} - #endif Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Sun Dec 16 21:32:41 2012 @@ -212,7 +212,6 @@ TRACE("BootOptions: '%s'\n", BootOptions); - SetupUiInitialize(); UiDrawStatusText("Setup is loading..."); /* Allocate and minimalistic-initialize LPB */

11 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
29
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 December 2012