Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67721: [CRT] Make sure to get no errors, when implementing functions that exist as intrinsics.
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 20:20:59 2015 New Revision: 67721 URL: http://svn.reactos.org/svn/reactos?rev=67721&view=rev Log: [CRT] Make sure to get no errors, when implementing functions that exist as intrinsics. Modified: trunk/reactos/lib/sdk/crt/float/isnan.c trunk/reactos/lib/sdk/crt/math/cos.c trunk/reactos/lib/sdk/crt/math/cosf.c trunk/reactos/lib/sdk/crt/math/logf.c trunk/reactos/lib/sdk/crt/math/powf.c trunk/reactos/lib/sdk/crt/math/sin.c trunk/reactos/lib/sdk/crt/math/sinf.c trunk/reactos/lib/sdk/crt/mem/memchr.c trunk/reactos/lib/sdk/crt/mem/memcpy.c trunk/reactos/lib/sdk/crt/mem/memset.c trunk/reactos/lib/sdk/crt/string/tcscat.h trunk/reactos/lib/sdk/crt/string/tcscmp.h trunk/reactos/lib/sdk/crt/string/tcscpy.h trunk/reactos/lib/sdk/crt/string/tcslen.h trunk/reactos/lib/sdk/crt/string/tcsncmp.h trunk/reactos/lib/sdk/crt/string/tcsncpy.h Modified: trunk/reactos/lib/sdk/crt/float/isnan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/isnan.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -18,6 +18,10 @@ */ #include <precomp.h> + +#if defined(_MSC_VER) && defined(_M_ARM) +#pragma function(_isnan) +#endif /* _MSC_VER */ /* * @implemented Modified: trunk/reactos/lib/sdk/crt/math/cos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cos.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cos.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -5,6 +5,11 @@ * PURPOSE: Generic C Implementation of cos * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ + +#ifdef _MSC_VER +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(cos) +#endif /* _MSC_VER */ #define PRECISION 9 #define M_PI 3.141592653589793238462643 Modified: trunk/reactos/lib/sdk/crt/math/cosf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/cosf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/cosf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/cosf.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -7,7 +7,12 @@ #include <math.h> #undef cosf -float cosf(float _X) +#if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(cosf) +#endif /* _MSC_VER */ + +float cosf(float x) { - return ((float)cos((double)_X)); + return ((float)cos((double)x)); } Modified: trunk/reactos/lib/sdk/crt/math/logf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/logf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/logf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/logf.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -7,7 +7,12 @@ #include <math.h> #undef logf -float logf(float _X) +#if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(logf) +#endif /* _MSC_VER */ + +float logf(float x) { - return ((float)log((double)_X)); + return ((float)log((double)x)); } Modified: trunk/reactos/lib/sdk/crt/math/powf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/powf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/powf.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -3,6 +3,11 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ + +#if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(powf) +#endif /* _MSC_VER */ double __cdecl pow(double x, double y); Modified: trunk/reactos/lib/sdk/crt/math/sin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sin.c?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sin.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -5,6 +5,11 @@ * PURPOSE: Generic C Implementation of sin * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ + +#ifdef _MSC_VER +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(sin) +#endif /* _MSC_VER */ #define PRECISION 9 #define M_PI 3.141592653589793238462643 Modified: trunk/reactos/lib/sdk/crt/math/sinf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sinf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sinf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sinf.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -7,7 +7,12 @@ #include <math.h> #undef sinf -float sinf(float _X) +#if defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_AMD64)) +#pragma warning(suppress:4164) /* intrinsic not declared */ +#pragma function(sinf) +#endif /* _MSC_VER */ + +float sinf(float x) { - return ((float) sin ((double) _X)); + return ((float)sin((double)x)); } Modified: trunk/reactos/lib/sdk/crt/mem/memchr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memchr.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memchr.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memchr.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,5 +1,9 @@ #include <string.h> + +#if defined(_MSC_VER) && defined(_M_ARM) +#pragma function(memchr) +#endif /* _MSC_VER */ void* memchr(const void *s, int c, size_t n) { Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcpy.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memcpy.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,4 +1,8 @@ #include <string.h> + +#ifdef _MSC_VER +#pragma function(memcpy) +#endif /* _MSC_VER */ /* NOTE: This code is a duplicate of memmove implementation! */ void* memcpy(void* dest, const void* src, size_t count) Modified: trunk/reactos/lib/sdk/crt/mem/memset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memset.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/mem/memset.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mem/memset.c [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,5 +1,9 @@ #include <string.h> + +#ifdef _MSC_VER +#pragma function(memset) +#endif /* _MSC_VER */ void* memset(void* src, int val, size_t count) { Modified: trunk/reactos/lib/sdk/crt/string/tcscat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcscat.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcscat.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcscat.h [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,5 +1,9 @@ #include <tchar.h> + +#ifdef _MSC_VER +#pragma function(_tcscat) +#endif /* _MSC_VER */ _TCHAR * _tcscat(_TCHAR * s, const _TCHAR * append) { Modified: trunk/reactos/lib/sdk/crt/string/tcscmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcscmp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcscmp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcscmp.h [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,5 +1,9 @@ #include <tchar.h> + +#if defined(_MSC_VER) +#pragma function(_tcscmp) +#endif /* _MSC_VER */ int _tcscmp(const _TCHAR* s1, const _TCHAR* s2) { Modified: trunk/reactos/lib/sdk/crt/string/tcscpy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcscpy.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcscpy.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcscpy.h [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,5 +1,9 @@ #include <tchar.h> + +#ifdef _MSC_VER +#pragma function(_tcscpy) +#endif /* _MSC_VER */ _TCHAR * _tcscpy(_TCHAR * to, const _TCHAR * from) { Modified: trunk/reactos/lib/sdk/crt/string/tcslen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcslen.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcslen.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcslen.h [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,6 +1,10 @@ #include <stddef.h> #include <tchar.h> + +#ifdef _MSC_VER +#pragma function(_tcslen) +#endif /* _MSC_VER */ size_t _tcslen(const _TCHAR * str) { Modified: trunk/reactos/lib/sdk/crt/string/tcsncmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsncmp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcsncmp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcsncmp.h [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,6 +1,10 @@ #include <stddef.h> #include <tchar.h> + +#if defined(_MSC_VER) && defined(_M_ARM) +#pragma function(_tcsncmp) +#endif /* _MSC_VER */ int _tcsncmp(const _TCHAR * s1, const _TCHAR * s2, size_t n) { Modified: trunk/reactos/lib/sdk/crt/string/tcsncpy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/tcsncpy… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/tcsncpy.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/tcsncpy.h [iso-8859-1] Thu May 14 20:20:59 2015 @@ -1,6 +1,10 @@ #include <stddef.h> #include <tchar.h> + +#if defined(_MSC_VER) && defined(_M_ARM) +#pragma function(_tcsncpy) +#endif /* _MSC_VER */ _TCHAR * _tcsncpy(_TCHAR * dst, const _TCHAR * src, size_t n) {

1 0

[tkreuzer] 67720: [CRT/CPPRT] Add some files for non-x86 to build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 20:20:31 2015 New Revision: 67720 URL: http://svn.reactos.org/svn/reactos?rev=67720&view=rev Log: [CRT/CPPRT] Add some files for non-x86 to build Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Thu May 14 20:20:31 2015 @@ -15,6 +15,8 @@ list(APPEND SOURCE i386/framehandler.c) elseif(ARCH STREQUAL "amd64") add_asm_files(cpprt_asm amd64/cpprt.s) +elseif(ARCH STREQUAL "arm") + add_asm_files(cpprt_asm arm/cpprt.s) endif() add_library(cpprt ${SOURCE} ${cpprt_asm}) Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu May 14 20:20:31 2015 @@ -445,23 +445,23 @@ float/amd64/fpreset.S float/amd64/logb.S # math/amd64/acos.S - math/amd64/acosf.S + # math/amd64/acosf.S math/amd64/atan.S math/amd64/atan2.S math/amd64/ceil.S - math/amd64/ceilf.S + # math/amd64/ceilf.S math/amd64/exp.S math/amd64/fabs.S math/amd64/floor.S - math/amd64/floorf.S + # math/amd64/floorf.S math/amd64/fmod.S - math/amd64/fmodf.S + # math/amd64/fmodf.S math/amd64/ldexp.S math/amd64/log.S math/amd64/log10.S math/amd64/pow.S math/amd64/sqrt.S - math/amd64/sqrtf.S + # math/amd64/sqrtf.S math/amd64/tan.S setjmp/amd64/setjmp.s) @@ -511,6 +511,8 @@ math/arm/__dtou64.s math/arm/__i64tod.s math/arm/__i64tos.s + math/arm/__stoi64.s + math/arm/__stou64.s math/arm/__u64tod.s math/arm/__u64tos.s math/arm/__rt_sdiv64.s @@ -526,8 +528,26 @@ if(NOT ARCH STREQUAL "i386") list(APPEND CRT_SOURCE + math/_chgsignf.c + math/_copysignf.c + math/_hypotf.c + math/acosf.c + math/asinf.c + math/atan2f.c + math/atanf.c + math/ceilf.c math/cos.c + math/coshf.c + math/expf.c + math/floorf.c + math/fmodf.c + math/log10f.c + math/modff.c math/sin.c + math/sinhf.c + math/sqrtf.c + math/tanf.c + math/tanhf.c math/stubs.c mem/memchr.c mem/memcpy.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Thu May 14 20:20:31 2015 @@ -171,6 +171,8 @@ math/arm/__dtou64.s math/arm/__i64tod.s math/arm/__i64tos.s + math/arm/__stoi64.s + math/arm/__stou64.s math/arm/__u64tod.s math/arm/__u64tos.s math/arm/__rt_sdiv64.s Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Thu May 14 20:20:31 2015 @@ -77,6 +77,8 @@ math/arm/__dtou64.s math/arm/__i64tod.s math/arm/__i64tos.s + math/arm/__stoi64.s + math/arm/__stou64.s math/arm/__u64tod.s math/arm/__u64tos.s math/arm/__rt_sdiv64.s

1 0

[tkreuzer] 67719: [CRT] Fix build
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 19:51:12 2015 New Revision: 67719 URL: http://svn.reactos.org/svn/reactos?rev=67719&view=rev Log: [CRT] Fix build Modified: trunk/reactos/lib/sdk/crt/crt.cmake Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu May 14 19:51:12 2015 @@ -56,7 +56,6 @@ math/modf.c math/powf.c math/rand.c - math/sqrtf.c math/s_modf.c math/sinf.c math/sinh.c

1 0

[tkreuzer] 67718: [CRT] Add simple C implementations for acosf, ceilf, floorf, fmodf and fix sqrtf
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 19:44:50 2015 New Revision: 67718 URL: http://svn.reactos.org/svn/reactos?rev=67718&view=rev Log: [CRT] Add simple C implementations for acosf, ceilf, floorf, fmodf and fix sqrtf Added: trunk/reactos/lib/sdk/crt/math/acosf.c (with props) trunk/reactos/lib/sdk/crt/math/ceilf.c (with props) trunk/reactos/lib/sdk/crt/math/floorf.c (with props) trunk/reactos/lib/sdk/crt/math/fmodf.c (with props) Modified: trunk/reactos/lib/sdk/crt/math/sqrtf.c Added: trunk/reactos/lib/sdk/crt/math/acosf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/acosf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/acosf.c (added) +++ trunk/reactos/lib/sdk/crt/math/acosf.c [iso-8859-1] Thu May 14 19:44:50 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +acosf( + _In_ float x) +{ + return (float)acos((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/acosf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/ceilf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/ceilf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/ceilf.c (added) +++ trunk/reactos/lib/sdk/crt/math/ceilf.c [iso-8859-1] Thu May 14 19:44:50 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +ceilf( + _In_ float x) +{ + return (float)ceilf((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/ceilf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/floorf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/floorf.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/floorf.c (added) +++ trunk/reactos/lib/sdk/crt/math/floorf.c [iso-8859-1] Thu May 14 19:44:50 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +floorf( + _In_ float x) +{ + return (float)floorf((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/floorf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/fmodf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/fmodf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/fmodf.c (added) +++ trunk/reactos/lib/sdk/crt/math/fmodf.c [iso-8859-1] Thu May 14 19:44:50 2015 @@ -0,0 +1,12 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +fmodf( + _In_ float x, + _In_ float y) +{ + return (float)fmod((double)x,(double)y); +} Propchange: trunk/reactos/lib/sdk/crt/math/fmodf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/sqrtf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sqrtf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sqrtf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/sqrtf.c [iso-8859-1] Thu May 14 19:44:50 2015 @@ -5,8 +5,10 @@ */ #include <math.h> +_Check_return_ float -_sqrtf(float x) +__cdecl +sqrtf(float x) { - return ((float)sqrt((double)x)); + return (float)sqrt((double)x); }

1 0

[tkreuzer] 67717: [CRT] Add simple C implementations for _chgsignf, _copysignf, _hypotf, asinf, atan2f, atanf, coshf, expf, log10f, modff, sinhf, tanf, tanhf
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 19:06:00 2015 New Revision: 67717 URL: http://svn.reactos.org/svn/reactos?rev=67717&view=rev Log: [CRT] Add simple C implementations for _chgsignf, _copysignf, _hypotf, asinf, atan2f, atanf, coshf, expf, log10f, modff, sinhf, tanf, tanhf Added: trunk/reactos/lib/sdk/crt/math/_chgsignf.c (with props) trunk/reactos/lib/sdk/crt/math/_copysignf.c (with props) trunk/reactos/lib/sdk/crt/math/_hypotf.c (with props) trunk/reactos/lib/sdk/crt/math/asinf.c (with props) trunk/reactos/lib/sdk/crt/math/atan2f.c (with props) trunk/reactos/lib/sdk/crt/math/atanf.c (with props) trunk/reactos/lib/sdk/crt/math/coshf.c (with props) trunk/reactos/lib/sdk/crt/math/expf.c (with props) trunk/reactos/lib/sdk/crt/math/log10f.c (with props) trunk/reactos/lib/sdk/crt/math/modff.c (with props) trunk/reactos/lib/sdk/crt/math/sinhf.c (with props) trunk/reactos/lib/sdk/crt/math/tanf.c (with props) trunk/reactos/lib/sdk/crt/math/tanhf.c (with props) Added: trunk/reactos/lib/sdk/crt/math/_chgsignf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/_chgsignf… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/_chgsignf.c (added) +++ trunk/reactos/lib/sdk/crt/math/_chgsignf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,10 @@ + +#include <math.h> + +_Check_return_ +float +_chgsignf(_In_ float x) +{ + return (float)_chgsign((double)x); +} + Propchange: trunk/reactos/lib/sdk/crt/math/_chgsignf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/_copysignf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/_copysign… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/_copysignf.c (added) +++ trunk/reactos/lib/sdk/crt/math/_copysignf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,12 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +_copysignf( + _In_ float x, + _In_ float y) +{ + return (float)_copysign((double)x, (double)y); +} Propchange: trunk/reactos/lib/sdk/crt/math/_copysignf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/_hypotf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/_hypotf.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/_hypotf.c (added) +++ trunk/reactos/lib/sdk/crt/math/_hypotf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,12 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +_hypotf( + _In_ float x, + _In_ float y) +{ + return (float)_hypot((double)x, (double)y); +} Propchange: trunk/reactos/lib/sdk/crt/math/_hypotf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/asinf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/asinf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/asinf.c (added) +++ trunk/reactos/lib/sdk/crt/math/asinf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +asinf( + _In_ float x) +{ + return (float)asin((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/asinf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/atan2f.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/atan2f.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/atan2f.c (added) +++ trunk/reactos/lib/sdk/crt/math/atan2f.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,12 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +atan2f( + _In_ float x, + _In_ float y) +{ + return (float)atan2((double)x,(double)y); +} Propchange: trunk/reactos/lib/sdk/crt/math/atan2f.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/atanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/atanf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/atanf.c (added) +++ trunk/reactos/lib/sdk/crt/math/atanf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +atanf( + _In_ float x) +{ + return (float)atan((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/atanf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/coshf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/coshf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/coshf.c (added) +++ trunk/reactos/lib/sdk/crt/math/coshf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +coshf( + _In_ float x) +{ + return (float)cosh((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/coshf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/expf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/expf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/expf.c (added) +++ trunk/reactos/lib/sdk/crt/math/expf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +expf( + _In_ float x) +{ + return (float)exp((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/expf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/log10f.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/log10f.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/log10f.c (added) +++ trunk/reactos/lib/sdk/crt/math/log10f.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +log10f( + _In_ float x) +{ + return (float)log10((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/log10f.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/modff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/modff.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/modff.c (added) +++ trunk/reactos/lib/sdk/crt/math/modff.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,17 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +modff( + _In_ float x, + _Out_ float *y) +{ + double _Di, _Df; + + _Df = modf((double)x,&_Di); + *y = (float)_Di; + + return (float)_Df; +} Propchange: trunk/reactos/lib/sdk/crt/math/modff.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/sinhf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/sinhf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/sinhf.c (added) +++ trunk/reactos/lib/sdk/crt/math/sinhf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +sinhf( + _In_ float x) +{ + return (float)sinh((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/sinhf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/tanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/tanf.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/tanf.c (added) +++ trunk/reactos/lib/sdk/crt/math/tanf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +tanf( + _In_ float x) +{ + return (float)tan((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/tanf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/tanhf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/tanhf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/tanhf.c (added) +++ trunk/reactos/lib/sdk/crt/math/tanhf.c [iso-8859-1] Thu May 14 19:06:00 2015 @@ -0,0 +1,11 @@ + +#include <math.h> + +_Check_return_ +float +__cdecl +tanhf( + _In_ float x) +{ + return (float)tanh((double)x); +} Propchange: trunk/reactos/lib/sdk/crt/math/tanhf.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 67716: [NTOSKRNL] Rewrite KiSwapContext for ARM
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 14:50:19 2015 New Revision: 67716 URL: http://svn.reactos.org/svn/reactos?rev=67716&view=rev Log: [NTOSKRNL] Rewrite KiSwapContext for ARM Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s Modified: trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/ctxswtch.s [iso-8859-1] Thu May 14 14:50:19 2015 @@ -3,124 +3,144 @@ * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: ntoskrnl/ke/arm/ctxswtch.s * PURPOSE: Context Switch and Idle Thread on ARM - * PROGRAMMERS: ReactOS Portable Systems Group + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * ReactOS Portable Systems Group */ - .title "ARM Context Switching" - .include "ntoskrnl/include/internal/arm/kxarm.h" - .include "ntoskrnl/include/internal/arm/ksarm.h" +#include <ksarm.h> + + IMPORT KeLowerIrql TEXTAREA + +/*! + * \name KiSwapContextInternal + * + * \brief + * The KiSwapContextInternal routine switches context to another thread. + * + * \param r0 + * Pointer to the KTHREAD to which the caller wishes to switch to. + * + * \param r1 + * Pointer to the KTHREAD to which the caller wishes to switch from. + * + * \param r2 + * APC bypass + * + * \return + * None. + * + * \remarks + * ... + * + *--*/ + NESTED_ENTRY KiSwapContextInternal + + /* Push a KSWITCH_FRAME on the stack */ + stmdb sp!,{r2,r3,r11,lr} // FIXME: what is the 2nd field? + // PROLOG_PUSH {r2,r3,r11,lr} + + PROLOG_END KiSwapContextInternal + + /* Save kernel stack of old thread */ + str sp, [r1, #ThKernelStack] + + /* Save new thread in R11 */ + mov r11, r0 + + //bl KiSwapContextSuspend + __debugbreak + + /* Load stack of new thread */ + ldr sp, [r11, #ThKernelStack] + + /* Reload APC bypass */ + ldr r2, [sp, #SwApcBypass] + + //bl KiSwapContextResume + __debugbreak + + /* Restore R2, R11 and return */ + ldmia sp!,{r2,r3,r11,pc} + + NESTED_END KiSwapContextInternal + + +/*! + * KiSwapContext + * + * \brief + * The KiSwapContext routine switches context to another thread. + * + * BOOLEAN + * KiSwapContext( + * _In_ KIRQL WaitIrql, + * _Inout_ PKTHREAD CurrentThread); + * + * \param WaitIrql <r0> + * ... + * + * \param CurrentThread <r1> + * Pointer to the KTHREAD of the current thread. + * + * \return + * The WaitStatus of the Target Thread. + * + * \remarks + * This is a wrapper around KiSwapContextInternal which will save all the + * non-volatile registers so that the Internal function can use all of + * them. It will also save the old current thread and set the new one. + * + * The calling thread does not return after KiSwapContextInternal until + * another thread switches to it. + * + *--*/ NESTED_ENTRY KiSwapContext + + /* Push non-volatiles and return address on the stack */ + stmdb sp!,{r4,r5,r6,r7,r8,r9,r10,r11,lr} + // PROLOG_PUSH {r4,r5,r6,r7,r8,r9,r10,r11,lr} + PROLOG_END KiSwapContext - // BUSTEDDDD - b . - - // - // a1 = Old Thread - // a2 = New Thread - // - - // - // Make space for the trap frame - // - sub sp, sp, #ExceptionFrameLength - - // - // Build exception frame - // FIXME-PERF: Change to stmdb later - // - str r4, [sp, #ExR4] - str r5, [sp, #ExR5] - str r6, [sp, #ExR6] - str r7, [sp, #ExR7] - str r8, [sp, #ExR8] - str r9, [sp, #ExR9] - str r10, [sp, #ExR10] - str r11, [sp, #ExR11] - str lr, [sp, #ExLr] - mrs r4, spsr_all - str r4, [sp, #ExSpsr] - - // - // Switch stacks - // - str sp, [a1, #ThKernelStack] - ldr sp, [a2, #ThKernelStack] - - // - // Call the C context switch code - // + /* Do the swap with the registers correctly setup */ + mov32 r0, 0xFFDFF000 // FIXME: properly load the PCR into r0 (PCR should be in CP15, c3, TPIDRPRW) + ldr r0, [r0, #PcCurrentThread] /* Pointer to the new thread */ bl KiSwapContextInternal - // - // Get the SPSR and restore it - // - ldr r4, [sp, #ExSpsr] - msr spsr_all, r4 - - // - // Restore the registers - // FIXME-PERF: Use LDMIA later - // - ldr r4, [sp, #ExR4] - ldr r5, [sp, #ExR5] - ldr r6, [sp, #ExR6] - ldr r7, [sp, #ExR7] - ldr r8, [sp, #ExR8] - ldr r9, [sp, #ExR9] - ldr r10, [sp, #ExR10] - ldr r11, [sp, #ExR11] - ldr lr, [sp, #ExLr] - - // - // Restore stack - // - add sp, sp, #ExceptionFrameLength - - // - // Jump to saved restore address - // - mov pc, lr + /* Restore non-volatiles and return */ + ldmia sp!,{r4,r5,r6,r7,r8,r9,r10,r11,pc} - ENTRY_END KiSwapContext + NESTED_END KiSwapContext + + NESTED_ENTRY KiThreadStartup PROLOG_END KiThreadStartup - - // - // Lower to APC_LEVEL - // + + /* Lower IRQL to APC_LEVEL */ mov a1, #1 bl KeLowerIrql - - // - // Set the start address and startup context - // + + /* Set the start address and startup context */ mov a1, r6 mov a2, r5 blx r7 - - // - // Oh noes, we are back! - // - b . - - ENTRY_END KiThreadStartup + + /* The function must not return! */ + __assertfail + + NESTED_END KiThreadStartup + NESTED_ENTRY KiSwitchThreads PROLOG_END KiSwitchThreads - // BUSTEDDDD - b . + // UNIMPLEMENTED! + __debugbreak - ENTRY_END KiSwitchThreads + NESTED_END KiSwitchThreads - NESTED_ENTRY KiSwapContextInternal - PROLOG_END KiSwapContextInternal - - // BUSTEDDDD - b . - - ENTRY_END KiSwapContextInternal + END +/* EOF */

1 0

[tkreuzer] 67715: [NTOSKRNL] Fix compilation of some ARM assembler files [NTDLL] Add missing ASM stubs for ARM
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 14:50:07 2015 New Revision: 67715 URL: http://svn.reactos.org/svn/reactos?rev=67715&view=rev Log: [NTOSKRNL] Fix compilation of some ARM assembler files [NTDLL] Add missing ASM stubs for ARM Modified: trunk/reactos/dll/ntdll/dispatch/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/boot.s trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trap.s Modified: trunk/reactos/dll/ntdll/dispatch/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/arm/stu… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/arm/stubs_asm.s [iso-8859-1] Thu May 14 14:50:07 2015 @@ -1,16 +1,31 @@ -#include "../../../../ntoskrnl/include/internal/arm/asmmacro.S" -// -// Exceptions -// -GENERATE_ARM_STUB LdrInitializeThunk -GENERATE_ARM_STUB RtlGetCallersAddress -GENERATE_ARM_STUB RtlUnwind -GENERATE_ARM_STUB RtlDispatchException -GENERATE_ARM_STUB RtlpGetStackLimits -GENERATE_ARM_STUB DbgUserBreakPoint -GENERATE_ARM_STUB KiFastSystemCall -GENERATE_ARM_STUB KiFastSystemCallRet -GENERATE_ARM_STUB KiIntSystemCall -GENERATE_ARM_STUB KiUserApcDispatcher -GENERATE_ARM_STUB RtlInitializeContext +#include <ksarm.h> + + TEXTAREA + + LEAF_ENTRY LdrInitializeThunk + __assertfail + bx lr + LEAF_END LdrInitializeThunk + + LEAF_ENTRY KiRaiseUserExceptionDispatcher + __assertfail + bx lr + LEAF_END KiRaiseUserExceptionDispatcher + + LEAF_ENTRY KiUserApcDispatcher + __assertfail + bx lr + LEAF_END KiUserApcDispatcher + + LEAF_ENTRY KiUserCallbackDispatcher + __assertfail + bx lr + LEAF_END KiUserCallbackDispatcher + + LEAF_ENTRY KiUserExceptionDispatcher + __assertfail + bx lr + LEAF_END KiUserExceptionDispatcher + + END Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] Thu May 14 14:50:07 2015 @@ -6,40 +6,47 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ - .title "ARM Kernel Entry Point" - .include "ntoskrnl/include/internal/arm/kxarm.h" - .include "ntoskrnl/include/internal/arm/ksarm.h" +#include <ksarm.h> TEXTAREA + + IMPORT KiInitializeSystem + NESTED_ENTRY KiSystemStartup PROLOG_END KiSystemStartup - + /* Put us in FIQ mode, set IRQ stack */ b . mrs r3, cpsr - orr r3, r1, #CPSR_FIQ_MODE - msr cpsr, r3 - ldr sp, [a1, #LpbInterruptStack] - + orr r3, r1, #CPSRM_FIQ + //msr cpsr, r3 + msr cpsr_fc, r3 + ldr sp, [a1, #LpbKernelStack] + /* Repeat for IRQ mode */ - msr cpsr_c, #CPSR_IRQ_MODE - ldr sp, [a1, #LpbInterruptStack] + mov r3, #CPSRM_INT + msr cpsr_c, r3 + ldr sp, [a1, #LpbKernelStack] /* Put us in ABORT mode and set the panic stack */ - msr cpsr_c, #CPSR_ABORT_MODE - ldr sp, [a1, #LpbPanicStack] - - /* Repeat for UND (Undefined) mode */ - msr cpsr_c, #CPSR_UND_MODE - ldr sp, [a1, #LpbPanicStack] - + mov r3, #CPSRM_ABT + msr cpsr_c, r3 + ldr sp, [a1, #LpbKernelStack] + + /* Repeat for UDF (Undefined) mode */ + mov r3, #CPSRM_UDF + msr cpsr_c, r3 + ldr sp, [a1, #LpbKernelStack] + /* Put us into SVC (Supervisor) mode and set the kernel stack */ - msr cpsr_c, #CPSR_SVC_MODE + mov r3, #CPSRM_SVC + msr cpsr_c, r3 ldr sp, [a1, #LpbKernelStack] - + /* Go to C code */ b KiInitializeSystem - - ENTRY_END KiSystemStartup + NESTED_END KiSystemStartup + + END /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs_asm.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s [iso-8859-1] Thu May 14 14:50:07 2015 @@ -1,38 +1,18 @@ -#include <internal/arm/asmmacro.S> -// -// Exceptions -// -GENERATE_ARM_STUB _abnormal_termination -GENERATE_ARM_STUB _except_handler2 -GENERATE_ARM_STUB _except_handler3 -GENERATE_ARM_STUB _global_unwind2 -GENERATE_ARM_STUB _local_unwind2 -GENERATE_ARM_STUB RtlGetCallersAddress -GENERATE_ARM_STUB RtlUnwind -GENERATE_ARM_STUB RtlDispatchException -GENERATE_ARM_STUB RtlpGetStackLimits -GENERATE_ARM_STUB DbgBreakPointWithStatus -GENERATE_ARM_STUB KeRaiseUserException -GENERATE_ARM_STUB KdpGdbStubInit +#include <ksarm.h> -// -// Driver ISRs -// -GENERATE_ARM_STUB KeConnectInterrupt -GENERATE_ARM_STUB KeDisconnectInterrupt -GENERATE_ARM_STUB KiPassiveRelease -GENERATE_ARM_STUB KiInterruptTemplate -GENERATE_ARM_STUB KiUnexpectedInterrupt -GENERATE_ARM_STUB KeInitializeInterrupt -GENERATE_ARM_STUB KeSynchronizeExecution -// -// User Mode Support -// -GENERATE_ARM_STUB KeSwitchKernelStack -GENERATE_ARM_STUB RtlCreateUserThread -GENERATE_ARM_STUB RtlInitializeContext -GENERATE_ARM_STUB KeUserModeCallback -GENERATE_ARM_STUB KiCallUserMode -GENERATE_ARM_STUB NtCallbackReturn + TEXTAREA + + LEAF_ENTRY KeSwitchKernelStack + __assertfail + bx lr + LEAF_END KeSwitchKernelStack + + LEAF_ENTRY KiPassiveRelease + __assertfail + bx lr + LEAF_END KiPassiveRelease + + END +/* EOF */ Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s [iso-8859-1] Thu May 14 14:50:07 2015 @@ -6,12 +6,18 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ - .title "ARM Trap Dispatching and Handling" - #include "ntoskrnl/include/internal/arm/kxarm.h" - .include "ntoskrnl/include/internal/arm/ksarm.h" +#include <ksarm.h> - .global KiArmVectorTable - KiArmVectorTable: + IMPORT KiUndefinedExceptionHandler + IMPORT KiSoftwareInterruptHandler + IMPORT KiPrefetchAbortHandler + IMPORT KiDataAbortHandler + IMPORT KiInterruptHandler + + TEXTAREA + + EXPORT KiArmVectorTable +KiArmVectorTable b . // Reset ldr pc, _KiUndefinedInstructionJump // Undefined Instruction ldr pc, _KiSoftwareInterruptJump // Software Interrupt @@ -20,117 +26,131 @@ b . // Reserved ldr pc, _KiInterruptJump // Interrupt ldr pc, _KiFastInterruptJump // Fast Interrupt - - _KiUndefinedInstructionJump: .word KiUndefinedInstructionException - _KiSoftwareInterruptJump: .word KiSoftwareInterruptException - _KiPrefetchAbortJump: .word KiPrefetchAbortException - _KiDataAbortJump: .word KiDataAbortException - _KiInterruptJump: .word KiInterruptException - _KiFastInterruptJump: .word KiFastInterruptException - - TEXTAREA + +_KiUndefinedInstructionJump DCD KiUndefinedInstructionException +_KiSoftwareInterruptJump DCD KiSoftwareInterruptException +_KiPrefetchAbortJump DCD KiPrefetchAbortException +_KiDataAbortJump DCD KiDataAbortException +_KiInterruptJump DCD KiInterruptException +_KiFastInterruptJump DCD KiFastInterruptException + + // Might need to move these to a custom header, when used by HAL as well + + MACRO + TRAP_PROLOG $Abort + __debugbreak + MEND + + MACRO + SYSCALL_PROLOG $Abort + __debugbreak + MEND + + MACRO + TRAP_EPILOG $SystemCall + __debugbreak + MEND + NESTED_ENTRY KiUndefinedInstructionException PROLOG_END KiUndefinedInstructionException - // - // Handle trap entry - // + + /* Handle trap entry */ TRAP_PROLOG 0 // NotFromAbort - - // - // Call the C handler - // + + /* Call the C handler */ ldr lr, =KiExceptionExit mov r0, sp ldr pc, =KiUndefinedExceptionHandler - ENTRY_END KiUndefinedInstructionException - - + + NESTED_END KiUndefinedInstructionException + + NESTED_ENTRY KiSoftwareInterruptException PROLOG_END KiSoftwareInterruptException - // - // Handle trap entry - // + + /* Handle trap entry */ SYSCALL_PROLOG - - // - // Call the C handler - // + + /* Call the C handler */ ldr lr, =KiServiceExit mov r0, sp ldr pc, =KiSoftwareInterruptHandler - ENTRY_END KiSoftwareInterruptException + + NESTED_END KiSoftwareInterruptException NESTED_ENTRY KiPrefetchAbortException PROLOG_END KiPrefetchAbortException - // - // Handle trap entry - // + + /* Handle trap entry */ TRAP_PROLOG 0 // NotFromAbort - - // - // Call the C handler - // + + /* Call the C handler */ ldr lr, =KiExceptionExit mov r0, sp ldr pc, =KiPrefetchAbortHandler - ENTRY_END KiPrefetchAbortException + + NESTED_END KiPrefetchAbortException NESTED_ENTRY KiDataAbortException PROLOG_END KiDataAbortException - // - // Handle trap entry - // + + /* Handle trap entry */ TRAP_PROLOG 1 // FromAbort - - // - // Call the C handler - // + + /* Call the C handler */ ldr lr, =KiExceptionExit mov r0, sp ldr pc, =KiDataAbortHandler - ENTRY_END KiDataAbortException + + NESTED_END KiDataAbortException NESTED_ENTRY KiInterruptException PROLOG_END KiInterruptException - // - // Handle trap entry - // + + /* Handle trap entry */ TRAP_PROLOG 0 // NotFromAbort - - // - // Call the C handler - // + + /* Call the C handler */ ldr lr, =KiExceptionExit mov r0, sp mov r1, #0 ldr pc, =KiInterruptHandler - ENTRY_END KiInterruptException + + NESTED_END KiInterruptException NESTED_ENTRY KiFastInterruptException PROLOG_END KiFastInterruptException - // + // FIXME-PERF: Implement FIQ exception - // - b . - ENTRY_END KiFastInterruptException - - + __debugbreak + + NESTED_END KiFastInterruptException + + NESTED_ENTRY KiExceptionExit PROLOG_END KiExceptionExit - // - // Handle trap exit - // + + /* Handle trap exit */ TRAP_EPILOG 0 // NotFromSystemCall - ENTRY_END KiExceptionExit + + NESTED_END KiExceptionExit NESTED_ENTRY KiServiceExit PROLOG_END KiServiceExit - // - // Handle trap exit - // + + /* Handle trap exit */ TRAP_EPILOG 1 // FromSystemCall - ENTRY_END KiServiceExit + + NESTED_END KiServiceExit + + + LEAF_ENTRY KiInterruptTemplate + DCD 0 + LEAF_END KiInterruptTemplate + + END +/* EOF */

1 0

[tkreuzer] 67714: [NTOSKRNL] Fix some Interlocked exports for non-x86, export some ARM specific functions [NTDLL] Export some ARM specific functions [SCSIPORT] Fix ARM exports
by tkreuzer＠svn.reactos.org 14 May '15

14 May '15

Author: tkreuzer Date: Thu May 14 14:49:41 2015 New Revision: 67714 URL: http://svn.reactos.org/svn/reactos?rev=67714&view=rev Log: [NTOSKRNL] Fix some Interlocked exports for non-x86, export some ARM specific functions [NTDLL] Export some ARM specific functions [SCSIPORT] Fix ARM exports Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/drivers/storage/scsiport/scsiport.spec trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Thu May 14 14:49:41 2015 @@ -716,9 +716,9 @@ @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) @ stdcall -arch=win32 -ret64 RtlInterlockedCompareExchange64(ptr double double) -@ stdcall -arch=i386,x86_64 RtlInterlockedFlushSList(ptr) -@ stdcall -arch=i386,x86_64 RtlInterlockedPopEntrySList(ptr) -@ stdcall -arch=i386,x86_64 RtlInterlockedPushEntrySList(ptr ptr) +@ stdcall RtlInterlockedFlushSList(ptr) +@ stdcall RtlInterlockedPopEntrySList(ptr) +@ stdcall RtlInterlockedPushEntrySList(ptr ptr) @ stdcall RtlIpv4AddressToStringA(ptr ptr) @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) @@ -1272,7 +1272,8 @@ @ cdecl -arch=i386 _CIpow() @ cdecl -arch=i386 _CIsin() @ cdecl -arch=i386 _CIsqrt() -@ cdecl -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=arm __jump_unwind() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) @@ -1290,7 +1291,7 @@ @ cdecl -arch=i386 -ret64 _aullrem(double double) @ cdecl -arch=i386 _aullshr() @ extern -arch=i386 _chkstk -@ cdecl -arch=i386,x86_64 _fltused() +@ cdecl -arch=i386,x86_64,arm _fltused() @ cdecl -arch=i386 -ret64 _ftol() @ cdecl _i64toa(double ptr long) @ cdecl _i64tow(double ptr long) @@ -1334,10 +1335,10 @@ @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) -@ cdecl -arch=i386,x86_64 ceil(double) -@ cdecl -arch=i386,x86_64 cos(double) -@ cdecl -arch=i386,x86_64 fabs(double) -@ cdecl -arch=i386,x86_64 floor(double) +@ cdecl ceil(double) +@ cdecl cos(double) +@ cdecl fabs(double) +@ cdecl floor(double) @ cdecl isalnum(long) @ cdecl isalpha(long) @ cdecl iscntrl(long) @@ -1366,7 +1367,7 @@ @ cdecl memset(ptr long long) @ cdecl -arch=i386,x86_64 pow(double double) @ cdecl qsort(ptr long long ptr) -@ cdecl -arch=i386,x86_64 sin(double) +@ cdecl sin(double) @ varargs sprintf(ptr str) @ cdecl -arch=i386,x86_64 sqrt(double) @ varargs sscanf(str str) @@ -1410,3 +1411,14 @@ @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) @ cdecl wcstoul(wstr ptr long) + +# FIXME: check if this is correct +@ stdcall -arch=arm __dtoi64() +@ stdcall -arch=arm __dtou64() +@ stdcall -arch=arm __i64tod() +@ stdcall -arch=arm __u64tod() +@ stdcall -arch=arm __rt_sdiv() +@ stdcall -arch=arm __rt_sdiv64() +@ stdcall -arch=arm __rt_udiv() +@ stdcall -arch=arm __rt_udiv64() +@ stdcall -arch=arm __rt_srsh() Modified: trunk/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] Thu May 14 14:49:41 2015 @@ -1,7 +1,7 @@ @ cdecl ScsiDebugPrint() @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger +@ stdcall -arch=i386,arm ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger @ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long) @ stdcall ScsiPortFlushDma(ptr) @ stdcall ScsiPortFreeDeviceBase(ptr ptr) @@ -17,18 +17,18 @@ @ stdcall ScsiPortLogError(ptr ptr long long long long long) @ stdcall ScsiPortMoveMemory(ptr ptr long) @ cdecl ScsiPortNotification() -@ stdcall -arch=i386 ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall -arch=i386 ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall -arch=i386 ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG -@ stdcall -arch=i386 ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall -arch=i386 ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall -arch=i386 ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall -arch=i386 ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall -arch=i386 ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall -arch=i386 ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG -@ stdcall -arch=i386 ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall -arch=i386 ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall -arch=i386 ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG +@ stdcall -arch=i386,arm ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR +@ stdcall -arch=i386,arm ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT +@ stdcall -arch=i386,arm ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG +@ stdcall -arch=i386,arm ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR +@ stdcall -arch=i386,arm ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT +@ stdcall -arch=i386,arm ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG +@ stdcall -arch=i386,arm ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +@ stdcall -arch=i386,arm ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT +@ stdcall -arch=i386,arm ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG +@ stdcall -arch=i386,arm ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR +@ stdcall -arch=i386,arm ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT +@ stdcall -arch=i386,arm ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG @ stdcall -arch=x86_64 ScsiPortReadPortBufferUchar(ptr ptr long) @ stdcall -arch=x86_64 ScsiPortReadPortBufferUshort(ptr ptr long) @ stdcall -arch=x86_64 ScsiPortReadPortBufferUlong(ptr ptr long) @@ -44,18 +44,18 @@ @ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) @ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor @ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall -arch=i386 ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall -arch=i386 ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall -arch=i386 ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG -@ stdcall -arch=i386 ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall -arch=i386 ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall -arch=i386 ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -@ stdcall -arch=i386 ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall -arch=i386 ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall -arch=i386 ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG +@ stdcall -arch=i386,arm ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR +@ stdcall -arch=i386,arm ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT +@ stdcall -arch=i386,arm ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG +@ stdcall -arch=i386,arm ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR +@ stdcall -arch=i386,arm ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT +@ stdcall -arch=i386,arm ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG +@ stdcall -arch=i386,arm ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +@ stdcall -arch=i386,arm ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +@ stdcall -arch=i386,arm ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +@ stdcall -arch=i386,arm ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR +@ stdcall -arch=i386,arm ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT +@ stdcall -arch=i386,arm ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG @ stdcall -arch=x86_64 ScsiPortWritePortBufferUchar(ptr ptr long) @ stdcall -arch=x86_64 ScsiPortWritePortBufferUshort(ptr ptr long) @ stdcall -arch=x86_64 ScsiPortWritePortBufferUlong(ptr ptr long) Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Thu May 14 14:49:41 2015 @@ -100,27 +100,27 @@ @ stdcall ExInitializeRundownProtectionCacheAware(ptr long) @ stdcall ExInitializeZone(ptr long ptr long) @ stdcall ExInterlockedAddLargeInteger(ptr long long ptr) -@ fastcall -arch=i386,arm ExInterlockedAddLargeStatistic(ptr long) +@ fastcall -arch=i386 ExInterlockedAddLargeStatistic(ptr long) @ stdcall ExInterlockedAddUlong(ptr long ptr) @ fastcall -arch=i386 ExInterlockedCompareExchange64(ptr ptr ptr ptr) @ stdcall -arch=i386 ExInterlockedDecrementLong(ptr ptr) @ stdcall -arch=i386 ExInterlockedExchangeUlong(ptr long ptr) @ stdcall ExInterlockedExtendZone(ptr ptr long ptr) -@ fastcall -arch=i386,arm ExInterlockedFlushSList(ptr) -@ stdcall -arch=i386,arm ExInterlockedIncrementLong(ptr ptr) +@ fastcall -arch=i386 ExInterlockedFlushSList(ptr) +@ stdcall -arch=i386 ExInterlockedIncrementLong(ptr ptr) @ stdcall ExInterlockedInsertHeadList(ptr ptr ptr) @ stdcall ExInterlockedInsertTailList(ptr ptr ptr) @ stdcall ExInterlockedPopEntryList(ptr ptr) -@ fastcall -arch=i386,arm ExInterlockedPopEntrySList(ptr ptr) +@ fastcall -arch=i386 ExInterlockedPopEntrySList(ptr ptr) @ stdcall ExInterlockedPushEntryList(ptr ptr ptr) -@ fastcall -arch=i386,arm ExInterlockedPushEntrySList(ptr ptr ptr) +@ fastcall -arch=i386 ExInterlockedPushEntrySList(ptr ptr ptr) @ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stdcall ExIsProcessorFeaturePresent(long) @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) @ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) @ stdcall ExNotifyCallback(ptr ptr ptr) -@ stdcall -arch=x86_64 ExQueryDepthSList(ptr) +@ stdcall -arch=x86_64,arm ExQueryDepthSList(ptr) RtlQueryDepthSList @ stdcall ExQueryPoolBlockSize(ptr ptr) @ stdcall ExQueueWorkItem(ptr long) @ stdcall ExRaiseAccessViolation() @@ -159,21 +159,21 @@ @ extern ExWindowStationObjectType @ fastcall ExfAcquirePushLockExclusive(ptr) @ fastcall ExfAcquirePushLockShared(ptr) -@ fastcall -arch=i386,arm ExfInterlockedAddUlong(ptr long ptr) -@ fastcall -arch=i386,arm ExfInterlockedCompareExchange64(ptr ptr ptr) -@ fastcall -arch=i386,arm ExfInterlockedInsertHeadList(ptr ptr ptr) -@ fastcall -arch=i386,arm ExfInterlockedInsertTailList(ptr ptr ptr) -@ fastcall -arch=i386,arm ExfInterlockedPopEntryList(ptr ptr) -@ fastcall -arch=i386,arm ExfInterlockedPushEntryList(ptr ptr ptr) -@ fastcall -arch=i386,arm ExfInterlockedRemoveHeadList(ptr ptr) +@ fastcall -arch=i386 ExfInterlockedAddUlong(ptr long ptr) +@ fastcall -arch=i386 ExfInterlockedCompareExchange64(ptr ptr ptr) +@ fastcall -arch=i386 ExfInterlockedInsertHeadList(ptr ptr ptr) +@ fastcall -arch=i386 ExfInterlockedInsertTailList(ptr ptr ptr) +@ fastcall -arch=i386 ExfInterlockedPopEntryList(ptr ptr) +@ fastcall -arch=i386 ExfInterlockedPushEntryList(ptr ptr ptr) +@ fastcall -arch=i386 ExfInterlockedRemoveHeadList(ptr ptr) @ fastcall ExfReleasePushLock(ptr) @ fastcall ExfReleasePushLockExclusive(ptr) @ fastcall ExfReleasePushLockShared(ptr) @ fastcall ExfTryToWakePushLock(ptr) @ fastcall ExfUnblockPushLock(ptr ptr) -@ stdcall -arch=x86_64 ExpInterlockedFlushSList(ptr) -@ stdcall -arch=x86_64 ExpInterlockedPopEntrySList(ptr ptr) -@ stdcall -arch=x86_64 ExpInterlockedPushEntrySList(ptr ptr) +@ stdcall -arch=x86_64,arm ExpInterlockedFlushSList(ptr) RtlInterlockedFlushSList +@ stdcall -arch=x86_64,arm ExpInterlockedPopEntrySList(ptr ptr) RtlInterlockedPopEntrySList +@ stdcall -arch=x86_64,arm ExpInterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ fastcall -arch=i386 Exfi386InterlockedDecrementLong(ptr) @ fastcall -arch=i386 Exfi386InterlockedExchangeUlong(ptr long) @ fastcall -arch=i386 Exfi386InterlockedIncrementLong(ptr) @@ -324,8 +324,10 @@ @ fastcall -arch=i386,arm InterlockedExchange(ptr long) @ fastcall -arch=i386,arm InterlockedExchangeAdd(ptr long) @ fastcall -arch=i386,arm InterlockedIncrement(ptr) -@ fastcall -arch=i386,arm InterlockedPopEntrySList(ptr) -@ fastcall -arch=i386,arm InterlockedPushEntrySList(ptr ptr) +@ fastcall -arch=i386 InterlockedPopEntrySList(ptr) +@ fastcall -arch=i386 InterlockedPushEntrySList(ptr ptr) +@ stdcall -arch=arm InterlockedPopEntrySList(ptr) RtlInterlockedPopEntrySList +@ stdcall -arch=arm InterlockedPushEntrySList(ptr ptr) RtlInterlockedPushEntrySList @ stdcall -arch=x86_64 InitializeSListHead(ptr) RtlInitializeSListHead @ stdcall IoAcquireCancelSpinLock(ptr) @ stdcall IoAcquireRemoveLockEx(ptr ptr str long long) @@ -582,6 +584,7 @@ @ stdcall KeFindConfigurationEntry(ptr long long ptr) @ stdcall KeFindConfigurationNextEntry(ptr long long ptr ptr) @ stdcall KeFlushEntireTb(long long) +@ stdcall -arch=arm KeFlushIoBuffers(ptr long long) @ stdcall KeFlushQueuedDpcs() @ stdcall KeGenericCallDpc(ptr ptr) @ stdcall KeGetCurrentThread() @@ -1535,7 +1538,8 @@ @ stdcall ZwWaitForSingleObject(ptr long ptr) @ stdcall ZwWriteFile(ptr ptr ptr ptr ptr ptr long ptr ptr) @ stdcall ZwYieldExecution() -@ cdecl -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=arm __jump_unwind() @ cdecl -arch=x86_64 __chkstk() ;@ cdecl -arch=x86_64 __misaligned_access() ;@ cdecl -arch=i386 _CIcos @@ -1561,7 +1565,7 @@ @ cdecl -arch=i386,arm _local_unwind2() @ cdecl -arch=x86_64 _local_unwind() @ cdecl _purecall() -@ cdecl -arch=x86_64 _setjmp(ptr ptr) +@ cdecl -arch=x86_64,arm _setjmp(ptr ptr) @ cdecl -arch=x86_64 _setjmpex(ptr ptr) @ cdecl _snprintf() @ cdecl _snwprintf() @@ -1588,7 +1592,7 @@ @ cdecl isspace() @ cdecl isupper() @ cdecl isxdigit() -@ cdecl -arch=x86_64 longjmp(ptr long) +@ cdecl -arch=x86_64,arm longjmp(ptr long) @ cdecl mbstowcs() @ cdecl mbtowc() @ cdecl memchr() @@ -1633,3 +1637,14 @@ @ cdecl wcsstr() @ cdecl wcstombs() @ cdecl wctomb() + +# FIXME: check if this is correct +@ stdcall -arch=arm __dtoi64() +@ stdcall -arch=arm __dtou64() +@ stdcall -arch=arm __i64tod() +@ stdcall -arch=arm __u64tod() +@ stdcall -arch=arm __rt_sdiv() +@ stdcall -arch=arm __rt_sdiv64() +@ stdcall -arch=arm __rt_udiv() +@ stdcall -arch=arm __rt_udiv64() +@ stdcall -arch=arm __rt_srsh()

1 0

[ekohl] 67713: [PARPORT] Implement basic funtions of the parallel port driver. It supports Centronics-Mode only. You can print files using: copy <filename> lpt1:
by ekohl＠svn.reactos.org 14 May '15

14 May '15

Author: ekohl Date: Thu May 14 14:42:05 2015 New Revision: 67713 URL: http://svn.reactos.org/svn/reactos?rev=67713&view=rev Log: [PARPORT] Implement basic funtions of the parallel port driver. It supports Centronics-Mode only. You can print files using: copy <filename> lpt1: Added: trunk/reactos/drivers/parallel/parport/fdo.c (with props) trunk/reactos/drivers/parallel/parport/misc.c (with props) trunk/reactos/drivers/parallel/parport/pdo.c (with props) Modified: trunk/reactos/drivers/parallel/parport/CMakeLists.txt trunk/reactos/drivers/parallel/parport/parport.c trunk/reactos/drivers/parallel/parport/parport.h Modified: trunk/reactos/drivers/parallel/parport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/C… ============================================================================== --- trunk/reactos/drivers/parallel/parport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/CMakeLists.txt [iso-8859-1] Thu May 14 14:42:05 2015 @@ -1,5 +1,16 @@ -add_library(parport SHARED parport.c parport.rc) +list(APPEND SOURCE + fdo.c + misc.c + pdo.c + parport.c + parport.h) + +add_library(parport SHARED + ${SOURCE} + parport.rc) + set_module_type(parport kernelmodedriver) +add_pch(parport parport.h SOURCE) add_importlibs(parport ntoskrnl hal) add_cd_file(TARGET parport DESTINATION reactos/system32/drivers FOR all) Added: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c (added) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Thu May 14 14:42:05 2015 @@ -0,0 +1,572 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * FILE: drivers/parallel/parport/fdo.c + * PURPOSE: FDO functions + */ + +#include "parport.h" + +/* + * The following constants describe the various signals of the printer port + * hardware. Note that the hardware inverts some signals and that some + * signals are active low. An example is LP_STROBE, which must be programmed + * with 1 for being active and 0 for being inactive, because the strobe signal + * gets inverted, but it is also active low. + */ + +/* + * bit defines for 8255 status port + * base + 1 + * accessed with LP_S(minor), which gets the byte... + */ +#define LP_PBUSY 0x80 /* inverted input, active high */ +#define LP_PACK 0x40 /* unchanged input, active low */ +#define LP_POUTPA 0x20 /* unchanged input, active high */ +#define LP_PSELECD 0x10 /* unchanged input, active high */ +#define LP_PERRORP 0x08 /* unchanged input, active low */ + +/* + * defines for 8255 control port + * base + 2 + * accessed with LP_C(minor) + */ +#define LP_PINTEN 0x10 +#define LP_PSELECP 0x08 /* inverted output, active low */ +#define LP_PINITP 0x04 /* unchanged output, active low */ +#define LP_PAUTOLF 0x02 /* inverted output, active low */ +#define LP_PSTROBE 0x01 /* inverted output, active low */ + + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +AddDeviceInternal(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo, + IN PULONG pLptPortNumber OPTIONAL, + OUT PDEVICE_OBJECT* pFdo OPTIONAL) +{ + PFDO_DEVICE_EXTENSION DeviceExtension = NULL; + PDEVICE_OBJECT Fdo = NULL; + WCHAR DeviceNameBuffer[32]; + UNICODE_STRING DeviceName; + NTSTATUS Status; + + DPRINT("AddDeviceInternal()\n"); + + ASSERT(DriverObject); + ASSERT(Pdo); + + /* Create new device object */ + swprintf(DeviceNameBuffer, + L"\\Device\\ParallelPort%lu", + IoGetConfigurationInformation()->ParallelCount); + RtlInitUnicodeString(&DeviceName, + DeviceNameBuffer); + + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_PARALLEL_PORT, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateDevice() failed (Status 0x%08lx)\n", Status); + Fdo = NULL; + goto done; + } + + DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, + sizeof(FDO_DEVICE_EXTENSION)); + + DeviceExtension->Common.IsFDO = TRUE; + DeviceExtension->Common.PnpState = dsStopped; + + DeviceExtension->ParallelPortNumber = IoGetConfigurationInformation()->ParallelCount++; + if (pLptPortNumber == NULL) + DeviceExtension->LptPort = DeviceExtension->ParallelPortNumber + 1; + else + DeviceExtension->LptPort = *pLptPortNumber; + DeviceExtension->Pdo = Pdo; + + Status = IoAttachDeviceToDeviceStackSafe(Fdo, + Pdo, + &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoAttachDeviceToDeviceStackSafe() failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) + Fdo->Flags |= DO_POWER_PAGABLE; + + if (DeviceExtension->LowerDevice->Flags & DO_BUFFERED_IO) + Fdo->Flags |= DO_BUFFERED_IO; + + if (DeviceExtension->LowerDevice->Flags & DO_DIRECT_IO) + Fdo->Flags |= DO_DIRECT_IO; + + /* Choose default strategy */ + if ((Fdo->Flags & (DO_BUFFERED_IO | DO_DIRECT_IO)) == 0) + Fdo->Flags |= DO_BUFFERED_IO; + + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + if (pFdo) + { + *pFdo = Fdo; + } + + return STATUS_SUCCESS; + +done: + if (Fdo) + { + IoDeleteDevice(Fdo); + } + + return Status; +} + + +NTSTATUS +NTAPI +FdoStartDevice(IN PDEVICE_OBJECT DeviceObject, + IN PCM_RESOURCE_LIST ResourceList, + IN PCM_RESOURCE_LIST ResourceListTranslated) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + WCHAR DeviceNameBuffer[32]; + WCHAR LinkNameBuffer[32]; + WCHAR LptPortBuffer[32]; + UNICODE_STRING DeviceName; + UNICODE_STRING LinkName; + UNICODE_STRING LptPort; + ULONG i; +// ULONG Vector = 0; +// KIRQL Dirql = 0; +// KAFFINITY Affinity = 0; +// KINTERRUPT_MODE InterruptMode = Latched; +// BOOLEAN ShareInterrupt = TRUE; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + HANDLE KeyHandle; + NTSTATUS Status; + + DPRINT("FdoStartDevice ()\n"); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + ASSERT(DeviceExtension); + ASSERT(DeviceExtension->Common.IsFDO == TRUE); + + if (!ResourceList) + { + DPRINT1("No allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (ResourceList->Count != 1) + { + DPRINT1("Wrong number of allocated resources sent to driver\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + if ((ResourceList->List[0].PartialResourceList.Version != 1) || + (ResourceList->List[0].PartialResourceList.Revision != 1) || + (ResourceListTranslated->List[0].PartialResourceList.Version != 1) || + (ResourceListTranslated->List[0].PartialResourceList.Revision != 1)) + { + DPRINT1("Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", + ResourceList->List[0].PartialResourceList.Version, + ResourceList->List[0].PartialResourceList.Revision, + ResourceListTranslated->List[0].PartialResourceList.Version, + ResourceListTranslated->List[0].PartialResourceList.Revision); + return STATUS_REVISION_MISMATCH; + } + + DeviceExtension->BaseAddress = 0; + + for (i = 0; i < ResourceList->List[0].PartialResourceList.Count; i++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptorTranslated = &ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[i]; + + switch (PartialDescriptor->Type) + { + case CmResourceTypePort: + DPRINT("Port: BaseAddress 0x%lx Length %lu\n", + PartialDescriptor->u.Port.Start.u.LowPart, + PartialDescriptor->u.Port.Length); + + if (DeviceExtension->BaseAddress == 0) + { + if (PartialDescriptor->u.Port.Length < 8) + return STATUS_INSUFFICIENT_RESOURCES; + + DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart; + } + break; + + case CmResourceTypeInterrupt: + DPRINT("Interrupt: Level %lu Vector %lu\n", + PartialDescriptorTranslated->u.Interrupt.Level, + PartialDescriptorTranslated->u.Interrupt.Vector); + +// Dirql = (KIRQL)PartialDescriptorTranslated->u.Interrupt.Level; +// Vector = PartialDescriptorTranslated->u.Interrupt.Vector; +// Affinity = PartialDescriptorTranslated->u.Interrupt.Affinity; + +// if (PartialDescriptorTranslated->Flags & CM_RESOURCE_INTERRUPT_LATCHED) +// InterruptMode = Latched; +// else +// InterruptMode = LevelSensitive; + +// ShareInterrupt = (PartialDescriptorTranslated->ShareDisposition == CmResourceShareShared); + break; + + default: + DPRINT1("Other ressource: \n"); + break; + } + } + + DPRINT("New LPT port: Base 0x%lx\n", + DeviceExtension->BaseAddress); + + if (!DeviceExtension->BaseAddress) + return STATUS_INSUFFICIENT_RESOURCES; + +#if 0 + if (!Dirql) + return STATUS_INSUFFICIENT_RESOURCES; +#endif + + /* Create link \DosDevices\LPTX -> \Device\ParallelPortX */ + swprintf(DeviceNameBuffer, L"\\Device\\ParallelPort%lu", DeviceExtension->ParallelPortNumber); + swprintf(LinkNameBuffer, L"\\DosDevices\\LPT%lu", DeviceExtension->LptPort); + swprintf(LptPortBuffer, L"LPT%lu", DeviceExtension->LptPort); + RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); + RtlInitUnicodeString(&LinkName, LinkNameBuffer); + RtlInitUnicodeString(&LptPort, LptPortBuffer); + Status = IoCreateSymbolicLink(&LinkName, + &DeviceName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoCreateSymbolicLink() failed with status 0x%08x\n", Status); + return Status; + } + + + /* Write an entry value under HKLM\HARDWARE\DeviceMap\PARALLEL PORTS. */ + /* This step is not mandatory, so do not exit in case of error. */ + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\HARDWARE\\DeviceMap\\PARALLEL PORTS"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwCreateKey(&KeyHandle, + KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + if (NT_SUCCESS(Status)) + { + /* Key = \Device\Parallelx, Value = LPTx */ + ZwSetValueKey(KeyHandle, + &DeviceName, + 0, + REG_SZ, + LptPortBuffer, + LptPort.Length + sizeof(WCHAR)); + ZwClose(KeyHandle); + } + + DeviceExtension->Common.PnpState = dsStarted; + + + /* We don't really care if the call succeeded or not... */ + + return STATUS_SUCCESS; +} + + +/* PUBLIC FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +AddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + DPRINT("AddDevice(%p %p)\n", DriverObject, Pdo); + + /* Serial.sys is a legacy driver. AddDevice is called once + * with a NULL Pdo just after the driver initialization. + * Detect this case and return success. + */ + if (Pdo == NULL) + return STATUS_SUCCESS; + + /* We have here a PDO not null. It represents a real serial + * port. So call the internal AddDevice function. + */ + return AddDeviceInternal(DriverObject, Pdo, NULL, NULL); +} + + +NTSTATUS +NTAPI +FdoCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION Stack; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("FdoCreate()\n"); + + Stack = IoGetCurrentIrpStackLocation(Irp); + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) + { + DPRINT1("Not a directory\n"); + Status = STATUS_NOT_A_DIRECTORY; + goto done; + } + + DPRINT("Open LPT%lu: successful\n", DeviceExtension->LptPort); + DeviceExtension->OpenCount++; + +done: + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + + +NTSTATUS +NTAPI +FdoClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION pDeviceExtension; + + DPRINT("FdoClose()\n"); + + pDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + pDeviceExtension->OpenCount--; + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +FdoCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("FdoCleanup()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +FdoWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + PUCHAR Buffer; + ULONG i; + UCHAR PortStatus; + ULONG ulCount; + + DPRINT("FdoWrite()\n"); + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Buffer = GetUserBuffer(Irp); + DPRINT("Length: %lu\n", IoStack->Parameters.Write.Length); + DPRINT("Buffer: %p\n", Buffer); + + if (Buffer != NULL) + { + DPRINT("%s\n", Buffer); + } + + for (i = 0; i < IoStack->Parameters.Write.Length; i++) + { + DPRINT("%lu: %c\n", i, Buffer[i]); + + ulCount = 0; + + do + { + KeStallExecutionProcessor(10); + PortStatus = READ_PORT_UCHAR((PUCHAR)(DeviceExtension->BaseAddress + 1)); + ulCount++; + } + while (ulCount < 500000 && !(PortStatus & LP_PBUSY)); + + if (ulCount == 500000) + { + DPRINT1("Timed out\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_TIMEOUT; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_TIMEOUT; + } + + /* Write character */ + WRITE_PORT_UCHAR((PUCHAR)DeviceExtension->BaseAddress, Buffer[i]); + + KeStallExecutionProcessor(10); + + WRITE_PORT_UCHAR((PUCHAR)(DeviceExtension->BaseAddress + 2), (LP_PSELECP | LP_PINITP | LP_PSTROBE)); + + KeStallExecutionProcessor(10); + + WRITE_PORT_UCHAR((PUCHAR)(DeviceExtension->BaseAddress + 2), (LP_PSELECP | LP_PINITP)); + } + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +FdoPnp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG MinorFunction; + PIO_STACK_LOCATION Stack; + ULONG_PTR Information = 0; + NTSTATUS Status; + + DPRINT("FdoPnp()\n"); + + Stack = IoGetCurrentIrpStackLocation(Irp); + MinorFunction = Stack->MinorFunction; + + switch (MinorFunction) + { + /* FIXME: do all these minor functions + IRP_MN_QUERY_REMOVE_DEVICE 0x1 + IRP_MN_REMOVE_DEVICE 0x2 + { + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + IoAcquireRemoveLock + IoReleaseRemoveLockAndWait + pass request to DeviceExtension-LowerDriver + disable interface + IoDeleteDevice(Fdo) and/or IoDetachDevice + break; + } + IRP_MN_CANCEL_REMOVE_DEVICE 0x3 + IRP_MN_STOP_DEVICE 0x4 + IRP_MN_QUERY_STOP_DEVICE 0x5 + IRP_MN_CANCEL_STOP_DEVICE 0x6 + IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations (optional) 0x7 + IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations (optional) 0x7 + IRP_MN_QUERY_INTERFACE (optional) 0x8 + IRP_MN_QUERY_CAPABILITIES (optional) 0x9 + IRP_MN_FILTER_RESOURCE_REQUIREMENTS (optional) 0xd + IRP_MN_QUERY_PNP_DEVICE_STATE (optional) 0x14 + IRP_MN_DEVICE_USAGE_NOTIFICATION (required or optional) 0x16 + IRP_MN_SURPRISE_REMOVAL 0x17 + */ + case IRP_MN_START_DEVICE: /* 0x0 */ + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + + ASSERT(((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.PnpState == dsStopped); + + /* Call lower driver */ + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + Status = FdoStartDevice(DeviceObject, + Stack->Parameters.StartDevice.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResourcesTranslated); + } + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: /* (optional) 0x7 */ + switch (Stack->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case RemovalRelations: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + default: + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + Stack->Parameters.QueryDeviceRelations.Type); + return ForwardIrpAndForget(DeviceObject, Irp); + } + break; + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* (optional) 0xd */ + DPRINT1("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + default: + DPRINT1("Unknown minor function 0x%x\n", MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + + +NTSTATUS +NTAPI +FdoPower(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("FdoPower()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/drivers/parallel/parport/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/parallel/parport/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/m… ============================================================================== --- trunk/reactos/drivers/parallel/parport/misc.c (added) +++ trunk/reactos/drivers/parallel/parport/misc.c [iso-8859-1] Thu May 14 14:42:05 2015 @@ -0,0 +1,83 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * FILE: drivers/parallel/parport/misc.c + * PURPOSE: Miscellaneous functions + */ + +#include "parport.h" + + +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; + +/* FUNCTIONS ****************************************************************/ + +static +NTSTATUS +NTAPI +ForwardIrpAndWaitCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +ForwardIrpAndWait(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice; + KEVENT Event; + NTSTATUS Status; + + LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + DPRINT("Calling lower device %p\n", LowerDevice); + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + + +NTSTATUS +NTAPI +ForwardIrpAndForget(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice; + + LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} + + +PVOID +GetUserBuffer(IN PIRP Irp) +{ + ASSERT(Irp); + + if (Irp->MdlAddress) + return Irp->MdlAddress; + else + return Irp->AssociatedIrp.SystemBuffer; +} + +/* EOF */ Propchange: trunk/reactos/drivers/parallel/parport/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/parallel/parport/parport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/parport.c [iso-8859-1] Thu May 14 14:42:05 2015 @@ -7,7 +7,15 @@ #include "parport.h" static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH DispatchCreate; +static DRIVER_DISPATCH DispatchClose; +static DRIVER_DISPATCH DispatchCleanup; +static DRIVER_DISPATCH DispatchPnp; +static DRIVER_DISPATCH DispatchPower; DRIVER_INITIALIZE DriverEntry; + + +/* FUNCTIONS ****************************************************************/ static VOID @@ -17,14 +25,109 @@ DPRINT("Parport DriverUnload\n"); } + +static +NTSTATUS +NTAPI +DispatchCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return FdoCreate(DeviceObject, Irp); + else + return PdoCreate(DeviceObject, Irp); +} + + +static +NTSTATUS +NTAPI +DispatchClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return FdoClose(DeviceObject, Irp); + else + return PdoClose(DeviceObject, Irp); +} + + +static +NTSTATUS +NTAPI +DispatchCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return FdoCleanup(DeviceObject, Irp); + else + return PdoCleanup(DeviceObject, Irp); +} + + +static +NTSTATUS +NTAPI +DispatchWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return FdoWrite(DeviceObject, Irp); + else + return PdoWrite(DeviceObject, Irp); +} + + +static +NTSTATUS +NTAPI +DispatchPnp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return FdoPnp(DeviceObject, Irp); + else + return PdoPnp(DeviceObject, Irp); +} + + +static +NTSTATUS +NTAPI +DispatchPower(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + if (((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) + return FdoPower(DeviceObject, Irp); + else + return PdoPower(DeviceObject, Irp); +} + + NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) { + ULONG i; + DPRINT("Parport DriverEntry\n"); DriverObject->DriverUnload = DriverUnload; + DriverObject->DriverExtension->AddDevice = AddDevice; + + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverObject->MajorFunction[i] = ForwardIrpAndForget; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = DispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = DispatchClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DispatchCleanup; +// DriverObject->MajorFunction[IRP_MJ_READ] = DispatchRead; + DriverObject->MajorFunction[IRP_MJ_WRITE] = DispatchWrite; +// DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; +// DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DispatchQueryInformation; + DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/parallel/parport/parport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/parport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/parport.h [iso-8859-1] Thu May 14 14:42:05 2015 @@ -8,9 +8,131 @@ #define _PARPORT_PCH_ #include <ntddk.h> -#include <ntddser.h> +#include <ndk/haltypes.h> +#include <ntddpar.h> +#include <stdio.h> //#define NDEBUG #include <debug.h> +typedef enum +{ + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved +} DEVICE_STATE; + +typedef struct _COMMON_DEVICE_EXTENSION +{ + BOOLEAN IsFDO; + DEVICE_STATE PnpState; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct _FDO_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + + PDEVICE_OBJECT Pdo; + PDEVICE_OBJECT LowerDevice; + + ULONG ParallelPortNumber; + + ULONG LptPort; + ULONG OpenCount; + + ULONG BaseAddress; + PKINTERRUPT Interrupt; + +} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; + +typedef struct _PDO_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + +} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + + +/* fdo.c */ + +DRIVER_ADD_DEVICE AddDevice; + +NTSTATUS +NTAPI +FdoCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +FdoClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +FdoCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +FdoWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +FdoPnp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +FdoPower(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +/* misc.c */ + +NTSTATUS +ForwardIrpAndWait(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +DRIVER_DISPATCH ForwardIrpAndForget; + +PVOID +GetUserBuffer(IN PIRP Irp); + +//KSERVICE_ROUTINE ParportInterruptService; + + +/* pdo.c */ + +NTSTATUS +NTAPI +PdoCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +PdoClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +PdoCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +PdoWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +PdoPnp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +PdoPower(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + #endif /* _PARPORT_PCH_ */ Added: trunk/reactos/drivers/parallel/parport/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/p… ============================================================================== --- trunk/reactos/drivers/parallel/parport/pdo.c (added) +++ trunk/reactos/drivers/parallel/parport/pdo.c [iso-8859-1] Thu May 14 14:42:05 2015 @@ -0,0 +1,95 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Parallel Port Function Driver + * FILE: drivers/parallel/parport/pdo.c + * PURPOSE: PDO functions + */ + +#include "parport.h" + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +PdoCreate(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PdoCreate()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +PdoClose(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PdoClose()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +PdoCleanup(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PdoCleanup()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +PdoWrite(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PdoWrite()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +PdoPnp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PdoPnp()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +PdoPower(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PdoPower()\n"); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/drivers/parallel/parport/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 67712: [ADVAPI32_WINETEST] - Replace test_reg_query_info with the upstream version as promised in r67424. CORE-6976
by tfaber＠svn.reactos.org 14 May '15

14 May '15

Author: tfaber Date: Thu May 14 13:08:07 2015 New Revision: 67712 URL: http://svn.reactos.org/svn/reactos?rev=67712&view=rev Log: [ADVAPI32_WINETEST] - Replace test_reg_query_info with the upstream version as promised in r67424. CORE-6976 Modified: trunk/rostests/winetests/advapi32/registry.c Modified: trunk/rostests/winetests/advapi32/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/regist… ============================================================================== --- trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/registry.c [iso-8859-1] Thu May 14 13:08:07 2015 @@ -1676,6 +1676,8 @@ LONG ret; char classbuffer[32]; WCHAR classbufferW[32]; + char expectbuffer[32]; + WCHAR expectbufferW[32]; char subkey_class[] = "subkey class"; WCHAR subkey_classW[] = {'s','u','b','k','e','y',' ','c','l','a','s','s',0}; char subsubkey_class[] = "subsubkey class"; @@ -1688,12 +1690,30 @@ ret = RegCreateKeyExA(hkey_main, "subkey", 0, subkey_class, 0, KEY_ALL_ACCESS, NULL, &subkey, NULL); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - /* invalid parameters */ + /* all parameters NULL */ ret = RegQueryInfoKeyA(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_INVALID_HANDLE, "ret = %d\n", ret); + ret = RegQueryInfoKeyW(NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_HANDLE, "ret = %d\n", ret); + + /* not requesting any information */ ret = RegQueryInfoKeyA(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + + ret = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + + /* class without length is invalid */ + memset(classbuffer, 0x55, sizeof(classbuffer)); + ret = RegQueryInfoKeyA(subkey, classbuffer, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "ret = %d\n", ret); + ok(classbuffer[0] == 0x55, "classbuffer[0] = 0x%x\n", classbuffer[0]); + + memset(classbufferW, 0x55, sizeof(classbufferW)); + ret = RegQueryInfoKeyW(subkey, classbufferW, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "ret = %d\n", ret); + ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); /* empty key */ ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); @@ -1725,12 +1745,12 @@ ret = RegCreateKeyExA(subkey, "subsubkey", 0, subsubkey_class, 0, KEY_ALL_ACCESS, NULL, &subsubkey, NULL); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ret = RegSetValueExA(subkey, NULL, 0, REG_SZ, (BYTE*)"data", 5); + ret = RegSetValueExA(subkey, NULL, 0, REG_SZ, (const BYTE*)"data", 5); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with subkey & default value */ ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); - ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); ok(subkeys == 1, "subkeys = %u\n", subkeys); ok(maxsubkeylen == strlen("subsubkey"), "maxsubkeylen = %u\n", maxsubkeylen); @@ -1755,15 +1775,15 @@ ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); - ret = RegSetValueExA(subkey, "value one", 0, REG_SZ, (BYTE*)"first value data", 17); + ret = RegSetValueExA(subkey, "value one", 0, REG_SZ, (const BYTE*)"first value data", 17); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); - ret = RegSetValueExA(subkey, "value 2", 0, REG_SZ, (BYTE*)"second value data", 18); + ret = RegSetValueExA(subkey, "value 2", 0, REG_SZ, (const BYTE*)"second value data", 18); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with named value */ ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); - ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(values == 3, "values = %u\n", values); ok(maxvaluenamelen == strlen("value one"), "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == sizeof("second value data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); @@ -1778,56 +1798,62 @@ memset(classbuffer, 0x55, sizeof(classbuffer)); classlen = 0; ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); - ok(classlen == 0, "classlen = %u\n", classlen); - ok(classbuffer[0] == 0x55, "classbuffer[0] = 0x%x\n", classbuffer[0]); + todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class) /* win2k */ || + classlen == 0, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), "classbuffer was modified\n"); memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 0; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); - ok(classlen == 0, "classlen = %u\n", classlen); - ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); + todo_wine ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); + ok(classlen == strlen(subkey_class) /* win2k */ || + classlen == 0, "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW was modified\n"); /* class name with one char buffer */ memset(classbuffer, 0x55, sizeof(classbuffer)); classlen = 1; ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_MORE_DATA, "ret = %d\n", ret); - ok(classlen == 0, "classlen = %u\n", classlen); - ok(classbuffer[0] == 0, "classbuffer[0] = 0x%x\n", classbuffer[0]); - ok(classbuffer[1] == 0x55, "classbuffer[1] = 0x%x\n", classbuffer[1]); + todo_wine ok(classlen == 0, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + expectbuffer[0] = 0; + todo_wine ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), "classbuffer was modified\n"); memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 1; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); - ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); - ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); - ok(classbufferW[1] == 0x5555, "classbufferW[1] = 0x%x\n", classbufferW[1]); + todo_wine ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + ok(classlen == 0 /* win8 */ || + classlen == strlen(subkey_class), "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW was modified\n"); /* class name with buffer one char too small */ memset(classbuffer, 0x55, sizeof(classbuffer)); classlen = sizeof(subkey_class) - 1; ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_MORE_DATA, "ret = %d\n", ret); - ok(classlen == sizeof(subkey_class) - 2, "classlen = %u\n", classlen); - ok(classbuffer[0] == 's', "classbuffer[0] = 0x%x\n", classbuffer[0]); - ok(classbuffer[1] == 'u', "classbuffer[1] = 0x%x\n", classbuffer[1]); - ok(classbuffer[10] == 's', "classbuffer[10] = 0x%x\n", classbuffer[10]); - ok(classbuffer[11] == 0, "classbuffer[11] = 0x%x\n", classbuffer[11]); - ok(classbuffer[12] == 0x55, "classbuffer[12] = 0x%x\n", classbuffer[12]); + todo_wine ok(classlen == sizeof(subkey_class) - 2, "classlen = %u\n", classlen); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + expectbuffer[sizeof(subkey_class) - 2] = 0; + expectbuffer[sizeof(subkey_class) - 1] = 0x55; + todo_wine ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = %.*s, expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class) - 1; ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); - ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); - ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); - ok(classbufferW[1] == 0x5555, "classbufferW[1] = 0x%x\n", classbufferW[1]); - ok(classbufferW[10] == 0x5555, "classbufferW[10] = 0x%x\n", classbufferW[10]); - ok(classbufferW[11] == 0x5555, "classbufferW[11] = 0x%x\n", classbufferW[11]); - ok(classbufferW[12] == 0x5555, "classbufferW[12] = 0x%x\n", classbufferW[12]); + todo_wine ok(ret == ERROR_INSUFFICIENT_BUFFER, "ret = %d\n", ret); + ok(classlen == sizeof(subkey_class) - 2 /* win8 */ || + classlen == strlen(subkey_class), "classlen = %u\n", classlen); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW was modified\n"); /* class name with large enough buffer */ memset(classbuffer, 0x55, sizeof(classbuffer)); @@ -1835,18 +1861,22 @@ ret = RegQueryInfoKeyA(subkey, classbuffer, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); - ok(!strcmp(classbuffer, subkey_class), "classbuffer = %s\n", classbuffer); - ok(classbuffer[12] == 0, "classbuffer[12] = 0x%x\n", classbuffer[12]); - ok(classbuffer[13] == 0x55, "classbuffer[13] = 0x%x\n", classbuffer[13]); + memset(expectbuffer, 0x55, sizeof(expectbuffer)); + strcpy(expectbuffer, subkey_class); + ok(!memcmp(classbuffer, expectbuffer, sizeof(classbuffer)), + "classbuffer = \"%.*s\", expected %s\n", + (int)sizeof(classbuffer), classbuffer, expectbuffer); memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = sizeof(subkey_class); ret = RegQueryInfoKeyW(subkey, classbufferW, &classlen, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == sizeof(subkey_class) - 1, "classlen = %u\n", classlen); - ok(!lstrcmpW(classbufferW, subkey_classW), "classbufferW = %s\n", wine_dbgstr_w(classbufferW)); - ok(classbufferW[12] == 0, "classbufferW[12] = 0x%x\n", classbufferW[12]); - ok(classbufferW[13] == 0x5555, "classbufferW[13] = 0x%x\n", classbufferW[13]); + memset(expectbufferW, 0x55, sizeof(expectbufferW)); + lstrcpyW(expectbufferW, subkey_classW); + ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), + "classbufferW = %s, expected %s\n", + wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey);

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