Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 50282: [MSVCRT_WINETEST] - Comment out test which fails in WinXP SP3
by janderwald＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: janderwald Date: Tue Jan 4 16:45:03 2011 New Revision: 50282 URL: http://svn.reactos.org/svn/reactos?rev=50282&view=rev Log: [MSVCRT_WINETEST] - Comment out test which fails in WinXP SP3 Modified: trunk/rostests/winetests/msvcrt/cpp.c Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] Tue Jan 4 16:45:03 2011 @@ -844,7 +844,7 @@ { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HO@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,126>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,2016>",TRUE}, { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$0HOAA@@@", "class CDB_GEN_BIG_ENUM_FLAG<enum CDB_WYSIWYG_BITS_ENUM,32256>",TRUE}, - { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE}, +/* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$01@@@", FALSE},*/ /*FAILS in WINXP SP3 */ /* { "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@", "?AV?$CDB_GEN_BIG_ENUM_FLAG@W4CDB_WYSIWYG_BITS_ENUM@@$011@@@",FALSE}, */ }; int i, num_test = (sizeof(demangle)/sizeof(struct _demangle));

1 0

[tkreuzer] 50281: [WIN32K] - Access the DC member directly instead of using IntGdiGetDCOrg - Remove unused IntGdiGetDCOrg, GdiSetDCOrg, GdiGetDCOrgEx
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 15:52:59 2011 New Revision: 50281 URL: http://svn.reactos.org/svn/reactos?rev=50281&view=rev Log: [WIN32K] - Access the DC member directly instead of using IntGdiGetDCOrg - Remove unused IntGdiGetDCOrg, GdiSetDCOrg, GdiGetDCOrgEx Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue Jan 4 15:52:59 2011 @@ -1152,49 +1152,6 @@ return &pdc->dclevel.ptlBrushOrigin; } -VOID -APIENTRY -GdiSetDCOrg(HDC hDC, LONG Left, LONG Top, PRECTL prc) -{ - PDC pdc; - - pdc = DC_LockDc(hDC); - if (!pdc) return; - - pdc->ptlDCOrig.x = Left; - pdc->ptlDCOrig.y = Top; - - IntCalcFillOrigin(pdc); - - if (prc) pdc->erclWindow = *prc; - - DC_UnlockDc(pdc); -} - -// FIXME: remove me -BOOL FASTCALL -IntGdiGetDCOrg(PDC pDc, PPOINTL ppt) -{ - *ppt = pDc->ptlDCOrig; - return TRUE; -} - -// FIXME: remove me -BOOL APIENTRY -GdiGetDCOrgEx(HDC hDC, PPOINTL ppt, PRECTL prc) -{ - PDC pdc; - - pdc = DC_LockDc(hDC); - if (!pdc) return FALSE; - - *prc = pdc->erclWindow; - *ppt = pdc->ptlDCOrig; - - DC_UnlockDc(pdc); - return TRUE; -} - static VOID FASTCALL DC_vGetAspectRatioFilter(PDC pDC, LPSIZE AspectRatio) Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Tue Jan 4 15:52:59 2011 @@ -2051,7 +2051,7 @@ sinEsc = 0; } - IntGdiGetDCOrg(dc, &org); + org = dc->ptlDCOrig; for (idx = 0; idx < count; idx++) { Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Tue Jan 4 15:52:59 2011 @@ -3705,7 +3705,7 @@ } if (iCode == SYSRGN) { - IntGdiGetDCOrg(pDC, &org); + org = pDC->ptlDCOrig; NtGdiOffsetRgn(hDest, org.x, org.y ); }

1 0

[tkreuzer] 50280: [WIN32K] Implement NtGdiGetBoundsRect and NtGdiSetBoundsRect. Patch by Samuel Serapion with modifications by me.
by tkreuzer＠svn.reactos.org 04 Jan '11

04 Jan '11

Author: tkreuzer Date: Tue Jan 4 12:36:19 2011 New Revision: 50280 URL: http://svn.reactos.org/svn/reactos?rev=50280&view=rev Log: [WIN32K] Implement NtGdiGetBoundsRect and NtGdiSetBoundsRect. Patch by Samuel Serapion with modifications by me. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Tue Jan 4 12:36:19 2011 @@ -1057,7 +1057,7 @@ cxVirtualDeviceMm = NtGdiGetDeviceCaps(hdc, HORZSIZE); cyVirtualDeviceMm = NtGdiGetDeviceCaps(hdc, VERTSIZE); } - else if (cxVirtualDevicePixel == 0 || cyVirtualDevicePixel == 0 || + else if (cxVirtualDevicePixel == 0 || cyVirtualDevicePixel == 0 || cxVirtualDeviceMm == 0 || cyVirtualDeviceMm == 0) { return FALSE; @@ -1322,28 +1322,4 @@ return Ret; } - -DWORD -APIENTRY -NtGdiGetBoundsRect( - IN HDC hdc, - OUT LPRECT prc, - IN DWORD f) -{ - DPRINT1("stub\n"); - return DCB_RESET; /* bounding rectangle always empty */ -} - -DWORD -APIENTRY -NtGdiSetBoundsRect( - IN HDC hdc, - IN LPRECT prc, - IN DWORD f) -{ - DPRINT1("stub\n"); - return DCB_DISABLE; /* bounding rectangle always empty */ -} - - /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c [iso-8859-1] Tue Jan 4 12:36:19 2011 @@ -464,3 +464,92 @@ DC_UnlockDc(pdc); return Ret; } + +DWORD +APIENTRY +NtGdiGetBoundsRect( + IN HDC hdc, + OUT LPRECT prc, + IN DWORD flags) +{ + DWORD ret; + PDC pdc; + + /* Lock the DC */ + if (!(pdc = DC_LockDc(hdc))) return 0; + + /* Get the return value */ + ret = pdc->fs & DC_ACCUM_APP ? DCB_ENABLE : DCB_DISABLE; + ret |= RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? DCB_RESET : DCB_SET; + + /* Copy the rect to the caller */ + _SEH2_TRY + { + ProbeForWrite(prc, sizeof(RECT), 1); + *prc = pdc->erclBoundsApp; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = 0; + } + _SEH2_END; + + if (flags & DCB_RESET) + { + RECTL_vSetEmptyRect(&pdc->erclBoundsApp); + } + + DC_UnlockDc(pdc); + return ret; +} + + +DWORD +APIENTRY +NtGdiSetBoundsRect( + IN HDC hdc, + IN LPRECT prc, + IN DWORD flags) +{ + DWORD ret; + PDC pdc; + RECTL rcl; + + /* Verify arguments */ + if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; + + /* Lock the DC */ + if (!(pdc = DC_LockDc(hdc))) return 0; + + /* Get the return value */ + ret = pdc->fs & DC_ACCUM_APP ? DCB_ENABLE : DCB_DISABLE; + ret |= RECTL_bIsEmptyRect(&pdc->erclBoundsApp) ? DCB_RESET : DCB_SET; + + if (flags & DCB_RESET) + { + RECTL_vSetEmptyRect(&pdc->erclBoundsApp); + } + + if (flags & DCB_ACCUMULATE) + { + /* Capture the rect */ + _SEH2_TRY + { + ProbeForRead(prc, sizeof(RECT), 1); + rcl = *prc; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return 0;) + } + _SEH2_END; + + RECTL_vMakeWellOrdered(&rcl); + RECTL_bUnionRect(&pdc->erclBoundsApp, &pdc->erclBoundsApp, &rcl); + } + + if (flags & DCB_ENABLE) pdc->fs |= DC_ACCUM_APP; + if (flags & DCB_DISABLE) pdc->fs &= ~DC_ACCUM_APP; + DC_UnlockDc( pdc ); + return ret; +}

1 0

[tkreuzer] 50279: fix build
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 20:00:25 2011 New Revision: 50279 URL: http://svn.reactos.org/svn/reactos?rev=50279&view=rev Log: fix build Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Jan 3 20:00:25 2011 @@ -72,6 +72,7 @@ #endif #define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) +#define round(x) floor((x) + 0.5) void #ifdef _LIBCNT

1 0

[tkreuzer] 50278: [CRT] Fix a number of errors in floating point output.
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 19:39:17 2011 New Revision: 50278 URL: http://svn.reactos.org/svn/reactos?rev=50278&view=rev Log: [CRT] Fix a number of errors in floating point output. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Jan 3 19:39:17 2011 @@ -71,7 +71,7 @@ # define _flsbuf(chr, stream) 0 #endif -#define get_exp(f) floor(f > 0 ? log10(f) : log10(-f)) +#define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) void #ifdef _LIBCNT @@ -92,16 +92,30 @@ static const TCHAR _nan[] = _T("#QNAN"); static const TCHAR _infinity[] = _T("#INF"); const TCHAR *digits = digits_l; - int exponent = 0; - long double fpval; - int num_digits, val32, base = 10; - __int64 val64; - + int exponent = 0, sign; + long double fpval, fpval2; + int padding = 0, num_digits, val32, base = 10; + + /* Normalize the precision */ if (precision < 0) precision = 6; - else if (precision > 512) precision = 512; - + else if (precision > 17) + { + padding = precision - 17; + precision = 17; + } + + /* Get the float value and calculate the exponent */ fpval = va_arg_ffp(*argptr, flags); exponent = get_exp(fpval); + sign = fpval < 0 ? -1 : 1; + + /* Shift the decimal point and round */ + fpval2 = round(sign * fpval * pow(10., precision - exponent)); + if (fpval2 >= (unsigned __int64)pow(10., precision + 1)) + { + exponent++; + fpval2 = round(sign * fpval * pow(10., precision - exponent)); + } switch (chr) { @@ -111,21 +125,18 @@ if (precision > 0) precision--; if (exponent < -4 || exponent >= precision) goto case_e; - /* Skip trailing 0s */ - val64 = (__int64)(fpval * pow(10., precision) + 0.5); - while (precision && val64 % 10 == 0) + /* Skip trailing zeroes */ + while (precision && (unsigned __int64)fpval2 % 10 == 0) { precision--; - val64 /= 10; - } - + fpval2 /= 10; + } break; case _T('E'): digits = digits_u; case _T('e'): case_e: - fpval /= pow(10., exponent); val32 = exponent >= 0 ? exponent : -exponent; // FIXME: handle length of exponent field: @@ -154,13 +165,9 @@ break; } - /* CHECKME: Windows seems to handle a max of 17 digits(?) */ - num_digits = precision <= 17 ? precision: 17; - /* Handle sign */ if (fpval < 0) { - fpval = -fpval; *prefix = _T("-"); } else if (flags & FLAG_FORCE_SIGN) @@ -173,22 +180,25 @@ { (*string) -= sizeof(_nan) / sizeof(TCHAR) - 1; _tcscpy((*string), _nan); - val64 = 1; + fpval2 = 1; } else if (!_finite(fpval)) { (*string) -= sizeof(_infinity) / sizeof(TCHAR) - 1; _tcscpy((*string), _infinity); - val64 = 1; + fpval2 = 1; } else { + /* Zero padding */ + while (padding-- > 0) *--(*string) = _T('0'); + /* Digits after the decimal point */ - val64 = (__int64)(fpval * pow(10., precision) + 0.5); + num_digits = precision; while (num_digits-- > 0) { - *--(*string) = digits[val64 % 10]; - val64 /= 10; + *--(*string) = digits[(unsigned __int64)fpval2 % 10]; + fpval2 /= base; } } @@ -198,10 +208,10 @@ /* Digits before the decimal point */ do { - *--(*string) = digits[val64 % base]; - val64 /= base; - } - while (val64); + *--(*string) = digits[(unsigned __int64)fpval2 % base]; + fpval2 /= base; + } + while ((unsigned __int64)fpval2); }

1 0

[spetreolle] 50277: [CMAKE] Add apitests and pseh2_test.
by spetreolle＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: spetreolle Date: Mon Jan 3 11:24:54 2011 New Revision: 50277 URL: http://svn.reactos.org/svn/reactos?rev=50277&view=rev Log: [CMAKE] Add apitests and pseh2_test. Added: trunk/rostests/tests/CMakeLists.txt (with props) trunk/rostests/tests/pseh2/CMakeLists.txt (with props) Modified: trunk/rostests/CMakeLists.txt trunk/rostests/apitests/dciman32/CMakeLists.txt trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/ws2_32/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=50277&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -4,6 +4,6 @@ #add_subdirectory(dxtest) #add_subdirectory(regtests) add_subdirectory(rosautotest) -#add_subdirectory(tests) +add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests) Modified: trunk/rostests/apitests/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -5,3 +5,4 @@ target_link_libraries(dciman32_apitest wine) set_module_type(dciman32_apitest win32cui) add_importlibs(dciman32_apitest msvcrt kernel32 ntdll) +add_cab_target(dciman32_apitest 7) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -47,3 +47,4 @@ target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_cab_target(gdi32_apitest 7) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -16,3 +16,4 @@ ) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest ntdll) +add_cab_target(ntdll_apitest 7) Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -13,3 +13,4 @@ target_link_libraries(user32_apitest wine) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_cab_target(user32_apitest 7) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -11,3 +11,4 @@ target_link_libraries(ws2_32_apitest wine) set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll) +add_cab_target(ws2_32_apitest 7) Added: trunk/rostests/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/tests/CMakeLists.txt (added) +++ trunk/rostests/tests/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -1,0 +1,1 @@ +add_subdirectory(pseh2) Propchange: trunk/rostests/tests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/pseh2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/CMakeLists.tx… ============================================================================== --- trunk/rostests/tests/pseh2/CMakeLists.txt (added) +++ trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] Mon Jan 3 11:24:54 2011 @@ -1,0 +1,8 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +add_executable(pseh2_test psehtest.c psehtest2.c) +target_link_libraries(pseh2_test wine ${PSEH_LIB}) +set_module_type(pseh2_test win32cui) +add_importlibs(pseh2_test msvcrt kernel32 ntdll) +add_cab_target(pseh2_test 7) Propchange: trunk/rostests/tests/pseh2/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50276: [CRT] Enable new printf implementation.
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 11:22:46 2011 New Revision: 50276 URL: http://svn.reactos.org/svn/reactos?rev=50276&view=rev Log: [CRT] Enable new printf implementation. Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Mon Jan 3 11:22:46 2011 @@ -107,6 +107,6 @@  -<property name="NEWSPRINTF" value="0" /> +<property name="NEWSPRINTF" value="1" /> </group>

1 0

[tkreuzer] 50275: [CRT] Fix a bug in _ecvt that makes msvcrt_winetest::printf crash
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 11:00:28 2011 New Revision: 50275 URL: http://svn.reactos.org/svn/reactos?rev=50275&view=rev Log: [CRT] Fix a bug in _ecvt that makes msvcrt_winetest::printf crash Modified: trunk/reactos/lib/sdk/crt/stdlib/ecvt.c Modified: trunk/reactos/lib/sdk/crt/stdlib/ecvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/ecvt.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/ecvt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/ecvt.c [iso-8859-1] Mon Jan 3 11:00:28 2011 @@ -18,6 +18,7 @@ static char ecvtbuf[DBL_MAX_10_EXP + 10]; char *cvtbuf, *s, *d; + if (ndigits < 0) ndigits = 0; s = cvtbuf = (char*)malloc(ndigits + NUMBER_EFMT); d = ecvtbuf;

1 0

[tkreuzer] 50274: [CRT] Fix several bugs in new printf implementation.
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 10:33:58 2011 New Revision: 50274 URL: http://svn.reactos.org/svn/reactos?rev=50274&view=rev Log: [CRT] Fix several bugs in new printf implementation. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Jan 3 10:33:58 2011 @@ -108,7 +108,17 @@ case _T('G'): digits = digits_u; case _T('g'): + if (precision > 0) precision--; if (exponent < -4 || exponent >= precision) goto case_e; + + /* Skip trailing 0s */ + val64 = (__int64)(fpval * pow(10., precision) + 0.5); + while (precision && val64 % 10 == 0) + { + precision--; + val64 /= 10; + } + break; case _T('E'): @@ -128,7 +138,7 @@ } /* Sign for the exponent */ - *--(*string) = exponent > 0 ? _T('+') : _T('-'); + *--(*string) = exponent >= 0 ? _T('+') : _T('-'); /* Add 'e' or 'E' separator */ *--(*string) = digits[0xe]; @@ -173,9 +183,8 @@ } else { - fpval *= pow(10., precision); - val64 = (__int64)(fpval + 0.5); - + /* Digits after the decimal point */ + val64 = (__int64)(fpval * pow(10., precision) + 0.5); while (num_digits-- > 0) { *--(*string) = digits[val64 % 10]; @@ -183,7 +192,8 @@ } } - *--(*string) = _T('.'); + if (precision > 0 || flags & FLAG_SPECIAL) + *--(*string) = _T('.'); /* Digits before the decimal point */ do @@ -372,6 +382,7 @@ if (chr == _T('h')) flags |= FLAG_SHORT; else if (chr == _T('w')) flags |= FLAG_WIDECHAR; else if (chr == _T('L')) flags |= 0; // FIXME: long double + else if (chr == _T('F')) flags |= 0; // FIXME: what is that? else if (chr == _T('l')) { flags |= FLAG_LONG; @@ -483,6 +494,7 @@ else len = strlen((char*)string); if (precision >= 0 && len > precision) len = precision; + precision = 0; break; case _T('G'): @@ -521,9 +533,12 @@ case _T('o'): base = 8; - if (flags & FLAG_SPECIAL) prefix = _T("0"); + if (flags & FLAG_SPECIAL) + { + prefix = _T("0"); + if (precision > 0) precision--; + } goto case_unsigned; - /* Fall through */ case _T('p'): precision = 2 * sizeof(void*);

1 0

[tkreuzer] 50273: [CRT] Improve new printf implementation: - remove duplicated code and implement a generic function for all (v)s(w)(n)printf - don't call _flsbuf for string streams, while this wor...
by tkreuzer＠svn.reactos.org 03 Jan '11

03 Jan '11

Author: tkreuzer Date: Mon Jan 3 01:07:54 2011 New Revision: 50273 URL: http://svn.reactos.org/svn/reactos?rev=50273&view=rev Log: [CRT] Improve new printf implementation: - remove duplicated code and implement a generic function for all (v)s(w)(n)printf - don't call _flsbuf for string streams, while this works on windows, it doesn't work correctly on reactos (bug!) - Fix return error codes Added: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c (with props) Modified: trunk/reactos/lib/sdk/crt/printf/_snprintf.c trunk/reactos/lib/sdk/crt/printf/_snwprintf.c trunk/reactos/lib/sdk/crt/printf/_vsnprintf.c trunk/reactos/lib/sdk/crt/printf/_vsnwprintf.c trunk/reactos/lib/sdk/crt/printf/printf.c trunk/reactos/lib/sdk/crt/printf/sprintf.c trunk/reactos/lib/sdk/crt/printf/streamout.c trunk/reactos/lib/sdk/crt/printf/swprintf.c trunk/reactos/lib/sdk/crt/printf/vsprintf.c trunk/reactos/lib/sdk/crt/printf/vswprintf.c Modified: trunk/reactos/lib/sdk/crt/printf/_snprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_snprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_snprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_snprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,34 +6,7 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> -#include <tchar.h> +#define _sxprintf _snprintf +#define USE_COUNT 1 -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); - -int -_cdecl -_snprintf(char *buffer, size_t count, const char *format, ...) -{ - va_list argptr; - int result; - FILE stream; - - stream._base = buffer; - stream._ptr = stream._base; - stream._charbuf = 0; - stream._bufsiz = count; - stream._cnt = stream._bufsiz; - stream._flag = 0; - stream._tmpfname = 0; - - va_start(argptr, format); - result = streamout(&stream, format, argptr); - va_end(argptr); - - *stream._ptr = '\0'; - return result; -} - - +#include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/_snwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_snwpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_snwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_snwprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,37 +6,8 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> +#define _sxprintf _snwprintf +#define USE_COUNT 1 +#define _UNICODE -int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); - -int -__cdecl -_snwprintf( - wchar_t *buffer, - size_t count, - const wchar_t *format, - ...) -{ - va_list argptr; - int result; - FILE stream; - - stream._base = (char*)buffer; - stream._ptr = stream._base; - stream._bufsiz = count * sizeof(wchar_t); - stream._cnt = stream._bufsiz; - stream._flag = _IOSTRG | _IOWRT; - stream._tmpfname = 0; - stream._charbuf = 0; - - va_start(argptr, format); - result = wstreamout(&stream, format, argptr); - va_end(argptr); - - /* Only zero terminate if there is enough space left */ - if (stream._cnt >= sizeof(wchar_t)) *(wchar_t*)stream._ptr = L'\0'; - - return result; -} +#include "_sxprintf.c" Added: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_sxprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_sxprintf.c (added) +++ trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -1,0 +1,68 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/swprintf.c + * PURPOSE: Implementation of swprintf + * PROGRAMMER: Timo Kreuzer + */ + +#include <stdio.h> +#include <stdarg.h> +#include <limits.h> +#include <tchar.h> + +#ifdef _UNICODE +#define _tstreamout wstreamout +#else +#define _tstreamout streamout +#endif + +int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr); + +int +_cdecl +_sxprintf( + TCHAR *buffer, +#if USE_COUNT + size_t count, +#endif + const TCHAR *format, +#if USE_VARARGS + va_list argptr) +#else + ...) +#endif +{ +#if !USE_VARARGS + va_list argptr; +#endif + int result; + FILE stream; + + stream._base = (char*)buffer; + stream._ptr = stream._base; + stream._charbuf = 0; +#if USE_COUNT + stream._cnt = count * sizeof(TCHAR); +#else + stream._cnt = INT_MAX; +#endif + stream._bufsiz = 0; + stream._flag = _IOSTRG | _IOWRT; + stream._tmpfname = 0; + +#if !USE_VARARGS + va_start(argptr, format); +#endif + result = _tstreamout(&stream, format, argptr); +#if !USE_VARARGS + va_end(argptr); +#endif + + /* Only zero terminate if there is enough space left */ + if (stream._cnt >= sizeof(TCHAR)) *(TCHAR*)stream._ptr = _T('\0'); + + return result; +} + + Propchange: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/printf/_vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vsnpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vsnprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_vsnprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,32 +6,8 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> +#define _sxprintf _vsnprintf +#define USE_COUNT 1 +#define USE_VARARGS 1 -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); - -int -__cdecl -_vsnprintf( - char *buffer, - size_t count, - const char *format, - va_list argptr) -{ - int result; - FILE stream; - - stream._base = buffer; - stream._ptr = stream._base; - stream._bufsiz = count; - stream._cnt = stream._bufsiz; - stream._flag = _IOSTRG | _IOWRT; - stream._tmpfname = 0; - stream._charbuf = 0; - - result = streamout(&stream, format, argptr); - *stream._ptr = '\0'; - - return result; -} +#include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/_vsnwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vsnwpr… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_vsnwprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_vsnwprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,32 +6,9 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> +#define _sxprintf _vsnwprintf +#define USE_COUNT 1 +#define USE_VARARGS 1 +#define _UNICODE -int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); - -int -__cdecl -_vsnwprintf( - wchar_t *buffer, - size_t count, - const wchar_t *format, - va_list argptr) -{ - int result; - FILE stream; - - stream._base = (char*)buffer; - stream._ptr = stream._base; - stream._bufsiz = count * sizeof(wchar_t); - stream._cnt = stream._bufsiz; - stream._flag = _IOSTRG | _IOWRT; - stream._tmpfname = 0; - stream._charbuf = 0; - - result = wstreamout(&stream, format, argptr); - *(wchar_t*)stream._ptr = L'\0'; - - return result; -} +#include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/printf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/printf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/printf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/printf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -22,6 +22,7 @@ va_start(argptr, format); result = streamout(stdout, format, argptr); va_end(argptr); + return result; } Modified: trunk/reactos/lib/sdk/crt/printf/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/sprintf… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/sprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,33 +6,7 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> -#include <limits.h> +#define _sxprintf sprintf +#define USE_COUNT 0 -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); - -int -_cdecl -sprintf(char *buffer, const char *format, ...) -{ - va_list argptr; - int result; - FILE stream; - - stream._base = buffer; - stream._ptr = stream._base; - stream._charbuf = 0; - stream._bufsiz = INT_MAX; - stream._cnt = stream._bufsiz; - stream._flag = 0; - stream._tmpfname = 0; - - va_start(argptr, format); - result = streamout(&stream, format, argptr); - va_end(argptr); - - *stream._ptr = '\0'; - return result; -} - +#include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -199,10 +199,14 @@ int streamout_char(FILE *stream, int chr) { - /* Flush the buffer if neccessary */ + /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) { - return _flsbuf(chr, stream) != EOF; + /* Strings are done now */ + if (stream->_flag & _IOSTRG) return _TEOF; + + /* Flush buffer for files */ + return _flsbuf(chr, stream) != _TEOF; } *(TCHAR*)stream->_ptr = chr; @@ -587,7 +591,7 @@ if (prefix) { written = streamout_string(stream, prefix, prefixlen); - if (written == -1) return -3; + if (written == -1) return -1; written_all += written; } @@ -604,7 +608,7 @@ written = streamout_wstring(stream, (wchar_t*)string, len); else written = streamout_astring(stream, (char*)string, len); - if (written == -1) return -5; + if (written == -1) return -1; written_all += written; #if 0 && SUPPORT_FLOAT @@ -629,7 +633,7 @@ } - if (written == -1) return -8; + if (written == -1) return -1; return written_all; } Modified: trunk/reactos/lib/sdk/crt/printf/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/swprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/swprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,34 +6,8 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> -#include <limits.h> +#define _sxprintf swprintf +#define USE_COUNT 0 +#define _UNICODE -int _cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr); - -int -_cdecl -swprintf(wchar_t *buffer, const wchar_t *format, ...) -{ - va_list argptr; - int result; - FILE stream; - - stream._base = (char*)buffer; - stream._ptr = stream._base; - stream._charbuf = 0; - stream._bufsiz = INT_MAX; - stream._cnt = stream._bufsiz; - stream._flag = 0; - stream._tmpfname = 0; - - va_start(argptr, format); - result = wstreamout(&stream, format, argptr); - va_end(argptr); - - *(wchar_t*)stream._ptr = '\0'; - return result; -} - - +#include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/vsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vsprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vsprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vsprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,32 +6,8 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> -#include <limits.h> +#define _sxprintf vsprintf +#define USE_COUNT 0 +#define USE_VARARGS 1 -int _cdecl streamout(FILE *stream, const char *format, va_list argptr); - -int -__cdecl -vsprintf( - char *buffer, - const char *format, - va_list argptr) -{ - int result; - FILE stream; - - stream._base = buffer; - stream._ptr = stream._base; - stream._charbuf = 0; - stream._bufsiz = INT_MAX; - stream._cnt = stream._bufsiz; - stream._flag = _IOSTRG|_IOWRT|_IOMYBUF; - stream._tmpfname = 0; - - result = streamout(&stream, format, argptr); - *stream._ptr = '\0'; - - return result; -} +#include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/vswprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/vswprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/vswprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/vswprintf.c [iso-8859-1] Mon Jan 3 01:07:54 2011 @@ -6,13 +6,9 @@ * PROGRAMMER: Timo Kreuzer */ -#include <stdio.h> -#include <stdarg.h> -#include <limits.h> +#define _sxprintf vswprintf +#define USE_COUNT 0 +#define USE_VARARGS 1 +#define _UNICODE -int -__cdecl -vswprintf(wchar_t *buffer, const wchar_t *format, va_list argptr) -{ - return _vsnwprintf(buffer, INT_MAX, format, argptr); -} +#include "_sxprintf.c"

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