Ros-diffs December 2015

ros-diffs@reactos.org

12 participants
252 discussions

[tkreuzer] 70457: [GDITOOLS] Add a library with some helper routines for GDI tests

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 28 20:24:57 2015 New Revision: 70457 URL: http://svn.reactos.org/svn/reactos?rev=70457&view=rev Log: [GDITOOLS] Add a library with some helper routines for GDI tests Added: trunk/rostests/apitests/gditools/ trunk/rostests/apitests/gditools/CMakeLists.txt (with props) trunk/rostests/apitests/gditools/gditools.c (with props) trunk/rostests/apitests/gditools/gditools.h (with props) Added: trunk/rostests/apitests/gditools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/CMakeLi… ============================================================================== --- trunk/rostests/apitests/gditools/CMakeLists.txt (added) +++ trunk/rostests/apitests/gditools/CMakeLists.txt [iso-8859-1] Mon Dec 28 20:24:57 2015 @@ -0,0 +1,5 @@ + +include_directories(${REACTOS_SOURCE_DIR}/win32ss/include) + +add_library(gditools + gditools.c) Propchange: trunk/rostests/apitests/gditools/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gditools/gditools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/gditool… ============================================================================== --- trunk/rostests/apitests/gditools/gditools.c (added) +++ trunk/rostests/apitests/gditools/gditools.c [iso-8859-1] Mon Dec 28 20:24:57 2015 @@ -0,0 +1,82 @@ + + +/* SDK/DDK/NDK Headers. */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winddi.h> +#include <prntfont.h> + +#define NTOS_MODE_USER +#include <ndk/ntndk.h> + +/* Public Win32K Headers */ +#include <ntgdityp.h> +#include <ntgdi.h> +#include <ntgdihdl.h> + +PENTRY +GdiQueryTable( + VOID) +{ + PTEB pTeb = NtCurrentTeb(); + PPEB pPeb = pTeb->ProcessEnvironmentBlock; + return pPeb->GdiSharedHandleTable; +} + +BOOL +GdiIsHandleValid( + _In_ HGDIOBJ hobj) +{ + PENTRY pentHmgr = GdiQueryTable(); + USHORT Index = (ULONG_PTR)hobj & 0xFFFF; + PENTRY pentry = &pentHmgr[Index]; + + if ((pentry->einfo.pobj == NULL) || + ((LONG_PTR)pentry->einfo.pobj > 0) || + (pentry->FullUnique != (USHORT)((ULONG_PTR)hobj >> 16))) + { + return FALSE; + } + + return TRUE; +} + +BOOL +GdiIsHandleValidEx( + _In_ HGDIOBJ hobj, + _In_ GDILOOBJTYPE ObjectType) +{ + PENTRY pentHmgr = GdiQueryTable(); + USHORT Index = (ULONG_PTR)hobj & 0xFFFF; + PENTRY pentry = &pentHmgr[Index]; + + if ((pentry->einfo.pobj == NULL) || + ((LONG_PTR)pentry->einfo.pobj > 0) || + (pentry->FullUnique != (USHORT)((ULONG_PTR)hobj >> 16)) || + (pentry->Objt != (UCHAR)(ObjectType >> 16)) || + (pentry->Flags != (UCHAR)(ObjectType >> 24))) + { + return FALSE; + } + + return TRUE; +} + +PVOID +GdiGetHandleUserData( + _In_ HGDIOBJ hobj) +{ + PENTRY pentHmgr = GdiQueryTable(); + USHORT Index = (ULONG_PTR)hobj; + PENTRY pentry = &pentHmgr[Index]; + + if (!GdiIsHandleValid(hobj)) + { + return NULL; + } + + return pentry->pUser; +} + Propchange: trunk/rostests/apitests/gditools/gditools.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gditools/gditools.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gditools/gditool… ============================================================================== --- trunk/rostests/apitests/gditools/gditools.h (added) +++ trunk/rostests/apitests/gditools/gditools.h [iso-8859-1] Mon Dec 28 20:24:57 2015 @@ -0,0 +1,20 @@ + +#pragma once + +PENTRY +GdiQueryTable( + VOID); + +BOOL +GdiIsHandleValid( + _In_ HGDIOBJ hobj); + +BOOL +GdiIsHandleValidEx( + _In_ HGDIOBJ hobj, + _In_ GDILOOBJTYPE ObjectType); + +PVOID +GdiGetHandleUserData( + _In_ HGDIOBJ hobj); + Propchange: trunk/rostests/apitests/gditools/gditools.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 8 months

[tkreuzer] 70456: [CRT_APITEST] Fix sprintf tests to succeed on W2K3

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 28 15:49:29 2015 New Revision: 70456 URL: http://svn.reactos.org/svn/reactos?rev=70456&view=rev Log: [CRT_APITEST] Fix sprintf tests to succeed on W2K3 Modified: trunk/rostests/apitests/crt/sprintf.c Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Mon Dec 28 15:49:29 2015 @@ -85,20 +85,12 @@ StartSeh() Length = sprintf(NULL, ""); ok_int(Length, 0); -#if defined(TEST_CRTDLL) || defined(TEST_USER32) - EndSeh(STATUS_ACCESS_VIOLATION); -#else - EndSeh(STATUS_SUCCESS); -#endif + EndSeh(STATUS_ACCESS_VIOLATION); StartSeh() Length = sprintf(NULL, "Hello"); ok_int(Length, 5); -#if defined(TEST_CRTDLL) || defined(TEST_USER32) - EndSeh(STATUS_ACCESS_VIOLATION); -#else - EndSeh(STATUS_SUCCESS); -#endif + EndSeh(STATUS_ACCESS_VIOLATION); /* some basic formats */ Length = sprintf(Buffer, "abcde");

8 years, 8 months

[tkreuzer] 70455: [CRT_APITEST] Add tests for _snprintf, _snwprintf, strtoul, wcstoul Patch by Thomas Faber (slightly modified by me) CORE-6510

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 28 15:24:47 2015 New Revision: 70455 URL: http://svn.reactos.org/svn/reactos?rev=70455&view=rev Log: [CRT_APITEST] Add tests for _snprintf, _snwprintf, strtoul, wcstoul Patch by Thomas Faber (slightly modified by me) CORE-6510 Added: trunk/rostests/apitests/crt/_snprintf.c (with props) trunk/rostests/apitests/crt/_sntprintf.h (with props) trunk/rostests/apitests/crt/_snwprintf.c (with props) trunk/rostests/apitests/crt/strtoul.c (with props) trunk/rostests/apitests/crt/tcstoul.h (with props) trunk/rostests/apitests/crt/wcstoul.c (with props) Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake trunk/rostests/apitests/crt/testlist.c Added: trunk/rostests/apitests/crt/_snprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_snprintf.c?… ============================================================================== --- trunk/rostests/apitests/crt/_snprintf.c (added) +++ trunk/rostests/apitests/crt/_snprintf.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,2 @@ +#define func__sntprintf func__snprintf +#include "_sntprintf.h" Propchange: trunk/rostests/apitests/crt/_snprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/_sntprintf.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_sntprintf.h… ============================================================================== --- trunk/rostests/apitests/crt/_sntprintf.h (added) +++ trunk/rostests/apitests/crt/_sntprintf.h [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for _sntprintf + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <stdio.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +/* winetest_platform is "windows" for us, so broken() doesn't do what it should :( */ +#undef broken +#define broken(x) 0 + +START_TEST(_sntprintf) +{ + NTSTATUS ExceptionStatus; + _TCHAR Buffer[128]; + size_t BufferSize = sizeof(Buffer) / sizeof(Buffer[0]); + int Result; + + StartSeh() + Result = _sntprintf(NULL, 0, _T("Hello")); +#ifdef TEST_CRTDLL + ok_int(Result, -1); +#else + ok_int(Result, 5); +#endif + EndSeh(STATUS_SUCCESS); + + StartSeh() + Result = _sntprintf(NULL, 1, _T("Hello")); + ok(Result == 5 || + broken(Result == -1) /* Win7 */, "Result = %d\n", Result); +#if defined(_UNICODE) || defined(TEST_CRTDLL) + EndSeh(STATUS_ACCESS_VIOLATION); +#else + EndSeh(STATUS_SUCCESS); +#endif + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, BufferSize, _T("Hello")); + ok_int(Result, 5); + ok(Buffer[0] == _T('H'), "\n"); + ok(Buffer[1] == _T('e'), "\n"); + ok(Buffer[2] == _T('l'), "\n"); + ok(Buffer[3] == _T('l'), "\n"); + ok(Buffer[4] == _T('o'), "\n"); + ok(Buffer[5] == _T('\0'), "\n"); + ok(Buffer[6] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, 5, _T("Hello")); + ok_int(Result, 5); + ok(Buffer[0] == _T('H'), "\n"); + ok(Buffer[1] == _T('e'), "\n"); + ok(Buffer[2] == _T('l'), "\n"); + ok(Buffer[3] == _T('l'), "\n"); + ok(Buffer[4] == _T('o'), "\n"); + ok(Buffer[5] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, 1, _T("Hello")); + ok_int(Result, -1); + ok(Buffer[0] == _T('H'), "\n"); + ok(Buffer[1] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); + + StartSeh() + FillMemory(Buffer, sizeof(Buffer), 0x55); + Result = _sntprintf(Buffer, 0, _T("Hello")); + ok_int(Result, -1); + ok(Buffer[0] == (_TCHAR)0x5555, "\n"); + EndSeh(STATUS_SUCCESS); +} Propchange: trunk/rostests/apitests/crt/_sntprintf.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/_snwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_snwprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_snwprintf.c (added) +++ trunk/rostests/apitests/crt/_snwprintf.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,3 @@ +#define _UNICODE +#define func__sntprintf func__snwprintf +#include "_sntprintf.h" Propchange: trunk/rostests/apitests/crt/_snwprintf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/crtdll_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/crtdll_crt_apitest.cmake [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -264,9 +264,8 @@ # _setmode.c # _setsystime.c # _sleep.c -# _snprintf.c -# _snwprintf.c -# _sopen.c + _snprintf.c + _snwprintf.c# _sopen.c # _spawnl.c # _spawnle.c # _spawnlp.c @@ -477,7 +476,7 @@ # strtod.c # strtok.c # strtol.c -# strtoul.c + strtoul.c # strxfrm.c # swprintf.c # swscanf.c @@ -518,7 +517,7 @@ # wcstok.c # wcstol.c wcstombs.c -# wcstoul.c + wcstoul.c # wcsxfrm.c # wctomb.c # wprintf.c Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_a… ============================================================================== --- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -679,7 +679,7 @@ # _setmode.c # _setsystime.c # _sleep.c -# _snprintf.c + _snprintf.c # _snprintf_c # _snprintf_c_l # _snprintf_l @@ -689,7 +689,7 @@ # _snscanf_l # _snscanf_s # _snscanf_s_l -# _snwprintf.c + _snwprintf.c # _snwprintf_l # _snwprintf_s # _snwprintf_s_l @@ -1188,7 +1188,7 @@ # strtok.c # strtok_s.c # strtol.c -# strtoul.c + strtoul.c # strxfrm.c # swprintf.c # swprintf_s.c @@ -1252,7 +1252,7 @@ # wcstol.c wcstombs.c # wcstombs_s.c Not exported in 2k3 Sp1 -# wcstoul.c + wcstoul.c # wcsxfrm.c # wctob # wctomb.c Modified: trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/ntdll_crt_ap… ============================================================================== --- trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/ntdll_crt_apitest.cmake [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -19,8 +19,8 @@ # _ltow.c # _memccpy.c # _memicmp.c -# _snprintf.c -# _snwprintf.c + _snprintf.c + _snwprintf.c # _splitpath.c # _strcmpi == _stricmp # _stricmp.c @@ -97,7 +97,7 @@ # strspn.c # strstr.c # strtol.c -# strtoul.c + strtoul.c # swprintf.c # tan.c # tolower.c @@ -121,7 +121,7 @@ # wcstok.c # wcstol.c wcstombs.c -# wcstoul.c + wcstoul.c ) if(ARCH STREQUAL "i386") Added: trunk/rostests/apitests/crt/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strtoul.c?re… ============================================================================== --- trunk/rostests/apitests/crt/strtoul.c (added) +++ trunk/rostests/apitests/crt/strtoul.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,2 @@ +#define func_tcstoul func_strtoul +#include "tcstoul.h" Propchange: trunk/rostests/apitests/crt/strtoul.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/crt/tcstoul.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/tcstoul.h?re… ============================================================================== --- trunk/rostests/apitests/crt/tcstoul.h (added) +++ trunk/rostests/apitests/crt/tcstoul.h [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,102 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for _tcstoul + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <tchar.h> +#include <pseh/pseh2.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> + +#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { +#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus) + +#define ok_ulong(expression, result) \ + do { \ + unsigned long _value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%lu), got: %lu\n", \ + #expression, (unsigned long)(result), _value); \ + } while (0) + +START_TEST(tcstoul) +{ + NTSTATUS ExceptionStatus; + ULONG Result; + _TCHAR Dummy; + _TCHAR *End; + struct + { + const _TCHAR *Input; + int ExpectedLength0; + ULONG Expected0; + int ExpectedLength10; + ULONG Expected10; + } Tests[] = + { + { _T(""), 0, 0, 0, 0 }, + { _T(" "), 0, 0, 0, 0 }, + { _T(" 0"), 2, 0, 2, 0 }, + { _T("0 "), 1, 0, 1, 0 }, + { _T("0"), 1, 0, 1, 0 }, + { _T("1"), 1, 1, 1, 1 }, + { _T("10"), 2, 10, 2, 10 }, + { _T("01"), 2, 1, 2, 1 }, + { _T("010"), 3, 8, 3, 10 }, + { _T("08"), 1, 0, 2, 8 }, + { _T("008"), 2, 0, 3, 8 }, + { _T("-1"), 2, -1, 2, -1 }, + { _T("+1"), 2, 1, 2, 1 }, + { _T("--1"), 0, 0, 0, 0 }, + { _T("++1"), 0, 0, 0, 0 }, + { _T("0a"), 1, 0, 1, 0 }, + { _T("0x"), 0, 0, 1, 0 }, + { _T("0x0"), 3, 0, 1, 0 }, + { _T("0xFFFFFFFF"), 10, -1, 1, 0 }, + { _T("0xFFFFFFFFF"),11, -1, 1, 0 }, + { _T("4294967295"), 10, -1, 10, -1 }, + { _T("4294967296"), 10, -1, 10, -1 }, + { _T("4294967297"), 10, -1, 10, -1 }, + { _T("42949672951"),11, -1, 11, -1 }, + }; + const INT TestCount = sizeof(Tests) / sizeof(Tests[0]); + INT i; + + StartSeh() + Result = _tcstoul(NULL, NULL, 0); + EndSeh(STATUS_ACCESS_VIOLATION); + + StartSeh() + Result = _tcstoul(_T(""), NULL, 0); + ok_ulong(Result, 0); + EndSeh(STATUS_SUCCESS); + + StartSeh() + Result = _tcstoul(_T("1"), NULL, 0); + ok_ulong(Result, 1); + EndSeh(STATUS_SUCCESS); + + Result = _tcstoul(_T("1"), &End, 0); + ok_ulong(Result, 1); + + for (i = 0; i < TestCount; i++) + { +#ifdef _UNICODE + trace("%d: '%ls'\n", i, Tests[i].Input); +#else + trace("%d: '%s'\n", i, Tests[i].Input); +#endif + End = &Dummy; + Result = _tcstoul(Tests[i].Input, &End, 0); + ok_ulong(Result, Tests[i].Expected0); + ok_ptr(End, Tests[i].Input + Tests[i].ExpectedLength0); + + End = &Dummy; + Result = _tcstoul(Tests[i].Input, &End, 10); + ok_ulong(Result, Tests[i].Expected10); + ok_ptr(End, Tests[i].Input + Tests[i].ExpectedLength10); + } +} Propchange: trunk/rostests/apitests/crt/tcstoul.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/crt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/crt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/testlist.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -10,13 +10,21 @@ #if defined(TEST_NTDLL) extern void func__vscwprintf(void); #endif +extern void func_fputc(void); +extern void func_fputwc(void); +extern void func__snprintf(void); +extern void func__snwprintf(void); extern void func__vsnprintf(void); extern void func__vsnwprintf(void); extern void func_mbstowcs(void); extern void func_sprintf(void); extern void func_strcpy(void); extern void func_strlen(void); +extern void func_strnlen(void); +extern void func_strtoul(void); +extern void func_wcsnlen(void); extern void func_wcstombs(void); +extern void func_wcstoul(void); extern void func_static_construct(void); extern void func_static_init(void); @@ -26,9 +34,13 @@ { "_vsnprintf", func__vsnprintf }, { "_vsnwprintf", func__vsnwprintf }, { "mbstowcs", func_mbstowcs }, + { "_snprintf", func__snprintf }, + { "_snwprintf", func__snwprintf }, { "sprintf", func_sprintf }, { "strcpy", func_strcpy }, { "strlen", func_strlen }, + { "strtoul", func_strtoul }, + { "wcstoul", func_wcstoul }, { "wcstombs", func_wcstombs }, #if defined(TEST_CRTDLL) || defined(TEST_MSVCRT) || defined(TEST_STATIC_CRT) // ... Added: trunk/rostests/apitests/crt/wcstoul.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/wcstoul.c?re… ============================================================================== --- trunk/rostests/apitests/crt/wcstoul.c (added) +++ trunk/rostests/apitests/crt/wcstoul.c [iso-8859-1] Mon Dec 28 15:24:47 2015 @@ -0,0 +1,3 @@ +#define _UNICODE +#define func_tcstoul func_wcstoul +#include "tcstoul.h" Propchange: trunk/rostests/apitests/crt/wcstoul.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 8 months

[tkreuzer] 70454: [SPEC2DEF] Don't use DATA and PRIVATE together. DATA means no stub function is generated in the import lib, PRIVATE means nothing is generated in the export lib.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 28 14:42:41 2015 New Revision: 70454 URL: http://svn.reactos.org/svn/reactos?rev=70454&view=rev Log: [SPEC2DEF] Don't use DATA and PRIVATE together. DATA means no stub function is generated in the import lib, PRIVATE means nothing is generated in the export lib. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Mon Dec 28 14:42:41 2015 @@ -688,12 +688,12 @@ fprintf(fileDest, " NONAME"); } + /* Either PRIVATE or DATA */ if (pexp->uFlags & FL_PRIVATE) { fprintf(fileDest, " PRIVATE"); } - - if (pexp->nCallingConvention == CC_EXTERN) + else if (pexp->nCallingConvention == CC_EXTERN) { fprintf(fileDest, " DATA"); }

8 years, 8 months

[tkreuzer] 70453: [CRT_APITEST] - Disable a check for crtdll - Fix an MSVC warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 28 11:01:03 2015 New Revision: 70453 URL: http://svn.reactos.org/svn/reactos?rev=70453&view=rev Log: [CRT_APITEST] - Disable a check for crtdll - Fix an MSVC warning Modified: trunk/rostests/apitests/crt/sprintf.c trunk/rostests/apitests/crt/strlen.c Modified: trunk/rostests/apitests/crt/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re… ============================================================================== --- trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/sprintf.c [iso-8859-1] Mon Dec 28 11:01:03 2015 @@ -14,7 +14,9 @@ #include <ndk/mmfuncs.h> #include <ndk/rtlfuncs.h> -#ifdef __GNUC__ +#ifdef _MSC_VER +#pragma warning(disable:4778) // unterminated format string '%' +#else #pragma GCC diagnostic ignored "-Wformat" #pragma GCC diagnostic ignored "-Wformat-zero-length" #pragma GCC diagnostic ignored "-Wnonnull" @@ -177,7 +179,7 @@ Length = sprintf(Buffer, "%.4s", "hello"); ok_str(Buffer, "hell"); ok_int(Length, 4); - + StartSeh() Length = sprintf(Buffer, "%.*s", -1, "hello"); #ifdef TEST_USER32 Modified: trunk/rostests/apitests/crt/strlen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strlen.c?rev… ============================================================================== --- trunk/rostests/apitests/crt/strlen.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/strlen.c [iso-8859-1] Mon Dec 28 11:01:03 2015 @@ -52,11 +52,14 @@ ok((eflags & EFLAGS_DF) != 0, "Direction flag in ELFAGS was changed."); /* Only test this for the exported versions, intrinsics might do it - differently. It's up to us to not do fishy stuff! */ + differently. It's up to us to not do fishy stuff! Also crtdll does + not do it like this. */ +#ifndef TEST_CRTDLL if (pstrlen == strlen) { ok(len == 8, "Should not have gone backwards (got len %i)", (int)len); } +#endif // TEST_CRTDLL #endif }

8 years, 8 months

[akhaldi] 70452: [0.4.0] * Merge the streamout NULL buffer handling fix by Timo in r70443.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 28 10:16:01 2015 New Revision: 70452 URL: http://svn.reactos.org/svn/reactos?rev=70452&view=rev Log: [0.4.0] * Merge the streamout NULL buffer handling fix by Timo in r70443. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 28 10:16:01 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 28 10:16:01 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 Modified: branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/sd… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Dec 28 10:16:01 2015 @@ -227,11 +227,10 @@ int streamout_char(FILE *stream, int chr) { -#ifdef _LIBCNT_ - if ((stream->_flag & _IOSTRG) && (!stream->_ptr)) +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) return 1; -#endif - +#endif #if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) @@ -254,6 +253,11 @@ TCHAR chr; int written = 0; +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif + while (count--) { #ifdef _UNICODE @@ -276,6 +280,11 @@ { wchar_t chr; int written = 0; + +#if defined(_UNICODE) && !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif while (count--) {

8 years, 8 months

[hbelusca] 70451: [BOOTDATA]: ReactOS can install and run fine on volumes of at least 450 MB (for example, on a volume of 450 MB and after creation of the pagefile, it leaves you 60+ MB of free spa...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 22:41:48 2015 New Revision: 70451 URL: http://svn.reactos.org/svn/reactos?rev=70451&view=rev Log: [BOOTDATA]: ReactOS can install and run fine on volumes of at least 450 MB (for example, on a volume of 450 MB and after creation of the pagefile, it leaves you 60+ MB of free space, which should be enough for you if you're already happy using HDDs of such small sizes ^^). Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Dec 27 22:41:48 2015 @@ -16,7 +16,7 @@ [DiskSpaceRequirements] ; Required free system partition disk space in MB -FreeSysPartDiskSpace=550 +FreeSysPartDiskSpace=450 [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4

8 years, 8 months

[tkreuzer] 70450: [CRT] Fix a typo in a comment and make it clearer, what we do here. CORE-10754 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 27 20:24:04 2015 New Revision: 70450 URL: http://svn.reactos.org/svn/reactos?rev=70450&view=rev Log: [CRT] Fix a typo in a comment and make it clearer, what we do here. CORE-10754 #resolve Modified: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc Modified: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] Sun Dec 27 20:24:04 2015 @@ -29,9 +29,11 @@ /* Now compare the characters until a 0 is found */ repne _tscas - /* Calculate the count (eax = -ecx - 1) */ + /* Calculate the count. For n characters, we do (n + 1) comparisons. Initial + value of ecx was -1, so end value of ecx is (-1 - (n + 1)) = -(n + 2). + => n = -ecx - 2 = ~ecx - 1 */ not ecx - lea eax, [ecx-1] + lea eax, [ecx - 1] /* Restore eflags/edi and return the result */ popfd

8 years, 8 months

[hbelusca] 70449: [VFATLIB] Now, the fix: the FAT disk checker expected that the free cluster count member of the FAT32 FSInfo sector be really initialized (not to 0xFFFFFFFF), and it expected the ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 20:01:24 2015 New Revision: 70449 URL: http://svn.reactos.org/svn/reactos?rev=70449&view=rev Log: [VFATLIB] Now, the fix: the FAT disk checker expected that the free cluster count member of the FAT32 FSInfo sector be really initialized (not to 0xFFFFFFFF), and it expected the presence of the backup of the FSInfo sector as well as the free sector following the FSInfo sector. Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sun Dec 27 20:01:24 2015 @@ -103,6 +103,7 @@ NTSTATUS Status; PFAT32_FSINFO FsInfo; LARGE_INTEGER FileOffset; + ULONGLONG FirstDataSector; /* Allocate buffer for new sector */ FsInfo = (PFAT32_FSINFO)RtlAllocateHeap(RtlGetProcessHeap(), @@ -111,16 +112,19 @@ if (FsInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; - /* Zero the new sector */ + /* Zero the first FsInfo sector */ RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + + FirstDataSector = BootSector->ReservedSectors + + (BootSector->FATCount * BootSector->FATSectors32) + 0 /* RootDirSectors */; FsInfo->LeadSig = FSINFO_SECTOR_BEGIN_SIGNATURE; FsInfo->StrucSig = FSINFO_SIGNATURE; - FsInfo->FreeCount = 0xffffffff; + FsInfo->FreeCount = (BootSector->SectorsHuge - FirstDataSector) / BootSector->SectorsPerCluster - 1; FsInfo->NextFree = 0xffffffff; FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; - /* Write sector */ + /* Write the first FsInfo sector */ FileOffset.QuadPart = BootSector->FSInfoSector * BootSector->BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -138,6 +142,76 @@ } UpdateProgress(Context, 1); + + /* Write backup of the first FsInfo sector */ + if (BootSector->BootBackup != 0x0000) + { + /* Reset the free cluster count for the backup */ + FsInfo->FreeCount = 0xffffffff; + + FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup + (ULONG)BootSector->FSInfoSector) * BootSector->BytesPerSector); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + } + + /* Zero the second FsInfo sector */ + RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; + + /* Write the second FsInfo sector */ + FileOffset.QuadPart = (BootSector->FSInfoSector + 1) * BootSector->BytesPerSector; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + + /* Write backup of the second FsInfo sector */ + if (BootSector->BootBackup != 0x0000) + { + FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup + (ULONG)BootSector->FSInfoSector + 1) * BootSector->BytesPerSector); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + } done: /* Free the buffer */

8 years, 8 months

[hbelusca] 70448: Remove a forgotten DPRINT1.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 27 19:57:10 2015 New Revision: 70448 URL: http://svn.reactos.org/svn/reactos?rev=70448&view=rev Log: Remove a forgotten DPRINT1. Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 19:57:10 2015 @@ -404,8 +404,6 @@ if (fs_changed()) { - DPRINT1("fs_changed is TRUE!\n"); - if (FixErrors) { if (FsCheckFlags & FSCHECK_INTERACTIVE)

8 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2015