Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 57937: [CMLIB] Fix / silence some warnings/errors detected with VS-analyze
by tkreuzer＠svn.reactos.org 17 Dec '12

17 Dec '12

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; }

1 0

[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 17 Dec '12

17 Dec '12

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; }

1 0

[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 17 Dec '12

17 Dec '12

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();

1 0

[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 16 Dec '12

16 Dec '12

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

1 0

[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 16 Dec '12

16 Dec '12

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 */

1 0

[tkreuzer] 57932: [PSDK] Start rewrite sal.h This will drop support for WDK's prefast, since it's impossible to maintain both sal version 1 and 2 and the old stuff is quite unreliable anyway. Only ...
by tkreuzer＠svn.reactos.org 16 Dec '12

16 Dec '12

Author: tkreuzer Date: Sun Dec 16 18:28:06 2012 New Revision: 57932 URL: http://svn.reactos.org/svn/reactos?rev=57932&view=rev Log: [PSDK] Start rewrite sal.h This will drop support for WDK's prefast, since it's impossible to maintain both sal version 1 and 2 and the old stuff is quite unreliable anyway. Only MSVC 11+ analyze with attributes for SAL will work. abragin: "\o/ for throwing away some legacy" ;-) Modified: trunk/reactos/include/psdk/sal.h trunk/reactos/lib/sdk/crt/string/splitp.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=579… Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.…

1 0

[akhaldi] 57931: [LIBINFHOST] * Fix a linking issue with the upcoming toolchain.
by akhaldi＠svn.reactos.org 16 Dec '12

16 Dec '12

Author: akhaldi Date: Sun Dec 16 17:15:34 2012 New Revision: 57931 URL: http://svn.reactos.org/svn/reactos?rev=57931&view=rev Log: [LIBINFHOST] * Fix a linking issue with the upcoming toolchain. 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] Sun Dec 16 17:15:34 2012 @@ -23,6 +23,7 @@ add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS) 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)

1 0

[tkreuzer] 57930: [CRT] Fix build (2nd try)
by tkreuzer＠svn.reactos.org 16 Dec '12

16 Dec '12

Author: tkreuzer Date: Sun Dec 16 16:48:31 2012 New Revision: 57930 URL: http://svn.reactos.org/svn/reactos?rev=57930&view=rev Log: [CRT] Fix build (2nd try) Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Sun Dec 16 16:48:31 2012 @@ -32,7 +32,7 @@ } #endif - _Analysis_assume_(path != 0); + //_Analysis_assume_(path != 0); #if WINVER == 0x600 /* Skip '\\?\' prefix */

1 0

[tkreuzer] 57929: [CRT] Fix build
by tkreuzer＠svn.reactos.org 16 Dec '12

16 Dec '12

Author: tkreuzer Date: Sun Dec 16 16:44:54 2012 New Revision: 57929 URL: http://svn.reactos.org/svn/reactos?rev=57929&view=rev Log: [CRT] Fix build Modified: trunk/reactos/lib/sdk/crt/misc/amsg.c Modified: trunk/reactos/lib/sdk/crt/misc/amsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/amsg.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/amsg.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/amsg.c [iso-8859-1] Sun Dec 16 16:44:54 2012 @@ -47,6 +47,6 @@ void _amsg_exit(int errnum) { fprintf(stderr, "runtime error - %s\n", __rt_err_msg[errnum]); - _aexit_rtn(-1); + _exit(-1); }

1 0

[tkreuzer] 57928: [CRT] Fix / silence a number of warnings/errors detected with VS-analyze
by tkreuzer＠svn.reactos.org 16 Dec '12

16 Dec '12

Author: tkreuzer Date: Sun Dec 16 16:38:36 2012 New Revision: 57928 URL: http://svn.reactos.org/svn/reactos?rev=57928&view=rev Log: [CRT] Fix / silence a number of warnings/errors detected with VS-analyze Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h trunk/reactos/lib/sdk/crt/include/internal/rterror.h trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h trunk/reactos/lib/sdk/crt/mbstring/mbclen.c trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c trunk/reactos/lib/sdk/crt/stdio/popen.c trunk/reactos/lib/sdk/crt/stdio/stat64.c trunk/reactos/lib/sdk/crt/stdlib/getenv.c trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/lib/sdk/crt/string/splitp.c trunk/reactos/lib/sdk/crt/string/strtoi64.c trunk/reactos/lib/sdk/crt/string/wcstombs_s.c trunk/reactos/lib/sdk/crt/time/ctime.c trunk/reactos/lib/sdk/crt/time/strftime.c trunk/reactos/lib/sdk/crt/time/timezone.c trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -139,7 +139,7 @@ /* __CRTIMP extern wchar_t *_wcmdln; */ #endif - _CRTIMP void __cdecl _amsg_exit(int); + _CRTIMP __declspec(noreturn) void __cdecl _amsg_exit(int); int __CRTDECL _setargv(void); int __CRTDECL __setargv(void); Modified: trunk/reactos/lib/sdk/crt/include/internal/rterror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/rterror.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/rterror.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -25,7 +25,7 @@ #define _RT_STDIOINIT 15 /* not enough space for stdio initialization */ #define _RT_LOWIOINIT 16 /* not enough space for lowio initialization */ -void _amsg_exit (int errnum); +__declspec(noreturn) void _amsg_exit (int errnum); /* not in any other header */ void _dosmaperr(unsigned long oserrcode); Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -31,7 +31,7 @@ extern const unsigned short _ctype [257]; void __cdecl _purecall(void); -void __cdecl _amsg_exit(int errnum); +__declspec(noreturn) void __cdecl _amsg_exit(int errnum); extern char **_environ; extern wchar_t **_wenviron; Modified: trunk/reactos/lib/sdk/crt/mbstring/mbclen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbcle… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbclen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbclen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -34,7 +34,7 @@ { if (str && *str && size) { - return !isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); + return !isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1); } return 0; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbstr… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -30,7 +30,7 @@ /* FIXME: According to the documentation we are supposed to test for * multi-byte character validity. Whatever that means */ - str += isleadbyte(*str) ? 2 : 1; + str += isleadbyte((unsigned char)*str) ? 2 : 1; len++; } return len; Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -109,6 +109,7 @@ } CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); if ( *md == 'r' ) { Modified: trunk/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat64.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -45,7 +45,7 @@ Also a letter as first char isn't enough to be classified as a drive letter */ - if (isalpha(*path)&& (*(path+1)==':')) + if (isalpha((unsigned char)*path)&& (*(path+1)==':')) buf->st_dev = buf->st_rdev = _totupper(*path) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = _getdrive() - 1; Modified: trunk/reactos/lib/sdk/crt/stdlib/getenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/getenv.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -16,12 +16,12 @@ */ char *getenv(const char *name) { - char **environ; + char **env; size_t length = strlen(name); - for (environ = *__p__environ(); *environ; environ++) + for (env = *__p__environ(); *env; env++) { - char *str = *environ; + char *str = *env; char *pos = strchr(str,'='); if (pos && ((unsigned int)(pos - str) == length) && !_strnicmp(str, name, length)) return pos + 1; @@ -34,12 +34,12 @@ */ wchar_t *_wgetenv(const wchar_t *name) { - wchar_t **environ; + wchar_t **env; size_t length = wcslen(name); - for (environ = *__p__wenviron(); *environ; environ++) + for (env = *__p__wenviron(); *env; env++) { - wchar_t *str = *environ; + wchar_t *str = *env; wchar_t *pos = wcschr(str, L'='); if (pos && ((unsigned int)(pos - str) == length) && !_wcsnicmp(str, name, length)) return pos + 1; Modified: trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_mbstrn… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -10,6 +10,7 @@ #include <mbctype.h> #include <specstrings.h> +_Success_(return>0) _Check_return_ _CRTIMP size_t Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -9,8 +9,9 @@ #include <precomp.h> #include <mbstring.h> +_Success_(return!=EINVAL) +_Check_return_opt_ _CRTIMP -_Check_return_opt_ errno_t __cdecl mbstowcs_s( Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -37,8 +37,8 @@ #define _CHAR_ char #define _EOF_ EOF #define _EOF_RET EOF -#define _ISSPACE_(c) isspace(c) -#define _ISDIGIT_(c) isdigit(c) +#define _ISSPACE_(c) isspace((unsigned char)(c)) +#define _ISDIGIT_(c) isdigit((unsigned char)(c)) #define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */ #define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */ #define _CHAR2DIGIT_(c, base) char2digit((c), (base)) Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -31,6 +31,8 @@ return; } #endif + + _Analysis_assume_(path != 0); #if WINVER == 0x600 /* Skip '\\?\' prefix */ Modified: trunk/reactos/lib/sdk/crt/string/strtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoi6… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoi64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoi64.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -7,7 +7,7 @@ BOOL negative = FALSE; __int64 ret = 0; - while(isspace(*nptr)) nptr++; + while(isspace((unsigned char)*nptr)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -31,7 +31,7 @@ char cur = tolower(*nptr); int v; - if(isdigit(cur)) { + if(isdigit((unsigned char)cur)) { if(cur >= '0'+base) break; v = cur-'0'; Modified: trunk/reactos/lib/sdk/crt/string/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstombs_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstombs_s.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -8,6 +8,7 @@ #include <precomp.h> +_Success_(return!=EINVAL) _Check_return_wat_ _CRTIMP errno_t Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -7,12 +7,11 @@ */ #define MINGW_HAS_SECURE_API 1 +#include <errno.h> #define RC_INVOKED 1 // to prevent inline functions #include <tchar.h> #include <time.h> #include "bitsfixup.h" - -#define EINVAL -1 /* Doesn't really exist, but we need it here */ _CRTIMP errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time); Modified: trunk/reactos/lib/sdk/crt/time/strftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/strftime.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/strftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/strftime.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -2,8 +2,8 @@ * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/strftime.c - * PURPOSE: - * PROGRAMER: + * PURPOSE: + * PROGRAMER: */ #include <precomp.h> @@ -258,7 +258,7 @@ else tmp = mstm->tm_wday-1; - tmp = mstm->tm_yday/7 + (tmp<=mstm->tm_yday%7); + tmp = mstm->tm_yday/7 + (tmp <= ((unsigned)mstm->tm_yday%7)); if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 53)) return 0; break; Modified: trunk/reactos/lib/sdk/crt/time/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/timezone.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/timezone.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/timezone.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -219,31 +219,33 @@ */ int CDECL _get_tzname(size_t *ret, char *buf, size_t bufsize, int index) { - char *timezone; - - switch(index) + char *str_timezone; + + switch (index) { case 0: - timezone = tz_name; + str_timezone = tz_name; break; + case 1: - timezone = tz_dst_name; + str_timezone = tz_dst_name; break; + default: *_errno() = EINVAL; return EINVAL; } - if(!ret || (!buf && bufsize > 0) || (buf && !bufsize)) + if (!ret || (!buf && (bufsize > 0)) || (buf && !bufsize)) { *_errno() = EINVAL; return EINVAL; } - *ret = strlen(timezone)+1; + *ret = strlen(str_timezone) + 1; if(!buf && !bufsize) return 0; - strcpy(buf, timezone); + strncpy(buf, str_timezone, bufsize); return 0; } Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -216,8 +216,8 @@ for (i = a->max - 1; i >= 0; i--) { c = '>'; - if (i < a->start) c = '-'; - else if (i >= a->num) c = '}'; + if ((unsigned)i < a->start) c = '-'; + else if ((unsigned)i >= a->num) c = '}'; /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); } @@ -861,7 +861,7 @@ if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit(*sym->current)) + if (isdigit((unsigned char)*sym->current)) { /* FIXME: P6 = Function pointer, others who knows.. */ if (*sym->current++ == '6')

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs