Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 20246: adding binary convert tested betwin dec -> bin -> hex -> bin -> oct and works
by greatlrd＠svn.reactos.com 18 Dec '05

18 Dec '05

adding binary convert tested betwin dec -> bin -> hex -> bin -> oct and works Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-12-18 16:03:35 UTC (rev 20245) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-12-18 17:05:35 UTC (rev 20246) @@ -2960,15 +2960,53 @@ break; case NBASE_BINARY: - real = calc_atof(calc->buffer, old_base); + { + int buf=0; + int t; - _stprintf(calc->display, TEXT("%lx"), (long)real); - old_base = NBASE_BINARY; + if (calc->buffer[0]==_T('\0')) + { + real=0; + } + else + { + real = calc_atof(calc->buffer, old_base); + } + + calc->display[buf]=_T('0'); + calc->buffer[buf]=_T('0'); + for (t=31;t>=0;t--) + { + if (((((long)real)>>t) & ~0xFFFFFFFE)==0) + { + calc->display[buf]=_T('0'); + calc->buffer[buf]=_T('0'); + buf++; + } + else + { + calc->display[buf]=_T('1'); + calc->buffer[buf]=_T('1'); + buf++; + } + + } + + if (buf==0) + { + buf++; + } + + calc->buffer[buf]=_T('\0'); + calc->display[buf]=_T('\0'); + old_base = NBASE_BINARY; + } break; case NBASE_DECIMAL: - calc_buffer_format(calc); + calc_buffer_format(calc); + if (calc->displayMode) { if (!_tcscmp(calc->buffer, TEXT("0")) || !calc->buffer[0]) { _tcscpy(calc->display, TEXT("0.e+0")); @@ -2978,7 +3016,7 @@ int lz = 0; int exp = 0; - real = calc_atof(calc->buffer, calc->numBase); + real = calc_atof(calc->buffer,old_base); _stprintf(s, FMT_DESC_EXP, real); // remove leading zeros in exponent p = s;

1 0

[greatlrd] 20245: Fix partily of bug 1149, left todo is binary show. Follow thing : Hex, dec, oct should work fine now and convert betwin them
by greatlrd＠svn.reactos.com 18 Dec '05

18 Dec '05

Fix partily of bug 1149, left todo is binary show. Follow thing : Hex, dec, oct should work fine now and convert betwin them Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-12-18 12:32:05 UTC (rev 20244) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-12-18 16:03:35 UTC (rev 20245) @@ -2941,19 +2941,29 @@ TCHAR s[CALC_BUF_SIZE]; int point=0; calcfloat real; + static int old_base = NBASE_DECIMAL; + switch (calc->numBase) { - case NBASE_HEX: - real = calc_atof(calc->buffer, calc->numBase); - _stprintf(calc->display, TEXT("%lx"), (long)real); + case NBASE_HEX: + real = calc_atof(calc->buffer, old_base); + _stprintf(calc->display, _T("%lx"), (long)real); + _stprintf(calc->buffer, _T("%lx"), (long)real); + old_base = NBASE_HEX; break; - case NBASE_OCTAL: - _stprintf(calc->display, TEXT("%lo"), (long)calc->buffer); + case NBASE_OCTAL: + real = calc_atof(calc->buffer, old_base); + _stprintf(calc->display, TEXT("%lo"), (long)real); + _stprintf(calc->buffer, TEXT("%lo"), (long)real); + old_base = NBASE_OCTAL; break; case NBASE_BINARY: - _stprintf(calc->display, TEXT("%lx"), (long)calc->buffer); + real = calc_atof(calc->buffer, old_base); + + _stprintf(calc->display, TEXT("%lx"), (long)real); + old_base = NBASE_BINARY; break; case NBASE_DECIMAL: @@ -3031,7 +3041,9 @@ calc->display[0] = 0; _tcscat(calc->display, s); } + old_base = NBASE_DECIMAL; } + InvalidateRect(calc->hWnd, NULL, FALSE); UpdateWindow(calc->hWnd); }

1 0

[greatlrd] 20244: add allowwarnings ="true" so txtscale can be build with dgb=0 with gcc 3.4.4
by greatlrd＠svn.reactos.com 18 Dec '05

18 Dec '05

add allowwarnings ="true" so txtscale can be build with dgb=0 with gcc 3.4.4 Modified: trunk/rosapps/tests/txtscale/txtscale.xml _____ Modified: trunk/rosapps/tests/txtscale/txtscale.xml --- trunk/rosapps/tests/txtscale/txtscale.xml 2005-12-18 11:04:04 UTC (rev 20243) +++ trunk/rosapps/tests/txtscale/txtscale.xml 2005-12-18 12:32:05 UTC (rev 20244) @@ -1,4 +1,4 @@ -<module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe"> +<module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe" allowwarnings ="true"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" />

1 0

[weiden] 20243: don't typecast constant strings
by weiden＠svn.reactos.com 18 Dec '05

18 Dec '05

don't typecast constant strings Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-12-18 10:58:46 UTC (rev 20242) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c 2005-12-18 11:04:04 UTC (rev 20243) @@ -237,6 +237,7 @@ #if 0 FRLDRHKEY BusKey; ULONG i; + WCHAR szPci[] = L"PCI"; #endif /* Report the PCI BIOS */ @@ -345,8 +346,8 @@ Error = RegSetValue(BusKey, L"Identifier", REG_SZ, - (PUCHAR)"PCI", - 4 * sizeof(WCHAR)); + (PCSTR)szPci, + sizeof(szPci)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-12-18 10:58:46 UTC (rev 20242) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-12-18 11:04:04 UTC (rev 20243) @@ -31,6 +31,8 @@ unsigned long reactos_memory_map_descriptor_size; memory_map_t reactos_memory_map[32]; // Memory map +static CHAR szLoadingMsg[] = "Loading ReactOS..."; + static BOOL STDCALL FrLdrLoadKernel(PCHAR szFileName, @@ -75,7 +77,7 @@ FrLdrMapKernel(FilePointer); /* Update Processbar and return success */ - UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); return(TRUE); } @@ -331,7 +333,7 @@ FrLdrLoadModule(FilePointer, szFileName, NULL); /* Update status and return */ - UiDrawProgressBarCenter(nPos, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); return(TRUE); } @@ -687,7 +689,7 @@ if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE; UiDrawStatusText("Loading..."); - UiDrawProgressBarCenter(0, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(0, 100, szLoadingMsg); /* * Try to open system drive @@ -821,7 +823,7 @@ */ RegInitCurrentControlSet(FALSE); - UiDrawProgressBarCenter(15, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(15, 100, szLoadingMsg); /* * Export the hardware hive @@ -830,7 +832,7 @@ RegExportBinaryHive (L"\\Registry\\Machine\\HARDWARE", (PCHAR)Base, &Size); FrLdrCloseModule (Base, Size); - UiDrawProgressBarCenter(20, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(20, 100, szLoadingMsg); /* * Load NLS files @@ -840,13 +842,13 @@ UiMessageBox(MsgBuffer); return; } - UiDrawProgressBarCenter(30, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(30, 100, szLoadingMsg); /* * Load kernel symbols */ LoadKernelSymbols(szKernelName, 30); - UiDrawProgressBarCenter(40, 100, (PCHAR)"Loading ReactOS..."); + UiDrawProgressBarCenter(40, 100, szLoadingMsg); /* * Load boot drivers _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c --- trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-12-18 10:58:46 UTC (rev 20242) +++ trunk/reactos/boot/freeldr/freeldr/reactos/registry.c 2005-12-18 11:04:04 UTC (rev 20243) @@ -31,6 +31,7 @@ { #if 0 FRLDRHKEY TestKey; + WCHAR szTestString[] = L"TestString"; #endif /* Create root key */ @@ -85,8 +86,8 @@ RegSetValue (TestKey, L"TestValue", REG_SZ, - (PUCHAR)"TestString", - 11); + szTestString, + sizeof(szTestString)); #endif }

1 0

[chorns] 20242: Remove ole32 from api status
by chorns＠svn.reactos.com 18 Dec '05

18 Dec '05

Remove ole32 from api status Modified: trunk/reactos/apistatus.lst _____ Modified: trunk/reactos/apistatus.lst --- trunk/reactos/apistatus.lst 2005-12-18 09:55:29 UTC (rev 20241) +++ trunk/reactos/apistatus.lst 2005-12-18 10:58:46 UTC (rev 20242) @@ -11,7 +11,6 @@ kernel32.dll reactos/lib/kernel32 lz32.dll reactos/lib/lzexpand msvcrt.dll reactos/lib/msvcrt -ole32.dll reactos/lib/ole32 oleaut32.dll reactos/lib/oleaut32 rpcrt4.dll reactos/lib/rpcrt4 secur32.dll reactos/lib/secur32

1 0

[greatlrd] 20241: remove my last change for w3seek did not like it. and gave some good point why
by greatlrd＠svn.reactos.com 18 Dec '05

18 Dec '05

remove my last change for w3seek did not like it. and gave some good point why Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-12-18 09:36:32 UTC (rev 20240) +++ trunk/reactos/ReactOS.xml 2005-12-18 09:55:29 UTC (rev 20241) @@ -25,11 +25,7 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - <compilerflag>-fforce-addr</compilerflag> - <compilerflag>-fmerge-all-constants</compilerflag> - <compilerflag>-fmove-all-movables</compilerflag> - <compilerflag>-funit-at-a-time</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" />

1 0

[greatlrd] 20240: add -fforce-addr -fmerge-all-constants -fmove-all-movables -funit-at-a-time to DBG=0 Old setting did produce 1.06MB of comctl32.dll new setting produce it to 940KB. it will produce smaller file size for all file.
by greatlrd＠svn.reactos.com 18 Dec '05

18 Dec '05

add -fforce-addr -fmerge-all-constants -fmove-all-movables -funit-at-a-time to DBG=0 Old setting did produce 1.06MB of comctl32.dll new setting produce it to 940KB. it will produce smaller file size for all file. Modified: trunk/reactos/ReactOS.xml _____ Modified: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2005-12-18 01:29:18 UTC (rev 20239) +++ trunk/reactos/ReactOS.xml 2005-12-18 09:36:32 UTC (rev 20240) @@ -26,6 +26,10 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <compilerflag>-fforce-addr</compilerflag> + <compilerflag>-fmerge-all-constants</compilerflag> + <compilerflag>-fmove-all-movables</compilerflag> + <compilerflag>-funit-at-a-time</compilerflag> </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" />

1 0

[sgasiorek] 20239: putenv should return success on deletion of nonexistent variable.
by sgasiorek＠svn.reactos.com 18 Dec '05

18 Dec '05

putenv should return success on deletion of nonexistent variable. fixes one "msvcrt environ" test Modified: trunk/reactos/lib/crt/misc/environ.c _____ Modified: trunk/reactos/lib/crt/misc/environ.c --- trunk/reactos/lib/crt/misc/environ.c 2005-12-18 00:43:58 UTC (rev 20238) +++ trunk/reactos/lib/crt/misc/environ.c 2005-12-18 01:29:18 UTC (rev 20239) @@ -259,7 +259,7 @@ if (!found) { free(name); - return -1; + return 0; } /* Remove the option from wide character environment. */

1 0

[sgasiorek] 20238: "MSVCRT memcpy behaves like memmove for overlapping moves"
by sgasiorek＠svn.reactos.com 18 Dec '05

18 Dec '05

"MSVCRT memcpy behaves like memmove for overlapping moves" Fixes wine msvcrt string test Modified: trunk/reactos/lib/msvcrt/msvcrt.def _____ Modified: trunk/reactos/lib/msvcrt/msvcrt.def --- trunk/reactos/lib/msvcrt/msvcrt.def 2005-12-18 00:05:08 UTC (rev 20237) +++ trunk/reactos/lib/msvcrt/msvcrt.def 2005-12-18 00:43:58 UTC (rev 20238) @@ -746,7 +746,7 @@ mbtowc memchr memcmp -memcpy +memcpy=memmove memmove memset mktime

1 0

[weiden] 20237: fixed error codes returned when memory allocations failed
by weiden＠svn.reactos.com 18 Dec '05

18 Dec '05

fixed error codes returned when memory allocations failed Modified: trunk/reactos/lib/rtl/bootdata.c _____ Modified: trunk/reactos/lib/rtl/bootdata.c --- trunk/reactos/lib/rtl/bootdata.c 2005-12-18 00:00:18 UTC (rev 20236) +++ trunk/reactos/lib/rtl/bootdata.c 2005-12-18 00:05:08 UTC (rev 20237) @@ -48,7 +48,7 @@ TAG('S', 'e', 'S', 'd')); if (AbsSD == NULL) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_NO_MEMORY; goto Cleanup; } @@ -66,7 +66,7 @@ TAG('S', 'e', 'A', 'c')); if (Dacl == NULL) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_NO_MEMORY; goto Cleanup; } @@ -165,7 +165,7 @@ TAG('S', 'e', 'S', 'd')); if (RelSD == NULL) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_NO_MEMORY; goto Cleanup; } @@ -300,7 +300,7 @@ TAG('S', 'e', 'S', 'd')); if (AbsSD == NULL) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_NO_MEMORY; goto Cleanup; } @@ -360,6 +360,7 @@ TAG('S', 'e', 'S', 'd')); if (NewRelSD == NULL) { + Status = STATUS_NO_MEMORY; goto Cleanup; }

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